From 216d75834e9a57a3b926753e2d82e7b67c81797a Mon Sep 17 00:00:00 2001 From: alexjacks92 Date: Fri, 17 Jan 2014 13:41:52 -0500 Subject: [PATCH 01/38] These changes are already in master. Pushing the same thing to develop. --- test/script/regression.py | 15 +- test/script/srcupdater.py | 333 ++++++++++++++++++++------------------ 2 files changed, 190 insertions(+), 158 deletions(-) mode change 100644 => 100755 test/script/regression.py mode change 100644 => 100755 test/script/srcupdater.py diff --git a/test/script/regression.py b/test/script/regression.py old mode 100644 new mode 100755 index 6c640823ed..14777be679 --- a/test/script/regression.py +++ b/test/script/regression.py @@ -144,6 +144,8 @@ class TestRunner(object): logres.append(TestRunner._run_test(test_data)) test_data.printout = Errors.printout test_data.printerror = Errors.printerror + # give solr process time to die. + time.sleep(10) Reports.write_html_foot(test_config.html_log) # TODO: move this elsewhere @@ -165,9 +167,9 @@ class TestRunner(object): Errors.add_email_attachment(html.name) html.close() - if test_config.email_enabled: - Emailer.send_email(test_config.mail_to, test_config.mail_server, - test_config.mail_subject, Errors.email_body, Errors.email_attachs) + if test_config.email_enabled: + Emailer.send_email(test_config.mail_to, test_config.mail_server, + test_config.mail_subject, Errors.email_body, Errors.email_attachs) def _run_autopsy_ingest(test_data): """Run Autopsy ingest for the image in the given TestData. @@ -221,6 +223,9 @@ class TestRunner(object): logres = Logs.search_common_log("TskCoreException", test_data) TestResultsDiffer.run_diff(test_data) + print("Html report passed: ", test_data.html_report_passed) + print("Errors diff passed: ", test_data.errors_diff_passed) + print("DB diff passed: ", test_data.db_diff_passed) test_data.overall_passed = (test_data.html_report_passed and test_data.errors_diff_passed and test_data.db_diff_passed) @@ -736,7 +741,7 @@ class TestResultsDiffer(object): output_dir = test_data.output_path gold_bb_dump = test_data.get_sorted_data_path(DBType.GOLD) gold_dump = test_data.get_db_dump_path(DBType.GOLD) - test_data.db_diff_pass = all(TskDbDiff(output_db, gold_db, output_dir=output_dir, gold_bb_dump=gold_bb_dump, + test_data.db_diff_passed = all(TskDbDiff(output_db, gold_db, output_dir=output_dir, gold_bb_dump=gold_bb_dump, gold_dump=gold_dump).run_diff()) # Compare Exceptions @@ -1656,7 +1661,7 @@ class Args(object): elif arg == "-fr" or arg == "--forcerun": print("Not downloading new images") self.fr = True - elif arg == "-e" or arg == "-email": + elif arg == "--email": self.email_enabled = True else: print(usage()) diff --git a/test/script/srcupdater.py b/test/script/srcupdater.py old mode 100644 new mode 100755 index c8c7d5410b..a86417d6e9 --- a/test/script/srcupdater.py +++ b/test/script/srcupdater.py @@ -16,172 +16,199 @@ from xml.dom.minidom import parse, parseString import Emailer from regression_utils import * -def compile(errore, attachli, parsedin): - global redo - global tryredo - global failedbool - global errorem - errorem = errore - global attachl - attachl = attachli - global passed - global parsed - parsed = parsedin - passed = True - tryredo = False - redo = True - while(redo): - passed = True - if(passed): - gitPull("sleuthkit") - if(passed): - vsBuild() - if(passed): - gitPull("autopsy") - if(passed): - antBuild("datamodel", False) - if(passed): - antBuild("autopsy", True) - if(passed): - redo = False - else: - print("Compile Failed") - time.sleep(3600) - attachl = [] - errorem = "The test standard didn't match the gold standard.\n" - failedbool = False - if(tryredo): - errorem = "" - errorem += "Rebuilt properly.\n" - Emailer.send_email(parsed, errorem, attachl, True) - attachl = [] - passed = True +def compile(errore, attachli, parsedin, branch): + global to + global server + global subj + global email_enabled + global redo + global tryredo + global failedbool + global errorem + errorem = errore + global attachl + attachl = attachli + global passed + global parsed + parsed = parsedin + passed = True + tryredo = False + redo = True + while(redo): + passed = True + if(passed): + gitPull("sleuthkit", branch) + if(passed): + vsBuild() + print("TSK") + if(passed): + gitPull("autopsy", branch) + if(passed): + antBuild("datamodel", False) + print("DataModel") + if(passed): + antBuild("autopsy", True) + print("Aut") + if(passed): + redo = False + else: + print("Compile Failed") + time.sleep(3600) + attachl = [] + errorem = "The test standard didn't match the gold standard.\n" + failedbool = False + if(tryredo): + errorem = "" + errorem += "Rebuilt properly.\n" + if email_enabled: + Emailer.send_email(to, server, subj, errorem, attachl) + attachl = [] + passed = True #Pulls from git -def gitPull(TskOrAutopsy): - global SYS - global errorem - global attachl - ccwd = "" - gppth = make_local_path("..", "GitPullOutput" + TskOrAutopsy + ".txt") - attachl.append(gppth) - gpout = open(gppth, 'a') - toPull = "https://www.github.com/sleuthkit/" + TskOrAutopsy - call = ["git", "pull", toPull] - if TskOrAutopsy == "sleuthkit": - ccwd = os.path.join("..", "..", "..", "sleuthkit") - else: - ccwd = os.path.join("..", "..") - subprocess.call(call, stdout=sys.stdout, cwd=ccwd) - gpout.close() - +def gitPull(TskOrAutopsy, branch): + global SYS + global errorem + global attachl + ccwd = "" + gppth = make_local_path("..", "GitPullOutput" + TskOrAutopsy + ".txt") + attachl.append(gppth) + gpout = open(gppth, 'a') + toPull = "https://www.github.com/sleuthkit/" + TskOrAutopsy + call = ["git", "pull", toPull, branch] + if TskOrAutopsy == "sleuthkit": + ccwd = os.path.join("..", "..", "..", "sleuthkit") + else: + ccwd = os.path.join("..", "..") + subprocess.call(call, stdout=sys.stdout, cwd=ccwd) + gpout.close() #Builds TSK as a win32 applicatiion def vsBuild(): - global redo - global tryredo - global passed - global parsed - #Please ensure that the current working directory is $autopsy/testing/script - oldpath = os.getcwd() - os.chdir(os.path.join("..", "..", "..","sleuthkit", "win32")) - vs = [] - vs.append("/cygdrive/c/windows/microsoft.NET/framework/v4.0.30319/MSBuild.exe") - vs.append(os.path.join("Tsk-win.sln")) - vs.append("/p:configuration=release") - vs.append("/p:platform=win32") - vs.append("/t:clean") - vs.append("/t:rebuild") - print(vs) - VSpth = make_local_path("..", "VSOutput.txt") - VSout = open(VSpth, 'a') - subprocess.call(vs, stdout=VSout) - VSout.close() - os.chdir(oldpath) - chk = os.path.join("..", "..", "..","sleuthkit", "win32", "Release", "libtsk_jni.dll") - try: - open(chk) - except IOError as e: - global errorem - global attachl - if(not tryredo): - errorem += "LIBTSK C++ failed to build.\n" - attachl.append(VSpth) - send_email(parsed, errorem, attachl, False) - tryredo = True - passed = False - redo = True - - + global redo + global tryredo + global passed + global parsed + #Please ensure that the current working directory is $autopsy/testing/script + oldpath = os.getcwd() + os.chdir(os.path.join("..", "..", "..","sleuthkit", "win32")) + vs = [] + vs.append("/cygdrive/c/windows/microsoft.NET/framework/v4.0.30319/MSBuild.exe") + vs.append(os.path.join("Tsk-win.sln")) + vs.append("/p:configuration=release") + vs.append("/p:platform=x64") + vs.append("/t:clean") + vs.append("/t:rebuild") + print(vs) + VSpth = make_local_path("..", "VSOutput.txt") + VSout = open(VSpth, 'a') + subprocess.call(vs, stdout=VSout) + VSout.close() + os.chdir(oldpath) + chk = os.path.join("..", "..", "..","sleuthkit", "win32", "x64", "Release", "libtsk_jni.dll") + if not os.path.exists(chk): + print("path doesn't exist") + global errorem + global attachl + global email_enabled + if(not tryredo): + errorem += "LIBTSK C++ failed to build.\n" + attachl.append(VSpth) + if email_enabled: + Emailer.send_email(parsed, errorem, attachl, False) + tryredo = True + passed = False + redo = True #Builds Autopsy or the Datamodel def antBuild(which, Build): - global redo - global passed - global tryredo - global parsed - directory = os.path.join("..", "..") - ant = [] - if which == "datamodel": - directory = os.path.join("..", "..", "..", "sleuthkit", "bindings", "java") - ant.append("ant") - ant.append("-f") - ant.append(directory) - ant.append("clean") - if(Build): - ant.append("build") - else: - ant.append("dist") - antpth = make_local_path("..", "ant" + which + "Output.txt") - antout = open(antpth, 'a') - succd = subprocess.call(ant, stdout=antout) - antout.close() - global errorem - global attachl - if which == "datamodel": - chk = os.path.join("..", "..", "..","sleuthkit", "bindings", "java", "dist", "TSK_DataModel.jar") - try: - open(chk) - except IOError as e: - if(not tryredo): - errorem += "DataModel Java build failed.\n" - attachl.append(antpth) - Emailer.send_email(parsed, errorem, attachl, False) - passed = False - tryredo = True - elif (succd != 0 and (not tryredo)): - errorem += "Autopsy build failed.\n" - attachl.append(antpth) - Emailer.send_email(parsed, errorem, attachl, False) - tryredo = True - elif (succd != 0): - passed = False + print("building: ", which) + global redo + global passed + global tryredo + global parsed + directory = os.path.join("..", "..") + ant = [] + if which == "datamodel": + directory = os.path.join("..", "..", "..", "sleuthkit", "bindings", "java") + ant.append("ant") + ant.append("-f") + ant.append(directory) + ant.append("clean") + if(Build): + ant.append("build") + else: + ant.append("dist") + antpth = make_local_path("..", "ant" + which + "Output.txt") + antout = open(antpth, 'a') + succd = subprocess.call(ant, stdout=antout) + antout.close() + global errorem + global attachl + global email_enabled + global to + global subj + global server + if which == "datamodel": + chk = os.path.join("..", "..", "..","sleuthkit", "bindings", "java", "dist", "TSK_DataModel.jar") + try: + open(chk) + except IOError as e: + if(not tryredo): + errorem += "DataModel Java build failed.\n" + attachl.append(antpth) + if email_enabled: + Emailer.send_email(to, server, subj, errorem, attachl) + passed = False + tryredo = True + elif (succd != 0 and (not tryredo)): + errorem += "Autopsy build failed.\n" + attachl.append(antpth) + Emailer.send_email(to, server, subj, errorem, attachl) + tryredo = True + elif (succd != 0): + passed = False def main(): - errore = "" - attachli = [] - config_file = "" - arg = sys.argv.pop(0) - arg = sys.argv.pop(0) - config_file = arg - parsedin = parse(config_file) - compile(errore, attachli, parsedin) + global email_enabled + global to + global server + global subj + errore = "" + attachli = [] + config_file = "" + arg = sys.argv.pop(0) + arg = sys.argv.pop(0) + config_file = arg + arg = sys.argv.pop(0) + branch = arg + parsedin = parse(config_file) + try: + to = parsedin.getElementsByTagName("email")[0].getAttribute("value").encode().decode("utf_8") + server = parsedin.getElementsByTagName("mail_server")[0].getAttribute("value").encode().decode("utf_8") + subj = parsedin.getElementsByTagName("subject")[0].getAttribute("value").encode().decode("utf_8") + except Exception: + email_enabled = False + # email_enabled = (to is not None) and (server is not None) and (subj is not None) + email_enabled = False + compile(errore, attachli, parsedin, branch) class OS: LINUX, MAC, WIN, CYGWIN = range(4) if __name__ == "__main__": - global SYS - if _platform == "linux" or _platform == "linux2": - SYS = OS.LINUX - elif _platform == "darwin": - SYS = OS.MAC - elif _platform == "win32": - SYS = OS.WIN - elif _platform == "cygwin": - SYS = OS.CYGWIN + global SYS + if _platform == "linux" or _platform == "linux2": + SYS = OS.LINUX + elif _platform == "darwin": + SYS = OS.MAC + elif _platform == "win32": + SYS = OS.WIN + elif _platform == "cygwin": + SYS = OS.CYGWIN + + if SYS is OS.WIN or SYS is OS.CYGWIN: + main() + else: + print("We only support Windows and Cygwin at this time.") - if SYS is OS.WIN or SYS is OS.CYGWIN: - main() - else: - print("We only support Windows and Cygwin at this time.") From d2056cb7f4db19bcacaa5f2dfcab6b2c6c58c55a Mon Sep 17 00:00:00 2001 From: alexjacks92 Date: Fri, 17 Jan 2014 15:10:19 -0500 Subject: [PATCH 02/38] Fixed email issues. --- test/script/regression.py | 3 ++- test/script/srcupdater.py | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/test/script/regression.py b/test/script/regression.py index 14777be679..50e8981e67 100755 --- a/test/script/regression.py +++ b/test/script/regression.py @@ -719,7 +719,8 @@ class TestConfiguration(object): self.email_enabled = True print("Email will be sent to ", self.mail_to) else: - print("No email will be sent.") + self.email_enabled = False + print("No email will be sent.") #-------------------------------------------------# diff --git a/test/script/srcupdater.py b/test/script/srcupdater.py index a86417d6e9..21617f392a 100755 --- a/test/script/srcupdater.py +++ b/test/script/srcupdater.py @@ -74,7 +74,7 @@ def gitPull(TskOrAutopsy, branch): gppth = make_local_path("..", "GitPullOutput" + TskOrAutopsy + ".txt") attachl.append(gppth) gpout = open(gppth, 'a') - toPull = "https://www.github.com/sleuthkit/" + TskOrAutopsy + toPull = "https://www.github.com/alexjacks92/" + TskOrAutopsy call = ["git", "pull", toPull, branch] if TskOrAutopsy == "sleuthkit": ccwd = os.path.join("..", "..", "..", "sleuthkit") From a30a1ec510eee18f2fae4c2322b33e83d627d0ae Mon Sep 17 00:00:00 2001 From: alexjacks92 Date: Tue, 21 Jan 2014 13:32:15 -0500 Subject: [PATCH 03/38] added git checkout before git pull. --- test/script/srcupdater.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/test/script/srcupdater.py b/test/script/srcupdater.py index 21617f392a..1a19ea9568 100755 --- a/test/script/srcupdater.py +++ b/test/script/srcupdater.py @@ -74,6 +74,13 @@ def gitPull(TskOrAutopsy, branch): gppth = make_local_path("..", "GitPullOutput" + TskOrAutopsy + ".txt") attachl.append(gppth) gpout = open(gppth, 'a') + if TskOrAutopsy == "sleuthkit": + ccwd = os.path.join("..", "..", "..", "sleuthkit") + else: + ccwd = os.path.join("..", "..") + print("Checking out " + branch) + call = ["git", "checkout", branch] + subprocess.call(call, stdout=sys.stdout, cwd=ccwd) toPull = "https://www.github.com/alexjacks92/" + TskOrAutopsy call = ["git", "pull", toPull, branch] if TskOrAutopsy == "sleuthkit": From e300311bd14c4f1c79327e3687b60f5b0b999a9f Mon Sep 17 00:00:00 2001 From: alexjacks92 Date: Tue, 21 Jan 2014 13:53:13 -0500 Subject: [PATCH 04/38] Fixing bug where an email would try to be sent, even if it shouldn't. --- test/script/regression.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/script/regression.py b/test/script/regression.py index 50e8981e67..0d09f72a22 100755 --- a/test/script/regression.py +++ b/test/script/regression.py @@ -719,8 +719,8 @@ class TestConfiguration(object): self.email_enabled = True print("Email will be sent to ", self.mail_to) else: - self.email_enabled = False - print("No email will be sent.") + self.email_enabled = False + print("No email will be sent.") #-------------------------------------------------# From e5d4ea92a47d54fa42ff2c610c05f7c1dbbe60ec Mon Sep 17 00:00:00 2001 From: shahit2 Date: Tue, 21 Jan 2014 14:19:19 -0500 Subject: [PATCH 05/38] changes to non-public some files changed to to non-public --- .../actions/GetTagNameAndCommentDialog.java | 2 +- .../autopsy/actions/GetTagNameDialog.java | 2 +- .../sleuthkit/autopsy/actions/TagAction.java | 2 +- .../casemodule/AddImageErrorsDialog.java | 2 +- .../autopsy/casemodule/AddImageTask.java | 2 +- .../AddImageWizardAddingProgressVisual.java | 2 +- .../AddImageWizardIngestConfigVisual.java | 2 +- .../autopsy/casemodule/AddLocalFilesTask.java | 2 +- .../casemodule/CaseActionException.java | 2 +- .../autopsy/casemodule/CaseCloseAction.java | 2 +- .../autopsy/casemodule/CaseDeleteAction.java | 2 +- .../casemodule/CaseNewActionInterface.java | 2 +- .../casemodule/CasePropertiesAction.java | 2 +- .../autopsy/casemodule/CueBannerPanel.java | 2 +- .../autopsy/casemodule/GeneralFilter.java | 2 +- .../autopsy/casemodule/ImageFilePanel.java | 2 +- .../autopsy/casemodule/LocalDiskPanel.java | 2 +- .../autopsy/casemodule/LocalFilesPanel.java | 2 +- .../casemodule/MissingImageDialog.java | 2 +- .../casemodule/NewCaseVisualPanel2.form | 2 +- .../casemodule/NewCaseVisualPanel2.java | 2 +- .../casemodule/NewCaseWizardAction.java | 2 +- .../autopsy/casemodule/RecentCases.java | 2 +- .../casemodule/StartupWindowInterface.java | 2 +- .../casemodule/StartupWindowProvider.java | 2 +- .../autopsy/casemodule/UpdateRecentCases.java | 2 +- .../autopsy/casemodule/XMLCaseManagement.java | 2 +- .../AbstractDataResultViewer.java | 2 +- .../AdvancedConfigurationCleanDialog.form | 1 + .../AdvancedConfigurationCleanDialog.java | 2 +- .../AdvancedConfigurationDialog.form | 1 + .../corecomponents/CustomAboutAction.java | 2 +- .../corecomponents/DataContentPanel.java | 2 +- .../corecomponents/DataResultViewerTable.java | 2 +- .../DataResultViewerThumbnail.java | 2 +- .../autopsy/corecomponents/FrameCapture.java | 2 +- .../corecomponents/MediaViewImagePanel.java | 2 +- .../corecomponents/MediaViewVideoPanel.java | 2 +- .../corecomponents/NoTabsTabDisplayerUI.java | 2 +- .../netbeans/core/startup/Bundle.properties | 2 +- .../core/windows/view/ui/Bundle.properties | 2 +- nbproject/platform.properties | 111 +----------------- 42 files changed, 42 insertions(+), 149 deletions(-) diff --git a/Core/src/org/sleuthkit/autopsy/actions/GetTagNameAndCommentDialog.java b/Core/src/org/sleuthkit/autopsy/actions/GetTagNameAndCommentDialog.java index e953694d90..1260f920cd 100644 --- a/Core/src/org/sleuthkit/autopsy/actions/GetTagNameAndCommentDialog.java +++ b/Core/src/org/sleuthkit/autopsy/actions/GetTagNameAndCommentDialog.java @@ -37,7 +37,7 @@ import org.sleuthkit.autopsy.coreutils.Logger; import org.sleuthkit.datamodel.TagName; import org.sleuthkit.datamodel.TskCoreException; -public class GetTagNameAndCommentDialog extends JDialog { + class GetTagNameAndCommentDialog extends JDialog { private static final String NO_TAG_NAMES_MESSAGE = "No Tags"; private final HashMap tagNames = new HashMap<>(); private TagNameAndComment tagNameAndComment = null; diff --git a/Core/src/org/sleuthkit/autopsy/actions/GetTagNameDialog.java b/Core/src/org/sleuthkit/autopsy/actions/GetTagNameDialog.java index fb0d50ddc4..8e9d961b7e 100644 --- a/Core/src/org/sleuthkit/autopsy/actions/GetTagNameDialog.java +++ b/Core/src/org/sleuthkit/autopsy/actions/GetTagNameDialog.java @@ -41,7 +41,7 @@ import org.sleuthkit.autopsy.coreutils.Logger; import org.sleuthkit.datamodel.TagName; import org.sleuthkit.datamodel.TskCoreException; -public class GetTagNameDialog extends JDialog { + class GetTagNameDialog extends JDialog { private static final String TAG_ICON_PATH = "org/sleuthkit/autopsy/images/tag-folder-blue-icon-16.png"; private final HashMap tagNames = new HashMap<>(); private TagName tagName = null; diff --git a/Core/src/org/sleuthkit/autopsy/actions/TagAction.java b/Core/src/org/sleuthkit/autopsy/actions/TagAction.java index 0d6e74efd3..376e52ce62 100755 --- a/Core/src/org/sleuthkit/autopsy/actions/TagAction.java +++ b/Core/src/org/sleuthkit/autopsy/actions/TagAction.java @@ -26,7 +26,7 @@ import org.sleuthkit.datamodel.BlackboardArtifact; /** * Abstract base class for Actions involving tags. */ -public abstract class TagAction extends AbstractAction { + abstract class TagAction extends AbstractAction { public TagAction(String menuText) { super(menuText); } diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/AddImageErrorsDialog.java b/Core/src/org/sleuthkit/autopsy/casemodule/AddImageErrorsDialog.java index 742cb1750c..e18bf56f14 100644 --- a/Core/src/org/sleuthkit/autopsy/casemodule/AddImageErrorsDialog.java +++ b/Core/src/org/sleuthkit/autopsy/casemodule/AddImageErrorsDialog.java @@ -21,7 +21,7 @@ package org.sleuthkit.autopsy.casemodule; /** * Dialog to show add image error messages */ -public class AddImageErrorsDialog extends javax.swing.JDialog { + class AddImageErrorsDialog extends javax.swing.JDialog { /** * Creates new form AddImageErrorsDialog diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/AddImageTask.java b/Core/src/org/sleuthkit/autopsy/casemodule/AddImageTask.java index 9171154ab4..7cc3348ca9 100644 --- a/Core/src/org/sleuthkit/autopsy/casemodule/AddImageTask.java +++ b/Core/src/org/sleuthkit/autopsy/casemodule/AddImageTask.java @@ -43,7 +43,7 @@ import org.sleuthkit.datamodel.TskException; * It updates the given ProgressMonitor as it works through adding the image, * and et the end, calls the specified Callback. */ -public class AddImageTask implements Runnable { + class AddImageTask implements Runnable { private Logger logger = Logger.getLogger(AddImageTask.class.getName()); diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/AddImageWizardAddingProgressVisual.java b/Core/src/org/sleuthkit/autopsy/casemodule/AddImageWizardAddingProgressVisual.java index a37b8cefe3..a7be36a1d7 100644 --- a/Core/src/org/sleuthkit/autopsy/casemodule/AddImageWizardAddingProgressVisual.java +++ b/Core/src/org/sleuthkit/autopsy/casemodule/AddImageWizardAddingProgressVisual.java @@ -28,7 +28,7 @@ import org.openide.WizardDescriptor; * visual component to display progress bar and status updates while adding an * image in the wizard */ -public class AddImageWizardAddingProgressVisual extends javax.swing.JPanel { + class AddImageWizardAddingProgressVisual extends javax.swing.JPanel { private static final String ADDING_DATA_SOURCE_COMPLETE = "Adding Data Source - Complete"; private String errorLog = ""; diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/AddImageWizardIngestConfigVisual.java b/Core/src/org/sleuthkit/autopsy/casemodule/AddImageWizardIngestConfigVisual.java index d112b6e24f..07aebf2484 100644 --- a/Core/src/org/sleuthkit/autopsy/casemodule/AddImageWizardIngestConfigVisual.java +++ b/Core/src/org/sleuthkit/autopsy/casemodule/AddImageWizardIngestConfigVisual.java @@ -27,7 +27,7 @@ import javax.swing.JPanel; * * */ -public class AddImageWizardIngestConfigVisual extends javax.swing.JPanel { + class AddImageWizardIngestConfigVisual extends javax.swing.JPanel { //could this be something more specific than JPanel? - jm private JPanel ingestPanel = null; diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/AddLocalFilesTask.java b/Core/src/org/sleuthkit/autopsy/casemodule/AddLocalFilesTask.java index 34b7a32089..0abf9bb75d 100644 --- a/Core/src/org/sleuthkit/autopsy/casemodule/AddLocalFilesTask.java +++ b/Core/src/org/sleuthkit/autopsy/casemodule/AddLocalFilesTask.java @@ -40,7 +40,7 @@ import org.sleuthkit.datamodel.TskCoreException; * manager methods acquire the locks for each transaction when adding * logical files. */ -public class AddLocalFilesTask implements Runnable { + class AddLocalFilesTask implements Runnable { private Logger logger = Logger.getLogger(AddLocalFilesTask.class.getName()); diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/CaseActionException.java b/Core/src/org/sleuthkit/autopsy/casemodule/CaseActionException.java index 6b6cd55201..4f7e2fa6d2 100644 --- a/Core/src/org/sleuthkit/autopsy/casemodule/CaseActionException.java +++ b/Core/src/org/sleuthkit/autopsy/casemodule/CaseActionException.java @@ -21,7 +21,7 @@ package org.sleuthkit.autopsy.casemodule; /** * Exception thrown when case action (such as open, close, create) resulted in an error */ -public class CaseActionException extends Exception { + class CaseActionException extends Exception { public CaseActionException(String message) { super(message); diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/CaseCloseAction.java b/Core/src/org/sleuthkit/autopsy/casemodule/CaseCloseAction.java index 1a3eacffb4..e99844ce66 100644 --- a/Core/src/org/sleuthkit/autopsy/casemodule/CaseCloseAction.java +++ b/Core/src/org/sleuthkit/autopsy/casemodule/CaseCloseAction.java @@ -45,7 +45,7 @@ import org.openide.util.actions.Presenter; * The action to close the current Case. This class should be disabled on * creation and it will be enabled on new case creation or case opened. */ -public final class CaseCloseAction extends CallableSystemAction implements Presenter.Toolbar{ + final class CaseCloseAction extends CallableSystemAction implements Presenter.Toolbar{ JButton toolbarButton = new JButton(); diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/CaseDeleteAction.java b/Core/src/org/sleuthkit/autopsy/casemodule/CaseDeleteAction.java index 93243c1a29..72ed22351b 100644 --- a/Core/src/org/sleuthkit/autopsy/casemodule/CaseDeleteAction.java +++ b/Core/src/org/sleuthkit/autopsy/casemodule/CaseDeleteAction.java @@ -66,7 +66,7 @@ import org.openide.util.actions.CallableSystemAction; * The action to delete the current Case. This class should be disabled on * creation and it will be enabled on new case creation or case opened. */ -public final class CaseDeleteAction extends CallableSystemAction { + final class CaseDeleteAction extends CallableSystemAction { private JPanel caller; // for error handling diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/CaseNewActionInterface.java b/Core/src/org/sleuthkit/autopsy/casemodule/CaseNewActionInterface.java index a99db1aab2..1d84f6c61d 100644 --- a/Core/src/org/sleuthkit/autopsy/casemodule/CaseNewActionInterface.java +++ b/Core/src/org/sleuthkit/autopsy/casemodule/CaseNewActionInterface.java @@ -25,6 +25,6 @@ import java.awt.event.ActionListener; /** * */ -public interface CaseNewActionInterface extends ActionListener { + interface CaseNewActionInterface extends ActionListener { } diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/CasePropertiesAction.java b/Core/src/org/sleuthkit/autopsy/casemodule/CasePropertiesAction.java index 0331635a9d..76ff941278 100644 --- a/Core/src/org/sleuthkit/autopsy/casemodule/CasePropertiesAction.java +++ b/Core/src/org/sleuthkit/autopsy/casemodule/CasePropertiesAction.java @@ -40,7 +40,7 @@ import org.sleuthkit.autopsy.coreutils.Logger; * * @author jantonius */ -public final class CasePropertiesAction extends CallableSystemAction { + final class CasePropertiesAction extends CallableSystemAction { private static JDialog popUpWindow; diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/CueBannerPanel.java b/Core/src/org/sleuthkit/autopsy/casemodule/CueBannerPanel.java index 49c5b313a0..cd30342965 100644 --- a/Core/src/org/sleuthkit/autopsy/casemodule/CueBannerPanel.java +++ b/Core/src/org/sleuthkit/autopsy/casemodule/CueBannerPanel.java @@ -33,7 +33,7 @@ import org.openide.util.Lookup; /** * */ -public class CueBannerPanel extends javax.swing.JPanel { + class CueBannerPanel extends javax.swing.JPanel { final private static String title = "Open Recent Case"; final private static JFrame frame = new JFrame(title); diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/GeneralFilter.java b/Core/src/org/sleuthkit/autopsy/casemodule/GeneralFilter.java index 9b9a091466..d7a8e4df37 100644 --- a/Core/src/org/sleuthkit/autopsy/casemodule/GeneralFilter.java +++ b/Core/src/org/sleuthkit/autopsy/casemodule/GeneralFilter.java @@ -27,7 +27,7 @@ import javax.swing.filechooser.FileFilter; /** * FileFilter helper class. Matches files based on extension */ -public class GeneralFilter extends FileFilter{ + class GeneralFilter extends FileFilter{ // Extensions & Descriptions for commonly used filters diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/ImageFilePanel.java b/Core/src/org/sleuthkit/autopsy/casemodule/ImageFilePanel.java index 03dd184e8c..6a99067af7 100644 --- a/Core/src/org/sleuthkit/autopsy/casemodule/ImageFilePanel.java +++ b/Core/src/org/sleuthkit/autopsy/casemodule/ImageFilePanel.java @@ -39,7 +39,7 @@ import org.sleuthkit.autopsy.coreutils.ModuleSettings; /** * ImageTypePanel for adding an image file such as .img, .E0x, .00x, etc. */ -public class ImageFilePanel extends JPanel implements DocumentListener { + class ImageFilePanel extends JPanel implements DocumentListener { private final String PROP_LASTIMAGE_PATH = "LBL_LastImage_PATH"; diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/LocalDiskPanel.java b/Core/src/org/sleuthkit/autopsy/casemodule/LocalDiskPanel.java index ba746b7595..efe949ef7f 100644 --- a/Core/src/org/sleuthkit/autopsy/casemodule/LocalDiskPanel.java +++ b/Core/src/org/sleuthkit/autopsy/casemodule/LocalDiskPanel.java @@ -47,7 +47,7 @@ import org.sleuthkit.autopsy.coreutils.PlatformUtil; /** * ImageTypePanel for adding a local disk or partition such as PhysicalDrive0 or C:. */ -public class LocalDiskPanel extends JPanel { + class LocalDiskPanel extends JPanel { private static final Logger logger = Logger.getLogger(LocalDiskPanel.class.getName()); private static LocalDiskPanel instance; diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/LocalFilesPanel.java b/Core/src/org/sleuthkit/autopsy/casemodule/LocalFilesPanel.java index c9cff7b1d0..5966775be0 100644 --- a/Core/src/org/sleuthkit/autopsy/casemodule/LocalFilesPanel.java +++ b/Core/src/org/sleuthkit/autopsy/casemodule/LocalFilesPanel.java @@ -30,7 +30,7 @@ import org.sleuthkit.autopsy.corecomponentinterfaces.DataSourceProcessor; /** * Add input wizard subpanel for adding local files / dirs to the case */ -public class LocalFilesPanel extends JPanel { + class LocalFilesPanel extends JPanel { private PropertyChangeSupport pcs = null; private Set currentFiles = new TreeSet(); //keep currents in a set to disallow duplicates per add diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/MissingImageDialog.java b/Core/src/org/sleuthkit/autopsy/casemodule/MissingImageDialog.java index d54c52fc4b..d2d865aa0c 100644 --- a/Core/src/org/sleuthkit/autopsy/casemodule/MissingImageDialog.java +++ b/Core/src/org/sleuthkit/autopsy/casemodule/MissingImageDialog.java @@ -39,7 +39,7 @@ import org.sleuthkit.datamodel.TskCoreException; -public class MissingImageDialog extends javax.swing.JDialog { + class MissingImageDialog extends javax.swing.JDialog { private static final Logger logger = Logger.getLogger(MissingImageDialog.class.getName()); long obj_id; SleuthkitCase db; diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/NewCaseVisualPanel2.form b/Core/src/org/sleuthkit/autopsy/casemodule/NewCaseVisualPanel2.form index dccd11860d..ed1c2946b7 100644 --- a/Core/src/org/sleuthkit/autopsy/casemodule/NewCaseVisualPanel2.form +++ b/Core/src/org/sleuthkit/autopsy/casemodule/NewCaseVisualPanel2.form @@ -1,4 +1,4 @@ - +
diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/NewCaseVisualPanel2.java b/Core/src/org/sleuthkit/autopsy/casemodule/NewCaseVisualPanel2.java index 8859389aef..5232f17835 100644 --- a/Core/src/org/sleuthkit/autopsy/casemodule/NewCaseVisualPanel2.java +++ b/Core/src/org/sleuthkit/autopsy/casemodule/NewCaseVisualPanel2.java @@ -28,7 +28,7 @@ package org.sleuthkit.autopsy.casemodule; * * @author dfickling */ -public class NewCaseVisualPanel2 extends javax.swing.JPanel { + class NewCaseVisualPanel2 extends javax.swing.JPanel { /** Creates new form NewCaseVisualPanel2 */ public NewCaseVisualPanel2() { diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/NewCaseWizardAction.java b/Core/src/org/sleuthkit/autopsy/casemodule/NewCaseWizardAction.java index b57632a603..63f4ad5c56 100644 --- a/Core/src/org/sleuthkit/autopsy/casemodule/NewCaseWizardAction.java +++ b/Core/src/org/sleuthkit/autopsy/casemodule/NewCaseWizardAction.java @@ -38,7 +38,7 @@ import org.sleuthkit.autopsy.coreutils.Logger; /** * Action to open the New Case wizard. */ -public final class NewCaseWizardAction extends CallableSystemAction { + final class NewCaseWizardAction extends CallableSystemAction { private WizardDescriptor.Panel[] panels; diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/RecentCases.java b/Core/src/org/sleuthkit/autopsy/casemodule/RecentCases.java index 5b9c974253..670b83144e 100644 --- a/Core/src/org/sleuthkit/autopsy/casemodule/RecentCases.java +++ b/Core/src/org/sleuthkit/autopsy/casemodule/RecentCases.java @@ -43,7 +43,7 @@ import org.sleuthkit.autopsy.coreutils.Logger; * The constructor is called when the autopsy is running. * All the method to create and modify the properties file are within this class */ -public final class RecentCases extends CallableSystemAction implements Presenter.Menu { + final class RecentCases extends CallableSystemAction implements Presenter.Menu { static final int LENGTH = 5; static final String NAME_PROP_KEY = "LBL_RecentCase_Name"; diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/StartupWindowInterface.java b/Core/src/org/sleuthkit/autopsy/casemodule/StartupWindowInterface.java index ec11ff3e37..1c7e40f386 100644 --- a/Core/src/org/sleuthkit/autopsy/casemodule/StartupWindowInterface.java +++ b/Core/src/org/sleuthkit/autopsy/casemodule/StartupWindowInterface.java @@ -21,7 +21,7 @@ package org.sleuthkit.autopsy.casemodule; /** * Interface for startup window implementations */ -public interface StartupWindowInterface { + interface StartupWindowInterface { /** * Shows and makes active the startup window diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/StartupWindowProvider.java b/Core/src/org/sleuthkit/autopsy/casemodule/StartupWindowProvider.java index 4cfa6f3b1c..79b12a125e 100644 --- a/Core/src/org/sleuthkit/autopsy/casemodule/StartupWindowProvider.java +++ b/Core/src/org/sleuthkit/autopsy/casemodule/StartupWindowProvider.java @@ -32,7 +32,7 @@ import org.sleuthkit.autopsy.coreutils.Logger; * is to implement StartupWindowInterface and register it with lookup as a ServiceProvider. * The custom startup window is automatically chosen over the default one, given it is the only external module custom startup window. */ -public class StartupWindowProvider implements StartupWindowInterface { + class StartupWindowProvider implements StartupWindowInterface { private static volatile StartupWindowProvider instance; private static final Logger logger = Logger.getLogger(StartupWindowProvider.class.getName()); diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/UpdateRecentCases.java b/Core/src/org/sleuthkit/autopsy/casemodule/UpdateRecentCases.java index 7e219fd5c0..9667768397 100644 --- a/Core/src/org/sleuthkit/autopsy/casemodule/UpdateRecentCases.java +++ b/Core/src/org/sleuthkit/autopsy/casemodule/UpdateRecentCases.java @@ -28,7 +28,7 @@ import org.openide.util.actions.SystemAction; /** * This class is used to change / update the list of recent cases dynamically. */ -public class UpdateRecentCases extends JMenuItem implements DynamicMenuContent { + class UpdateRecentCases extends JMenuItem implements DynamicMenuContent { int length; static boolean hasRecentCase = false; diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/XMLCaseManagement.java b/Core/src/org/sleuthkit/autopsy/casemodule/XMLCaseManagement.java index 0187b93b54..45d8ac4784 100644 --- a/Core/src/org/sleuthkit/autopsy/casemodule/XMLCaseManagement.java +++ b/Core/src/org/sleuthkit/autopsy/casemodule/XMLCaseManagement.java @@ -45,7 +45,7 @@ import org.xml.sax.SAXException; * * @author jantonius */ -public class XMLCaseManagement implements CaseConfigFileInterface { + class XMLCaseManagement implements CaseConfigFileInterface { final static String XSDFILE = "CaseSchema.xsd"; final static String TOP_ROOT_NAME = "AutopsyCase"; diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/AbstractDataResultViewer.java b/Core/src/org/sleuthkit/autopsy/corecomponents/AbstractDataResultViewer.java index 48647023d9..ece4ce5565 100644 --- a/Core/src/org/sleuthkit/autopsy/corecomponents/AbstractDataResultViewer.java +++ b/Core/src/org/sleuthkit/autopsy/corecomponents/AbstractDataResultViewer.java @@ -36,7 +36,7 @@ import org.sleuthkit.autopsy.coreutils.Logger; * Additionally, the ExplorerManager.Provider interface is implemented to * supply an ExplorerManager to derived classes and their child components. */ -public abstract class AbstractDataResultViewer extends JPanel implements DataResultViewer, Provider { + abstract class AbstractDataResultViewer extends JPanel implements DataResultViewer, Provider { private static final Logger logger = Logger.getLogger(AbstractDataResultViewer.class.getName()); protected transient ExplorerManager em; diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/AdvancedConfigurationCleanDialog.form b/Core/src/org/sleuthkit/autopsy/corecomponents/AdvancedConfigurationCleanDialog.form index 8c0236cde0..e4fe6c1770 100644 --- a/Core/src/org/sleuthkit/autopsy/corecomponents/AdvancedConfigurationCleanDialog.form +++ b/Core/src/org/sleuthkit/autopsy/corecomponents/AdvancedConfigurationCleanDialog.form @@ -6,6 +6,7 @@ + diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/AdvancedConfigurationCleanDialog.java b/Core/src/org/sleuthkit/autopsy/corecomponents/AdvancedConfigurationCleanDialog.java index 0ae2014ca4..6b478fa221 100644 --- a/Core/src/org/sleuthkit/autopsy/corecomponents/AdvancedConfigurationCleanDialog.java +++ b/Core/src/org/sleuthkit/autopsy/corecomponents/AdvancedConfigurationCleanDialog.java @@ -15,7 +15,7 @@ import javax.swing.JPanel; * but the panel given to it. No additional buttons or features, except * the default close operation, which is set to dispose. */ -public class AdvancedConfigurationCleanDialog extends javax.swing.JDialog { + class AdvancedConfigurationCleanDialog extends javax.swing.JDialog { /** Creates new form AdvancedConfigurationDialog */ public AdvancedConfigurationCleanDialog() { diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/AdvancedConfigurationDialog.form b/Core/src/org/sleuthkit/autopsy/corecomponents/AdvancedConfigurationDialog.form index c43b3f6718..6ea96c271f 100644 --- a/Core/src/org/sleuthkit/autopsy/corecomponents/AdvancedConfigurationDialog.form +++ b/Core/src/org/sleuthkit/autopsy/corecomponents/AdvancedConfigurationDialog.form @@ -6,6 +6,7 @@ + diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/CustomAboutAction.java b/Core/src/org/sleuthkit/autopsy/corecomponents/CustomAboutAction.java index c69feb15b7..37d21e2748 100644 --- a/Core/src/org/sleuthkit/autopsy/corecomponents/CustomAboutAction.java +++ b/Core/src/org/sleuthkit/autopsy/corecomponents/CustomAboutAction.java @@ -28,7 +28,7 @@ import org.sleuthkit.autopsy.coreutils.Logger; /** * Action to open custom implementation of the "About" window from the Help menu. */ -public class CustomAboutAction extends AboutAction { + class CustomAboutAction extends AboutAction { @Override public void performAction() { diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/DataContentPanel.java b/Core/src/org/sleuthkit/autopsy/corecomponents/DataContentPanel.java index 7ebd947691..56f6c25363 100644 --- a/Core/src/org/sleuthkit/autopsy/corecomponents/DataContentPanel.java +++ b/Core/src/org/sleuthkit/autopsy/corecomponents/DataContentPanel.java @@ -27,7 +27,7 @@ import org.sleuthkit.datamodel.TskCoreException; /** * */ -public class DataContentPanel extends javax.swing.JPanel implements DataContent, ChangeListener { + class DataContentPanel extends javax.swing.JPanel implements DataContent, ChangeListener { private static Logger logger = Logger.getLogger(DataContentPanel.class.getName()); private final List viewers = new ArrayList<>();; diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/DataResultViewerTable.java b/Core/src/org/sleuthkit/autopsy/corecomponents/DataResultViewerTable.java index 6d87ee41d7..5723151e53 100644 --- a/Core/src/org/sleuthkit/autopsy/corecomponents/DataResultViewerTable.java +++ b/Core/src/org/sleuthkit/autopsy/corecomponents/DataResultViewerTable.java @@ -55,7 +55,7 @@ import org.sleuthkit.autopsy.corecomponentinterfaces.DataResultViewer; // service provider when DataResultViewers can be made compatible with node // multiple selection actions. //@ServiceProvider(service = DataResultViewer.class) -public class DataResultViewerTable extends AbstractDataResultViewer { + class DataResultViewerTable extends AbstractDataResultViewer { private String firstColumnLabel = "Name"; private Set propertiesAcc = new LinkedHashSet<>(); diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/DataResultViewerThumbnail.java b/Core/src/org/sleuthkit/autopsy/corecomponents/DataResultViewerThumbnail.java index b83cb21645..bdbe02a4f1 100644 --- a/Core/src/org/sleuthkit/autopsy/corecomponents/DataResultViewerThumbnail.java +++ b/Core/src/org/sleuthkit/autopsy/corecomponents/DataResultViewerThumbnail.java @@ -57,7 +57,7 @@ import org.sleuthkit.datamodel.TskCoreException; // service provider when DataResultViewers can be made compatible with node // multi-selection actions. //@ServiceProvider(service = DataResultViewer.class) -public final class DataResultViewerThumbnail extends AbstractDataResultViewer { + final class DataResultViewerThumbnail extends AbstractDataResultViewer { private static final Logger logger = Logger.getLogger(DataResultViewerThumbnail.class.getName()); //flag to keep track if images are being loaded diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/FrameCapture.java b/Core/src/org/sleuthkit/autopsy/corecomponents/FrameCapture.java index 77f7462261..f416403114 100644 --- a/Core/src/org/sleuthkit/autopsy/corecomponents/FrameCapture.java +++ b/Core/src/org/sleuthkit/autopsy/corecomponents/FrameCapture.java @@ -6,7 +6,7 @@ import java.util.List; /** * Interface used to capture frames from a video file. */ -public interface FrameCapture { + interface FrameCapture { /** * @param file the video file to use diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/MediaViewImagePanel.java b/Core/src/org/sleuthkit/autopsy/corecomponents/MediaViewImagePanel.java index f621c1859f..596cf66657 100644 --- a/Core/src/org/sleuthkit/autopsy/corecomponents/MediaViewImagePanel.java +++ b/Core/src/org/sleuthkit/autopsy/corecomponents/MediaViewImagePanel.java @@ -44,7 +44,7 @@ import org.sleuthkit.datamodel.ReadContentInputStream; * Container for the image viewer part of media view, on a layered pane. To be * used with JavaFx image viewer only. */ -public class MediaViewImagePanel extends javax.swing.JPanel { + class MediaViewImagePanel extends javax.swing.JPanel { private JFXPanel fxPanel; private ImageView fxImageView; diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/MediaViewVideoPanel.java b/Core/src/org/sleuthkit/autopsy/corecomponents/MediaViewVideoPanel.java index 343b7fa672..3801f39199 100644 --- a/Core/src/org/sleuthkit/autopsy/corecomponents/MediaViewVideoPanel.java +++ b/Core/src/org/sleuthkit/autopsy/corecomponents/MediaViewVideoPanel.java @@ -29,7 +29,7 @@ import org.sleuthkit.datamodel.AbstractFile; * Video viewer part of the Media View layered pane. * Uses different engines depending on platform. */ -public abstract class MediaViewVideoPanel extends JPanel implements FrameCapture { + abstract class MediaViewVideoPanel extends JPanel implements FrameCapture { private static final Logger logger = Logger.getLogger(MediaViewVideoPanel.class.getName()); diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/NoTabsTabDisplayerUI.java b/Core/src/org/sleuthkit/autopsy/corecomponents/NoTabsTabDisplayerUI.java index 1db15285d8..67d114ecc6 100644 --- a/Core/src/org/sleuthkit/autopsy/corecomponents/NoTabsTabDisplayerUI.java +++ b/Core/src/org/sleuthkit/autopsy/corecomponents/NoTabsTabDisplayerUI.java @@ -33,7 +33,7 @@ import org.netbeans.swing.tabcontrol.TabDisplayerUI; * * @author dfickling */ -public class NoTabsTabDisplayerUI extends TabDisplayerUI { + class NoTabsTabDisplayerUI extends TabDisplayerUI { /** Creates a new instance of NoTabsTabDisplayerUI */ public NoTabsTabDisplayerUI(TabDisplayer displayer) { diff --git a/branding/core/core.jar/org/netbeans/core/startup/Bundle.properties b/branding/core/core.jar/org/netbeans/core/startup/Bundle.properties index 9fc095c4a7..2b1fec1f42 100644 --- a/branding/core/core.jar/org/netbeans/core/startup/Bundle.properties +++ b/branding/core/core.jar/org/netbeans/core/startup/Bundle.properties @@ -1,5 +1,5 @@ #Updated by build script -#Wed, 15 Jan 2014 15:11:33 -0500 +#Tue, 21 Jan 2014 12:41:23 -0500 LBL_splash_window_title=Starting Autopsy SPLASH_HEIGHT=288 SPLASH_WIDTH=538 diff --git a/branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties b/branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties index eaa57124f0..ed9af0bd8e 100644 --- a/branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties +++ b/branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties @@ -1,5 +1,5 @@ #Updated by build script -#Wed, 15 Jan 2014 15:11:33 -0500 +#Tue, 21 Jan 2014 12:41:23 -0500 CTL_MainWindow_Title=Autopsy 3.0.8 CTL_MainWindow_Title_No_Project=Autopsy 3.0.8 diff --git a/nbproject/platform.properties b/nbproject/platform.properties index a9fa87f749..785d1b0ed1 100644 --- a/nbproject/platform.properties +++ b/nbproject/platform.properties @@ -6,115 +6,6 @@ harness.dir=${nbplatform.active.dir}/harness bootstrap.url=http://deadlock.netbeans.org/hudson/job/nbms-and-javadoc/lastStableBuild/artifact/nbbuild/netbeans/harness/tasks.jar autoupdate.catalog.url=http://dlc.sun.com.edgesuite.net/netbeans/updates/${netbeans-plat-version}/uc/final/distribution/catalog.xml.gz cluster.path=\ - ${nbplatform.active.dir}/harness:\ - ${nbplatform.active.dir}/java:\ ${nbplatform.active.dir}/platform -disabled.modules=\ - org.apache.tools.ant.module,\ - org.netbeans.api.debugger.jpda,\ - org.netbeans.api.java,\ - org.netbeans.lib.nbjavac,\ - org.netbeans.libs.cglib,\ - org.netbeans.libs.javacapi,\ - org.netbeans.libs.javacimpl,\ - org.netbeans.libs.springframework,\ - org.netbeans.modules.ant.browsetask,\ - org.netbeans.modules.ant.debugger,\ - org.netbeans.modules.ant.freeform,\ - org.netbeans.modules.ant.grammar,\ - org.netbeans.modules.ant.kit,\ - org.netbeans.modules.beans,\ - org.netbeans.modules.classfile,\ - org.netbeans.modules.dbschema,\ - org.netbeans.modules.debugger.jpda,\ - org.netbeans.modules.debugger.jpda.ant,\ - org.netbeans.modules.debugger.jpda.kit,\ - org.netbeans.modules.debugger.jpda.projects,\ - org.netbeans.modules.debugger.jpda.ui,\ - org.netbeans.modules.debugger.jpda.visual,\ - org.netbeans.modules.findbugs.installer,\ - org.netbeans.modules.form,\ - org.netbeans.modules.form.binding,\ - org.netbeans.modules.form.j2ee,\ - org.netbeans.modules.form.kit,\ - org.netbeans.modules.form.nb,\ - org.netbeans.modules.form.refactoring,\ - org.netbeans.modules.hibernate,\ - org.netbeans.modules.hibernatelib,\ - org.netbeans.modules.hudson.ant,\ - org.netbeans.modules.hudson.maven,\ - org.netbeans.modules.i18n,\ - org.netbeans.modules.i18n.form,\ - org.netbeans.modules.j2ee.core.utilities,\ - org.netbeans.modules.j2ee.eclipselink,\ - org.netbeans.modules.j2ee.eclipselinkmodelgen,\ - org.netbeans.modules.j2ee.jpa.refactoring,\ - org.netbeans.modules.j2ee.jpa.verification,\ - org.netbeans.modules.j2ee.metadata,\ - org.netbeans.modules.j2ee.metadata.model.support,\ - org.netbeans.modules.j2ee.persistence,\ - org.netbeans.modules.j2ee.persistence.kit,\ - org.netbeans.modules.j2ee.persistenceapi,\ - org.netbeans.modules.java.api.common,\ - org.netbeans.modules.java.debug,\ - org.netbeans.modules.java.editor,\ - org.netbeans.modules.java.editor.lib,\ - org.netbeans.modules.java.examples,\ - org.netbeans.modules.java.freeform,\ - org.netbeans.modules.java.guards,\ - org.netbeans.modules.java.helpset,\ - org.netbeans.modules.java.hints,\ - org.netbeans.modules.java.hints.declarative,\ - org.netbeans.modules.java.hints.declarative.test,\ - org.netbeans.modules.java.hints.legacy.spi,\ - org.netbeans.modules.java.hints.test,\ - org.netbeans.modules.java.hints.ui,\ - org.netbeans.modules.java.j2seplatform,\ - org.netbeans.modules.java.j2seproject,\ - org.netbeans.modules.java.kit,\ - org.netbeans.modules.java.lexer,\ - org.netbeans.modules.java.navigation,\ - org.netbeans.modules.java.platform,\ - org.netbeans.modules.java.preprocessorbridge,\ - org.netbeans.modules.java.project,\ - org.netbeans.modules.java.source,\ - org.netbeans.modules.java.source.ant,\ - org.netbeans.modules.java.source.queries,\ - org.netbeans.modules.java.source.queriesimpl,\ - org.netbeans.modules.java.sourceui,\ - org.netbeans.modules.java.testrunner,\ - org.netbeans.modules.javadoc,\ - org.netbeans.modules.javawebstart,\ - org.netbeans.modules.junit,\ - org.netbeans.modules.maven,\ - org.netbeans.modules.maven.checkstyle,\ - org.netbeans.modules.maven.coverage,\ - org.netbeans.modules.maven.embedder,\ - org.netbeans.modules.maven.grammar,\ - org.netbeans.modules.maven.graph,\ - org.netbeans.modules.maven.hints,\ - org.netbeans.modules.maven.indexer,\ - org.netbeans.modules.maven.junit,\ - org.netbeans.modules.maven.kit,\ - org.netbeans.modules.maven.model,\ - org.netbeans.modules.maven.osgi,\ - org.netbeans.modules.maven.persistence,\ - org.netbeans.modules.maven.refactoring,\ - org.netbeans.modules.maven.repository,\ - org.netbeans.modules.maven.search,\ - org.netbeans.modules.maven.spring,\ - org.netbeans.modules.projectimport.eclipse.core,\ - org.netbeans.modules.projectimport.eclipse.j2se,\ - org.netbeans.modules.refactoring.java,\ - org.netbeans.modules.spellchecker.bindings.java,\ - org.netbeans.modules.spring.beans,\ - org.netbeans.modules.testng,\ - org.netbeans.modules.testng.ant,\ - org.netbeans.modules.testng.maven,\ - org.netbeans.modules.websvc.jaxws21,\ - org.netbeans.modules.websvc.jaxws21api,\ - org.netbeans.modules.websvc.saas.codegen.java,\ - org.netbeans.modules.xml.jaxb,\ - org.netbeans.modules.xml.tools.java,\ - org.netbeans.spi.java.hints +disabled.modules= From c2e596c260730cef1eb4e14cadbdd4852824778d Mon Sep 17 00:00:00 2001 From: shahit2 Date: Tue, 21 Jan 2014 15:12:57 -0500 Subject: [PATCH 08/38] Some files changed to non-public --- .../corecomponents/AdvancedConfigurationCleanDialog.java | 2 +- Core/src/org/sleuthkit/autopsy/corecomponents/OptionsPanel.java | 2 +- .../autopsy/corecomponents/ProductInformationPanel.java | 2 +- Core/src/org/sleuthkit/autopsy/corecomponents/VideoFrame.java | 2 +- Core/src/org/sleuthkit/autopsy/coreutils/ExecUtil.java | 2 +- Core/src/org/sleuthkit/autopsy/coreutils/FileUtil.java | 2 +- .../core/core.jar/org/netbeans/core/startup/Bundle.properties | 2 +- .../org/netbeans/core/windows/view/ui/Bundle.properties | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/AdvancedConfigurationCleanDialog.java b/Core/src/org/sleuthkit/autopsy/corecomponents/AdvancedConfigurationCleanDialog.java index 6b478fa221..41ff7988b8 100644 --- a/Core/src/org/sleuthkit/autopsy/corecomponents/AdvancedConfigurationCleanDialog.java +++ b/Core/src/org/sleuthkit/autopsy/corecomponents/AdvancedConfigurationCleanDialog.java @@ -15,7 +15,7 @@ import javax.swing.JPanel; * but the panel given to it. No additional buttons or features, except * the default close operation, which is set to dispose. */ - class AdvancedConfigurationCleanDialog extends javax.swing.JDialog { + public class AdvancedConfigurationCleanDialog extends javax.swing.JDialog { /** Creates new form AdvancedConfigurationDialog */ public AdvancedConfigurationCleanDialog() { diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/OptionsPanel.java b/Core/src/org/sleuthkit/autopsy/corecomponents/OptionsPanel.java index 95ed4c5025..2cf4f870d5 100644 --- a/Core/src/org/sleuthkit/autopsy/corecomponents/OptionsPanel.java +++ b/Core/src/org/sleuthkit/autopsy/corecomponents/OptionsPanel.java @@ -7,7 +7,7 @@ package org.sleuthkit.autopsy.corecomponents; /** * */ -public interface OptionsPanel { + interface OptionsPanel { /** * Store the current state of all options in this OptionsPanel. diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/ProductInformationPanel.java b/Core/src/org/sleuthkit/autopsy/corecomponents/ProductInformationPanel.java index 0499404c42..e42bc9d65a 100644 --- a/Core/src/org/sleuthkit/autopsy/corecomponents/ProductInformationPanel.java +++ b/Core/src/org/sleuthkit/autopsy/corecomponents/ProductInformationPanel.java @@ -43,7 +43,7 @@ import org.sleuthkit.datamodel.SleuthkitJNI; /** * Custom "About" window panel. */ -public class ProductInformationPanel extends JPanel implements HyperlinkListener { + class ProductInformationPanel extends JPanel implements HyperlinkListener { private URL url = null; private Icon about; diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/VideoFrame.java b/Core/src/org/sleuthkit/autopsy/corecomponents/VideoFrame.java index 95ce2c6d29..ce4080fb2c 100644 --- a/Core/src/org/sleuthkit/autopsy/corecomponents/VideoFrame.java +++ b/Core/src/org/sleuthkit/autopsy/corecomponents/VideoFrame.java @@ -5,7 +5,7 @@ import java.awt.Image; /** * */ -public class VideoFrame { + class VideoFrame { private Image frame; private long timeMillis; diff --git a/Core/src/org/sleuthkit/autopsy/coreutils/ExecUtil.java b/Core/src/org/sleuthkit/autopsy/coreutils/ExecUtil.java index e5c3b3af27..2bec8b7492 100644 --- a/Core/src/org/sleuthkit/autopsy/coreutils/ExecUtil.java +++ b/Core/src/org/sleuthkit/autopsy/coreutils/ExecUtil.java @@ -30,7 +30,7 @@ import org.sleuthkit.autopsy.coreutils.Logger; * Takes care of forking a process and reading output / error streams to either a * string buffer or directly to a file writer */ -public final class ExecUtil { + final class ExecUtil { private static final Logger logger = Logger.getLogger(ExecUtil.class.getName()); private Process proc = null; diff --git a/Core/src/org/sleuthkit/autopsy/coreutils/FileUtil.java b/Core/src/org/sleuthkit/autopsy/coreutils/FileUtil.java index d63259d584..c0e4ddf711 100644 --- a/Core/src/org/sleuthkit/autopsy/coreutils/FileUtil.java +++ b/Core/src/org/sleuthkit/autopsy/coreutils/FileUtil.java @@ -27,7 +27,7 @@ import org.openide.filesystems.FileObject; /** * File and dir utilities */ -public class FileUtil { + class FileUtil { private static final Logger logger = Logger.getLogger(FileUtil.class.getName()); diff --git a/branding/core/core.jar/org/netbeans/core/startup/Bundle.properties b/branding/core/core.jar/org/netbeans/core/startup/Bundle.properties index 2b1fec1f42..5334461f63 100644 --- a/branding/core/core.jar/org/netbeans/core/startup/Bundle.properties +++ b/branding/core/core.jar/org/netbeans/core/startup/Bundle.properties @@ -1,5 +1,5 @@ #Updated by build script -#Tue, 21 Jan 2014 12:41:23 -0500 +#Tue, 21 Jan 2014 15:00:14 -0500 LBL_splash_window_title=Starting Autopsy SPLASH_HEIGHT=288 SPLASH_WIDTH=538 diff --git a/branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties b/branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties index ed9af0bd8e..07b5e4671a 100644 --- a/branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties +++ b/branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties @@ -1,5 +1,5 @@ #Updated by build script -#Tue, 21 Jan 2014 12:41:23 -0500 +#Tue, 21 Jan 2014 15:00:14 -0500 CTL_MainWindow_Title=Autopsy 3.0.8 CTL_MainWindow_Title_No_Project=Autopsy 3.0.8 From 1c85f040d425e7e3fd14750a03ebbfb9587efc5e Mon Sep 17 00:00:00 2001 From: shahit2 Date: Wed, 22 Jan 2014 09:30:41 -0500 Subject: [PATCH 09/38] Some files changed to non-public --- Core/src/org/sleuthkit/autopsy/coreutils/FileUtil.java | 2 +- Core/src/org/sleuthkit/autopsy/coreutils/JLNK.java | 2 +- Core/src/org/sleuthkit/autopsy/coreutils/JLnkParser.java | 2 +- .../org/sleuthkit/autopsy/coreutils/JLnkParserException.java | 2 +- Core/src/org/sleuthkit/autopsy/coreutils/LnkEnums.java | 2 +- Core/src/org/sleuthkit/autopsy/coreutils/TestLogger.java | 2 +- Core/src/org/sleuthkit/autopsy/coreutils/TextUtil.java | 2 +- .../org/sleuthkit/autopsy/coreutils/TimestampingFormatter.java | 2 +- .../org/sleuthkit/autopsy/datamodel/AutopsyItemVisitor.java | 2 +- .../org/sleuthkit/autopsy/datamodel/AutopsyVisitableItem.java | 2 +- .../sleuthkit/autopsy/datamodel/ContentHierarchyVisitor.java | 2 +- .../sleuthkit/autopsy/datamodel/ContentIdHierarchyVisitor.java | 2 +- Core/src/org/sleuthkit/autopsy/datamodel/ContentNode.java | 2 +- .../org/sleuthkit/autopsy/datamodel/ContentNodeVisitor.java | 2 +- Core/src/org/sleuthkit/autopsy/datamodel/ContentTagNode.java | 2 +- Core/src/org/sleuthkit/autopsy/datamodel/ExtractedContent.java | 2 +- .../sleuthkit/autopsy/datamodel/ExtractedContentChildren.java | 2 +- .../sleuthkit/autopsy/datamodel/FileTypeExtensionFilters.java | 2 +- .../org/sleuthkit/autopsy/datamodel/FileTypeExtensions.java | 2 +- Core/src/org/sleuthkit/autopsy/datamodel/FilterNodeLeaf.java | 2 +- Core/src/org/sleuthkit/autopsy/datamodel/HighlightLookup.java | 2 +- Core/src/org/sleuthkit/autopsy/datamodel/KeyValueNode.java | 2 +- Core/src/org/sleuthkit/autopsy/datamodel/RecentFiles.java | 2 +- .../org/sleuthkit/autopsy/datamodel/RecentFilesChildren.java | 2 +- .../sleuthkit/autopsy/datamodel/RecentFilesFilterChildren.java | 2 +- Core/src/org/sleuthkit/autopsy/datamodel/TagsNode.java | 2 +- Core/src/org/sleuthkit/autopsy/datamodel/TagsNodeKey.java | 2 +- .../org/sleuthkit/autopsy/directorytree/ChangeViewAction.java | 2 +- .../autopsy/directorytree/DataResultFilterChildren.java | 2 +- .../sleuthkit/autopsy/directorytree/ExtractUnallocAction.java | 2 +- .../autopsy/directorytree/FileSystemDetailsPanel.form | 2 +- .../autopsy/directorytree/FileSystemDetailsPanel.java | 2 +- .../sleuthkit/autopsy/directorytree/HashSearchProvider.java | 2 +- .../sleuthkit/autopsy/directorytree/ResultDeleteAction.java | 2 +- .../org/sleuthkit/autopsy/examples/SampleContentViewer.java | 2 +- .../autopsy/examples/SampleDataSourceIngestModule.java | 2 +- .../org/sleuthkit/autopsy/examples/SampleFileIngestModule.java | 2 +- .../src/org/sleuthkit/autopsy/filesearch/FileSearchAction.java | 2 +- .../src/org/sleuthkit/autopsy/filesearch/FileSearchDialog.form | 1 + .../src/org/sleuthkit/autopsy/filesearch/FileSearchDialog.java | 2 +- Core/src/org/sleuthkit/autopsy/filesearch/FileSearchPanel.java | 2 +- .../org/sleuthkit/autopsy/ingest/GetFilesContentVisitor.java | 2 +- .../org/sleuthkit/autopsy/ingest/IngestDataSourceThread.java | 2 +- Core/src/org/sleuthkit/autopsy/ingest/IngestDialogPanel.java | 2 +- Core/src/org/sleuthkit/autopsy/ingest/IngestMessage.java | 2 +- .../org/sleuthkit/autopsy/ingest/IngestMessageMainPanel.form | 3 ++- .../org/sleuthkit/autopsy/ingest/IngestMessageMainPanel.java | 2 +- .../sleuthkit/autopsy/ingest/IngestMessageTopComponent.java | 2 +- .../src/org/sleuthkit/autopsy/ingest/IngestMessagesAction.java | 2 +- .../org/sleuthkit/autopsy/ingest/IngestMessagesToolbar.java | 2 +- .../src/org/sleuthkit/autopsy/ingest/IngestModuleAbstract.java | 2 +- Core/src/org/sleuthkit/autopsy/ingest/IngestModuleLoader.java | 2 +- Core/src/org/sleuthkit/autopsy/ingest/IngestMonitor.java | 2 +- Core/src/org/sleuthkit/autopsy/ingest/IngestUI.java | 2 +- .../sleuthkit/autopsy/menuactions/DataContentDynamicMenu.java | 2 +- .../src/org/sleuthkit/autopsy/menuactions/DataContentMenu.java | 2 +- .../sleuthkit/autopsy/menuactions/DataExplorerDynamicMenu.java | 2 +- .../org/sleuthkit/autopsy/menuactions/DataExplorerMenu.java | 2 +- Core/src/org/sleuthkit/autopsy/menuactions/DataResultMenu.java | 2 +- .../sleuthkit/autopsy/menuactions/OpenTopComponentAction.java | 2 +- .../org/sleuthkit/autopsy/menuactions/SearchResultMenu.java | 2 +- Core/src/org/sleuthkit/autopsy/menuactions/SpacerPanel.java | 2 +- Core/src/org/sleuthkit/autopsy/report/FileReportDataTypes.java | 2 +- Core/src/org/sleuthkit/autopsy/report/FileReportModule.java | 2 +- Core/src/org/sleuthkit/autopsy/report/FileReportText.java | 2 +- Core/src/org/sleuthkit/autopsy/report/GeneralReportModule.java | 2 +- Core/src/org/sleuthkit/autopsy/report/ReportBodyFile.java | 2 +- Core/src/org/sleuthkit/autopsy/report/ReportBranding.java | 2 +- .../org/sleuthkit/autopsy/report/ReportBrandingProviderI.java | 2 +- Core/src/org/sleuthkit/autopsy/report/ReportExcel.java | 2 +- .../org/sleuthkit/autopsy/report/ReportGenerationPanel.java | 2 +- Core/src/org/sleuthkit/autopsy/report/ReportGenerator.java | 2 +- Core/src/org/sleuthkit/autopsy/report/ReportHTML.java | 2 +- Core/src/org/sleuthkit/autopsy/report/ReportModule.java | 2 +- Core/src/org/sleuthkit/autopsy/report/ReportProgressPanel.java | 2 +- Core/src/org/sleuthkit/autopsy/report/ReportVisualPanel1.java | 2 +- Core/src/org/sleuthkit/autopsy/report/ReportVisualPanel2.java | 2 +- .../sleuthkit/autopsy/report/ReportWizardFileOptionsPanel.java | 2 +- .../autopsy/report/ReportWizardFileOptionsVisualPanel.java | 2 +- .../src/org/sleuthkit/autopsy/report/ReportWizardIterator.java | 2 +- Core/src/org/sleuthkit/autopsy/report/ReportWizardPanel1.java | 2 +- Core/src/org/sleuthkit/autopsy/report/ReportWizardPanel2.java | 2 +- Core/src/org/sleuthkit/autopsy/report/SQLiteDBConnect.java | 2 +- Core/src/org/sleuthkit/autopsy/report/TableReportModule.java | 2 +- CoreLibs/src/org/sleuthkit/autopsy/corelibs/ScalrWrapper.java | 2 +- .../core/core.jar/org/netbeans/core/startup/Bundle.properties | 2 +- .../org/netbeans/core/windows/view/ui/Bundle.properties | 2 +- 87 files changed, 88 insertions(+), 86 deletions(-) diff --git a/Core/src/org/sleuthkit/autopsy/coreutils/FileUtil.java b/Core/src/org/sleuthkit/autopsy/coreutils/FileUtil.java index c0e4ddf711..2aa8ab7159 100644 --- a/Core/src/org/sleuthkit/autopsy/coreutils/FileUtil.java +++ b/Core/src/org/sleuthkit/autopsy/coreutils/FileUtil.java @@ -27,7 +27,7 @@ import org.openide.filesystems.FileObject; /** * File and dir utilities */ - class FileUtil { + public class FileUtil { private static final Logger logger = Logger.getLogger(FileUtil.class.getName()); diff --git a/Core/src/org/sleuthkit/autopsy/coreutils/JLNK.java b/Core/src/org/sleuthkit/autopsy/coreutils/JLNK.java index 5a617c6056..0ee3ec4b05 100644 --- a/Core/src/org/sleuthkit/autopsy/coreutils/JLNK.java +++ b/Core/src/org/sleuthkit/autopsy/coreutils/JLNK.java @@ -31,7 +31,7 @@ import org.sleuthkit.autopsy.coreutils.LnkEnums.NetworkProviderType; * * @author dick */ -public class JLNK { + class JLNK { private int header; private byte[] linkClassIdentifier; private List linkFlags; diff --git a/Core/src/org/sleuthkit/autopsy/coreutils/JLnkParser.java b/Core/src/org/sleuthkit/autopsy/coreutils/JLnkParser.java index 9c7177e780..6b6ab26fd3 100644 --- a/Core/src/org/sleuthkit/autopsy/coreutils/JLnkParser.java +++ b/Core/src/org/sleuthkit/autopsy/coreutils/JLnkParser.java @@ -38,7 +38,7 @@ import org.sleuthkit.autopsy.coreutils.LnkEnums.NetworkProviderType; * http://msdn.microsoft.com/en-us/library/windows/desktop/cc144090(v=vs.85).aspx#unknown_74413 * http://blog.0x01000000.org/2010/08/10/lnk-parsing-youre-doing-it-wrong-i/ */ -public class JLnkParser { + class JLnkParser { private byte[] content; private static final Logger logger = Logger.getLogger(JLnkParser.class.getName()); diff --git a/Core/src/org/sleuthkit/autopsy/coreutils/JLnkParserException.java b/Core/src/org/sleuthkit/autopsy/coreutils/JLnkParserException.java index 0998b71d1b..501f3dd9f0 100755 --- a/Core/src/org/sleuthkit/autopsy/coreutils/JLnkParserException.java +++ b/Core/src/org/sleuthkit/autopsy/coreutils/JLnkParserException.java @@ -22,7 +22,7 @@ package org.sleuthkit.autopsy.coreutils; * * @author jwallace */ -public class JLnkParserException extends Exception { + class JLnkParserException extends Exception { /** * Constructs an instance of diff --git a/Core/src/org/sleuthkit/autopsy/coreutils/LnkEnums.java b/Core/src/org/sleuthkit/autopsy/coreutils/LnkEnums.java index 7c6c413ce0..5b35043057 100644 --- a/Core/src/org/sleuthkit/autopsy/coreutils/LnkEnums.java +++ b/Core/src/org/sleuthkit/autopsy/coreutils/LnkEnums.java @@ -22,7 +22,7 @@ package org.sleuthkit.autopsy.coreutils; * * @author dick */ -public class LnkEnums { + class LnkEnums { private static final byte[] CDRIVES = new byte[] { (byte)0xe0, 0x4f, (byte)0xd0, 0x20, (byte)0xea, 0x3a, 0x69, 0x10, (byte)0xa2, (byte)0xd8, 0x08, 0x00, 0x2b, 0x30, 0x30, (byte)0x9d }; diff --git a/Core/src/org/sleuthkit/autopsy/coreutils/TestLogger.java b/Core/src/org/sleuthkit/autopsy/coreutils/TestLogger.java index 08942f3221..e03ff9d05a 100644 --- a/Core/src/org/sleuthkit/autopsy/coreutils/TestLogger.java +++ b/Core/src/org/sleuthkit/autopsy/coreutils/TestLogger.java @@ -28,7 +28,7 @@ import java.util.logging.Level; /* * Toolbar button for testing logging. Not a normal part of application. */ -public final class TestLogger implements ActionListener { + final class TestLogger implements ActionListener { static final Logger logger = Logger.getLogger(TestLogger.class.getName()); Formatter fmt; diff --git a/Core/src/org/sleuthkit/autopsy/coreutils/TextUtil.java b/Core/src/org/sleuthkit/autopsy/coreutils/TextUtil.java index 818f54ff42..7ffd8effe1 100644 --- a/Core/src/org/sleuthkit/autopsy/coreutils/TextUtil.java +++ b/Core/src/org/sleuthkit/autopsy/coreutils/TextUtil.java @@ -23,7 +23,7 @@ import java.awt.ComponentOrientation; /** * Text utilities */ -public class TextUtil { + class TextUtil { /** * Determine and return text orientation diff --git a/Core/src/org/sleuthkit/autopsy/coreutils/TimestampingFormatter.java b/Core/src/org/sleuthkit/autopsy/coreutils/TimestampingFormatter.java index 469722aa48..77d2c269cd 100644 --- a/Core/src/org/sleuthkit/autopsy/coreutils/TimestampingFormatter.java +++ b/Core/src/org/sleuthkit/autopsy/coreutils/TimestampingFormatter.java @@ -30,7 +30,7 @@ import java.util.logging.LogRecord; * Formatter to wrap another formatter and prepend a timestampe to each formatted string * Not currently used. */ -public class TimestampingFormatter extends Formatter { + class TimestampingFormatter extends Formatter { Formatter original; DateFormat timestampFormat = DateFormat.getDateTimeInstance(DateFormat.LONG, DateFormat.LONG, Locale.US); diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/AutopsyItemVisitor.java b/Core/src/org/sleuthkit/autopsy/datamodel/AutopsyItemVisitor.java index 27d505b489..3a53552739 100644 --- a/Core/src/org/sleuthkit/autopsy/datamodel/AutopsyItemVisitor.java +++ b/Core/src/org/sleuthkit/autopsy/datamodel/AutopsyItemVisitor.java @@ -22,7 +22,7 @@ package org.sleuthkit.autopsy.datamodel; * * @author dfickling */ -public interface AutopsyItemVisitor { + interface AutopsyItemVisitor { T visit(ExtractedContent ec); diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/AutopsyVisitableItem.java b/Core/src/org/sleuthkit/autopsy/datamodel/AutopsyVisitableItem.java index bc9a3a1239..90d35b307c 100644 --- a/Core/src/org/sleuthkit/autopsy/datamodel/AutopsyVisitableItem.java +++ b/Core/src/org/sleuthkit/autopsy/datamodel/AutopsyVisitableItem.java @@ -21,7 +21,7 @@ package org.sleuthkit.autopsy.datamodel; /** * Abstraction for certain top level items displayed in the GUI */ -public interface AutopsyVisitableItem { + interface AutopsyVisitableItem { /** * visitor pattern support diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/ContentHierarchyVisitor.java b/Core/src/org/sleuthkit/autopsy/datamodel/ContentHierarchyVisitor.java index 21d421b1fb..f6ebcc78c9 100644 --- a/Core/src/org/sleuthkit/autopsy/datamodel/ContentHierarchyVisitor.java +++ b/Core/src/org/sleuthkit/autopsy/datamodel/ContentHierarchyVisitor.java @@ -38,7 +38,7 @@ import org.sleuthkit.datamodel.VolumeSystem; * past subclasses that aren't part of the exposed hierarchy (VolumeSystem, * FileSystem, and root Directories) */ -public class ContentHierarchyVisitor extends ContentVisitor.Default> { + class ContentHierarchyVisitor extends ContentVisitor.Default> { private static final Logger logger = Logger.getLogger(ContentHierarchyVisitor.class.getName()); private static final ContentHierarchyVisitor INSTANCE = new ContentHierarchyVisitor(); diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/ContentIdHierarchyVisitor.java b/Core/src/org/sleuthkit/autopsy/datamodel/ContentIdHierarchyVisitor.java index 72ded24b36..dbce27c925 100644 --- a/Core/src/org/sleuthkit/autopsy/datamodel/ContentIdHierarchyVisitor.java +++ b/Core/src/org/sleuthkit/autopsy/datamodel/ContentIdHierarchyVisitor.java @@ -38,7 +38,7 @@ import org.sleuthkit.datamodel.VolumeSystem; * past subclasses that aren't part of the exposed hierarchy (VolumeSystem, * FileSystem, and root Directories) */ -public class ContentIdHierarchyVisitor extends ContentVisitor.Default> { + class ContentIdHierarchyVisitor extends ContentVisitor.Default> { private static final Logger logger = Logger.getLogger(ContentHierarchyVisitor.class.getName()); private static final ContentIdHierarchyVisitor INSTANCE = new ContentIdHierarchyVisitor(); diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/ContentNode.java b/Core/src/org/sleuthkit/autopsy/datamodel/ContentNode.java index a11b001f12..89b7876015 100644 --- a/Core/src/org/sleuthkit/autopsy/datamodel/ContentNode.java +++ b/Core/src/org/sleuthkit/autopsy/datamodel/ContentNode.java @@ -26,7 +26,7 @@ import org.openide.util.Lookup; * Provides basic information such as ID, parent ID, etc. */ -public abstract class ContentNode extends DisplayableItemNode{ + abstract class ContentNode extends DisplayableItemNode{ public ContentNode(Children children) { super(children); diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/ContentNodeVisitor.java b/Core/src/org/sleuthkit/autopsy/datamodel/ContentNodeVisitor.java index 7685f0cdc5..4fd9d12c54 100644 --- a/Core/src/org/sleuthkit/autopsy/datamodel/ContentNodeVisitor.java +++ b/Core/src/org/sleuthkit/autopsy/datamodel/ContentNodeVisitor.java @@ -22,7 +22,7 @@ package org.sleuthkit.autopsy.datamodel; * Interface for visitor pattern on ContentNodes * @param visit method return type */ -public interface ContentNodeVisitor { + interface ContentNodeVisitor { T visit(DirectoryNode dn); diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/ContentTagNode.java b/Core/src/org/sleuthkit/autopsy/datamodel/ContentTagNode.java index 352b040888..5749b53aa3 100755 --- a/Core/src/org/sleuthkit/autopsy/datamodel/ContentTagNode.java +++ b/Core/src/org/sleuthkit/autopsy/datamodel/ContentTagNode.java @@ -36,7 +36,7 @@ import org.sleuthkit.datamodel.TskCoreException; * consisting of content and blackboard artifact tags, grouped first by tag * type, then by tag name. */ -public class ContentTagNode extends DisplayableItemNode { + class ContentTagNode extends DisplayableItemNode { private static final String ICON_PATH = "org/sleuthkit/autopsy/images/blue-tag-icon-16.png"; private final ContentTag tag; diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/ExtractedContent.java b/Core/src/org/sleuthkit/autopsy/datamodel/ExtractedContent.java index 81bc791adf..394eb2228e 100644 --- a/Core/src/org/sleuthkit/autopsy/datamodel/ExtractedContent.java +++ b/Core/src/org/sleuthkit/autopsy/datamodel/ExtractedContent.java @@ -24,7 +24,7 @@ import org.sleuthkit.datamodel.SleuthkitCase; * Parent of the "extracted content" artifacts to be displayed in the tree. Other * artifacts are displayed under other more specific parents. */ -public class ExtractedContent implements AutopsyVisitableItem{ + class ExtractedContent implements AutopsyVisitableItem{ SleuthkitCase skCase; diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/ExtractedContentChildren.java b/Core/src/org/sleuthkit/autopsy/datamodel/ExtractedContentChildren.java index 41ae98a2d0..d5d92183b2 100644 --- a/Core/src/org/sleuthkit/autopsy/datamodel/ExtractedContentChildren.java +++ b/Core/src/org/sleuthkit/autopsy/datamodel/ExtractedContentChildren.java @@ -37,7 +37,7 @@ import org.sleuthkit.datamodel.TskCoreException; * has all of the blackboard artifacts that are not displayed in a more specific form elsewhere * in the tree. */ -public class ExtractedContentChildren extends ChildFactory { +class ExtractedContentChildren extends ChildFactory { private SleuthkitCase skCase; private final ArrayList doNotShow; diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/FileTypeExtensionFilters.java b/Core/src/org/sleuthkit/autopsy/datamodel/FileTypeExtensionFilters.java index 3f08fd807e..b90a257419 100644 --- a/Core/src/org/sleuthkit/autopsy/datamodel/FileTypeExtensionFilters.java +++ b/Core/src/org/sleuthkit/autopsy/datamodel/FileTypeExtensionFilters.java @@ -25,7 +25,7 @@ import org.sleuthkit.datamodel.SleuthkitCase; /** * Filters database results by file extension. */ -public class FileTypeExtensionFilters implements AutopsyVisitableItem { + class FileTypeExtensionFilters implements AutopsyVisitableItem { private SleuthkitCase skCase; diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/FileTypeExtensions.java b/Core/src/org/sleuthkit/autopsy/datamodel/FileTypeExtensions.java index 0b067a4678..f24272ef01 100644 --- a/Core/src/org/sleuthkit/autopsy/datamodel/FileTypeExtensions.java +++ b/Core/src/org/sleuthkit/autopsy/datamodel/FileTypeExtensions.java @@ -25,7 +25,7 @@ import java.util.List; * Contains Lists of commonly known and used file type extensions * and 'getters' to obtain them. */ -public class FileTypeExtensions { + class FileTypeExtensions { private final static List IMAGE_EXTENSIONS = Arrays.asList(".jpg", ".jpeg", ".png", ".psd", ".nef", ".tiff", ".bmp"); private final static List VIDEO_EXTENSIONS = Arrays.asList(".aaf", ".3gp", ".asf", ".avi", ".m1v", ".m2v", ".m4v", ".mp4", ".mov", ".mpeg", ".mpg", ".mpe", ".mp4", ".rm", ".wmv", ".mpv", ".flv", ".swf"); diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/FilterNodeLeaf.java b/Core/src/org/sleuthkit/autopsy/datamodel/FilterNodeLeaf.java index 59fc78b0a2..844d658008 100644 --- a/Core/src/org/sleuthkit/autopsy/datamodel/FilterNodeLeaf.java +++ b/Core/src/org/sleuthkit/autopsy/datamodel/FilterNodeLeaf.java @@ -24,7 +24,7 @@ import org.openide.nodes.Node; /** * AbstractFile filter node that filters out the children */ -public class FilterNodeLeaf extends FilterNode { + class FilterNodeLeaf extends FilterNode { public FilterNodeLeaf(Node node) { super(node, Children.LEAF); diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/HighlightLookup.java b/Core/src/org/sleuthkit/autopsy/datamodel/HighlightLookup.java index 5aa38d9825..749e3dbdbb 100644 --- a/Core/src/org/sleuthkit/autopsy/datamodel/HighlightLookup.java +++ b/Core/src/org/sleuthkit/autopsy/datamodel/HighlightLookup.java @@ -29,6 +29,6 @@ import org.sleuthkit.datamodel.Content; * @param isRegex whether the original query was a regex query * @param originalQuery (regex or literal) that may need to be performed again to get all ContentHit results */ -public interface HighlightLookup { + interface HighlightLookup { public HighlightLookup createInstance(Content c, String keywordHitQuery, boolean isRegex, String originalQuery); } diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/KeyValueNode.java b/Core/src/org/sleuthkit/autopsy/datamodel/KeyValueNode.java index a0d30ae1fe..fea5fd7850 100644 --- a/Core/src/org/sleuthkit/autopsy/datamodel/KeyValueNode.java +++ b/Core/src/org/sleuthkit/autopsy/datamodel/KeyValueNode.java @@ -33,7 +33,7 @@ import org.sleuthkit.datamodel.AbstractFile; * * @author alawrence */ -public class KeyValueNode extends AbstractNode { + class KeyValueNode extends AbstractNode { private KeyValue data; diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/RecentFiles.java b/Core/src/org/sleuthkit/autopsy/datamodel/RecentFiles.java index a61899597f..2745951574 100644 --- a/Core/src/org/sleuthkit/autopsy/datamodel/RecentFiles.java +++ b/Core/src/org/sleuthkit/autopsy/datamodel/RecentFiles.java @@ -23,7 +23,7 @@ import org.sleuthkit.datamodel.SleuthkitCase; /** * Recent files node support */ -public class RecentFiles implements AutopsyVisitableItem { + class RecentFiles implements AutopsyVisitableItem { SleuthkitCase skCase; diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/RecentFilesChildren.java b/Core/src/org/sleuthkit/autopsy/datamodel/RecentFilesChildren.java index 759e906a4e..b2247873df 100644 --- a/Core/src/org/sleuthkit/autopsy/datamodel/RecentFilesChildren.java +++ b/Core/src/org/sleuthkit/autopsy/datamodel/RecentFilesChildren.java @@ -34,7 +34,7 @@ import org.sleuthkit.datamodel.SleuthkitCase; * * @author dfickling */ -public class RecentFilesChildren extends ChildFactory { + class RecentFilesChildren extends ChildFactory { private SleuthkitCase skCase; private Calendar lastDay; diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/RecentFilesFilterChildren.java b/Core/src/org/sleuthkit/autopsy/datamodel/RecentFilesFilterChildren.java index fba8171840..374fe54db2 100644 --- a/Core/src/org/sleuthkit/autopsy/datamodel/RecentFilesFilterChildren.java +++ b/Core/src/org/sleuthkit/autopsy/datamodel/RecentFilesFilterChildren.java @@ -42,7 +42,7 @@ import org.sleuthkit.datamodel.TskData; * * @author dfickling */ -public class RecentFilesFilterChildren extends ChildFactory { + class RecentFilesFilterChildren extends ChildFactory { private SleuthkitCase skCase; private RecentFilesFilter filter; diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/TagsNode.java b/Core/src/org/sleuthkit/autopsy/datamodel/TagsNode.java index 37669308bd..b9acc010e7 100755 --- a/Core/src/org/sleuthkit/autopsy/datamodel/TagsNode.java +++ b/Core/src/org/sleuthkit/autopsy/datamodel/TagsNode.java @@ -36,7 +36,7 @@ import org.sleuthkit.datamodel.TskCoreException; * content and blackboard artifact tags, grouped first by tag type, then by * tag name. */ -public class TagsNode extends DisplayableItemNode { + class TagsNode extends DisplayableItemNode { private static final String DISPLAY_NAME = "Tags"; private static final String ICON_PATH = "org/sleuthkit/autopsy/images/tag-folder-blue-icon-16.png"; diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/TagsNodeKey.java b/Core/src/org/sleuthkit/autopsy/datamodel/TagsNodeKey.java index cfdd31731d..dad36cfa34 100755 --- a/Core/src/org/sleuthkit/autopsy/datamodel/TagsNodeKey.java +++ b/Core/src/org/sleuthkit/autopsy/datamodel/TagsNodeKey.java @@ -23,7 +23,7 @@ package org.sleuthkit.autopsy.datamodel; * RootContentChildren class. RootContentChildren is a NetBeans child node * factory built on top of the NetBeans Children.Keys class. */ -public class TagsNodeKey implements AutopsyVisitableItem { + class TagsNodeKey implements AutopsyVisitableItem { // Creation of a TagsNode object corresponding to a TagsNodeKey object is done // by a CreateAutopsyNodeVisitor dispatched from the AbstractContentChildren // override of Children.Keys.createNodes(). diff --git a/Core/src/org/sleuthkit/autopsy/directorytree/ChangeViewAction.java b/Core/src/org/sleuthkit/autopsy/directorytree/ChangeViewAction.java index 2b5b7d80a9..1c6c42ce58 100644 --- a/Core/src/org/sleuthkit/autopsy/directorytree/ChangeViewAction.java +++ b/Core/src/org/sleuthkit/autopsy/directorytree/ChangeViewAction.java @@ -34,7 +34,7 @@ import org.sleuthkit.autopsy.coreutils.Logger; * * @author jantonius */ -public class ChangeViewAction extends AbstractAction implements Presenter.Popup { + class ChangeViewAction extends AbstractAction implements Presenter.Popup { private int type; // type 1 = hex view, 2 = string view private Node node; diff --git a/Core/src/org/sleuthkit/autopsy/directorytree/DataResultFilterChildren.java b/Core/src/org/sleuthkit/autopsy/directorytree/DataResultFilterChildren.java index e81cd2dfbc..2dfa1380dc 100644 --- a/Core/src/org/sleuthkit/autopsy/directorytree/DataResultFilterChildren.java +++ b/Core/src/org/sleuthkit/autopsy/directorytree/DataResultFilterChildren.java @@ -27,7 +27,7 @@ import org.openide.nodes.Node; * DataResultFilterNode that created in the DataResultFilterNode.java. * */ -public class DataResultFilterChildren extends FilterNode.Children { + class DataResultFilterChildren extends FilterNode.Children { ExplorerManager sourceEm; diff --git a/Core/src/org/sleuthkit/autopsy/directorytree/ExtractUnallocAction.java b/Core/src/org/sleuthkit/autopsy/directorytree/ExtractUnallocAction.java index 82b162d5e5..5469db6581 100644 --- a/Core/src/org/sleuthkit/autopsy/directorytree/ExtractUnallocAction.java +++ b/Core/src/org/sleuthkit/autopsy/directorytree/ExtractUnallocAction.java @@ -55,7 +55,7 @@ import org.sleuthkit.datamodel.VolumeSystem; /** * Extracts all the unallocated space as a single file */ -public final class ExtractUnallocAction extends AbstractAction { + final class ExtractUnallocAction extends AbstractAction { private final List LstUnallocs = new ArrayList(); private static final List lockedVols = new ArrayList(); diff --git a/Core/src/org/sleuthkit/autopsy/directorytree/FileSystemDetailsPanel.form b/Core/src/org/sleuthkit/autopsy/directorytree/FileSystemDetailsPanel.form index 6892af7264..d4e1afe874 100644 --- a/Core/src/org/sleuthkit/autopsy/directorytree/FileSystemDetailsPanel.form +++ b/Core/src/org/sleuthkit/autopsy/directorytree/FileSystemDetailsPanel.form @@ -1,4 +1,4 @@ - + diff --git a/Core/src/org/sleuthkit/autopsy/directorytree/FileSystemDetailsPanel.java b/Core/src/org/sleuthkit/autopsy/directorytree/FileSystemDetailsPanel.java index 31a51334c9..9363d7f7b5 100644 --- a/Core/src/org/sleuthkit/autopsy/directorytree/FileSystemDetailsPanel.java +++ b/Core/src/org/sleuthkit/autopsy/directorytree/FileSystemDetailsPanel.java @@ -25,7 +25,7 @@ import java.awt.event.ActionListener; * * @author jantonius */ -class FileSystemDetailsPanel extends javax.swing.JPanel { + class FileSystemDetailsPanel extends javax.swing.JPanel { /** Creates new form FileSystemDetailsPanel */ FileSystemDetailsPanel() { diff --git a/Core/src/org/sleuthkit/autopsy/directorytree/HashSearchProvider.java b/Core/src/org/sleuthkit/autopsy/directorytree/HashSearchProvider.java index a69451cc07..04ce1fdb55 100644 --- a/Core/src/org/sleuthkit/autopsy/directorytree/HashSearchProvider.java +++ b/Core/src/org/sleuthkit/autopsy/directorytree/HashSearchProvider.java @@ -23,6 +23,6 @@ import org.openide.nodes.Node; /** * Lookup interface for hash search (to deal with circular deps) */ -public interface HashSearchProvider { + interface HashSearchProvider { public void search(Node contentNode); } diff --git a/Core/src/org/sleuthkit/autopsy/directorytree/ResultDeleteAction.java b/Core/src/org/sleuthkit/autopsy/directorytree/ResultDeleteAction.java index 0353fdd7cc..05ff64d947 100644 --- a/Core/src/org/sleuthkit/autopsy/directorytree/ResultDeleteAction.java +++ b/Core/src/org/sleuthkit/autopsy/directorytree/ResultDeleteAction.java @@ -36,7 +36,7 @@ import org.sleuthkit.datamodel.SleuthkitCase; * @deprecated do not use, it is here in case we ever pick up on this work */ @Deprecated -public class ResultDeleteAction extends AbstractAction { + class ResultDeleteAction extends AbstractAction { private enum ActionType { diff --git a/Core/src/org/sleuthkit/autopsy/examples/SampleContentViewer.java b/Core/src/org/sleuthkit/autopsy/examples/SampleContentViewer.java index d6f80ffad9..571c556983 100755 --- a/Core/src/org/sleuthkit/autopsy/examples/SampleContentViewer.java +++ b/Core/src/org/sleuthkit/autopsy/examples/SampleContentViewer.java @@ -45,7 +45,7 @@ import org.sleuthkit.datamodel.TskCoreException; * it is compiled each time to ensure that it is compliant with the API. */ // @ServiceProvider(service = DataContentViewer.class) -public class SampleContentViewer extends javax.swing.JPanel implements DataContentViewer { + class SampleContentViewer extends javax.swing.JPanel implements DataContentViewer { /** * Creates new form SampleContentViewer diff --git a/Core/src/org/sleuthkit/autopsy/examples/SampleDataSourceIngestModule.java b/Core/src/org/sleuthkit/autopsy/examples/SampleDataSourceIngestModule.java index 5fa98f65d4..da4a7b99b7 100755 --- a/Core/src/org/sleuthkit/autopsy/examples/SampleDataSourceIngestModule.java +++ b/Core/src/org/sleuthkit/autopsy/examples/SampleDataSourceIngestModule.java @@ -50,7 +50,7 @@ import org.sleuthkit.datamodel.TskCoreException; * Sample DataSource-level ingest module that doesn't do much at all. * Just exists to show basic idea of these modules */ -public class SampleDataSourceIngestModule extends org.sleuthkit.autopsy.ingest.IngestModuleDataSource { + class SampleDataSourceIngestModule extends org.sleuthkit.autopsy.ingest.IngestModuleDataSource { /* Data Source modules operate on a disk or set of logical files. They * are passed in teh data source refernce and query it for things they want. diff --git a/Core/src/org/sleuthkit/autopsy/examples/SampleFileIngestModule.java b/Core/src/org/sleuthkit/autopsy/examples/SampleFileIngestModule.java index 676f9bd79f..464c79888c 100755 --- a/Core/src/org/sleuthkit/autopsy/examples/SampleFileIngestModule.java +++ b/Core/src/org/sleuthkit/autopsy/examples/SampleFileIngestModule.java @@ -53,7 +53,7 @@ import org.sleuthkit.datamodel.TskData; * IngestModuleLoader will not load things from the org.sleuthkit.autopsy.examples package. * Either change the package or the loading code to make this module actually run. */ -public class SampleFileIngestModule extends org.sleuthkit.autopsy.ingest.IngestModuleAbstractFile { + class SampleFileIngestModule extends org.sleuthkit.autopsy.ingest.IngestModuleAbstractFile { private int attrId = -1; private static SampleFileIngestModule defaultInstance = null; diff --git a/Core/src/org/sleuthkit/autopsy/filesearch/FileSearchAction.java b/Core/src/org/sleuthkit/autopsy/filesearch/FileSearchAction.java index 800f51fa7a..52b7f69991 100644 --- a/Core/src/org/sleuthkit/autopsy/filesearch/FileSearchAction.java +++ b/Core/src/org/sleuthkit/autopsy/filesearch/FileSearchAction.java @@ -26,7 +26,7 @@ import org.openide.util.actions.CallableSystemAction; import org.sleuthkit.autopsy.casemodule.Case; import org.sleuthkit.autopsy.directorytree.FileSearchProvider; -public final class FileSearchAction extends CallableSystemAction implements FileSearchProvider{ + final class FileSearchAction extends CallableSystemAction implements FileSearchProvider{ private static FileSearchAction instance = null; diff --git a/Core/src/org/sleuthkit/autopsy/filesearch/FileSearchDialog.form b/Core/src/org/sleuthkit/autopsy/filesearch/FileSearchDialog.form index d7cde123fa..5bf5b4bdcd 100644 --- a/Core/src/org/sleuthkit/autopsy/filesearch/FileSearchDialog.form +++ b/Core/src/org/sleuthkit/autopsy/filesearch/FileSearchDialog.form @@ -6,6 +6,7 @@ + diff --git a/Core/src/org/sleuthkit/autopsy/filesearch/FileSearchDialog.java b/Core/src/org/sleuthkit/autopsy/filesearch/FileSearchDialog.java index a4e9ff340e..726f0826e2 100644 --- a/Core/src/org/sleuthkit/autopsy/filesearch/FileSearchDialog.java +++ b/Core/src/org/sleuthkit/autopsy/filesearch/FileSearchDialog.java @@ -33,7 +33,7 @@ import javax.swing.JFrame; /** * File search dialog */ -public class FileSearchDialog extends javax.swing.JDialog { + class FileSearchDialog extends javax.swing.JDialog { /** Creates new form FileSearchDialog */ public FileSearchDialog() { diff --git a/Core/src/org/sleuthkit/autopsy/filesearch/FileSearchPanel.java b/Core/src/org/sleuthkit/autopsy/filesearch/FileSearchPanel.java index 40993ab2e9..492510e739 100644 --- a/Core/src/org/sleuthkit/autopsy/filesearch/FileSearchPanel.java +++ b/Core/src/org/sleuthkit/autopsy/filesearch/FileSearchPanel.java @@ -56,7 +56,7 @@ import org.sleuthkit.datamodel.TskCoreException; /** * FileSearchPanel that present search options */ -public class FileSearchPanel extends javax.swing.JPanel { + class FileSearchPanel extends javax.swing.JPanel { private List filterAreas = new ArrayList(); private JButton searchButton; diff --git a/Core/src/org/sleuthkit/autopsy/ingest/GetFilesContentVisitor.java b/Core/src/org/sleuthkit/autopsy/ingest/GetFilesContentVisitor.java index fb25824727..65290a5b3c 100644 --- a/Core/src/org/sleuthkit/autopsy/ingest/GetFilesContentVisitor.java +++ b/Core/src/org/sleuthkit/autopsy/ingest/GetFilesContentVisitor.java @@ -39,7 +39,7 @@ import org.sleuthkit.datamodel.LayoutFile; * Abstract visitor for getting all the files from content * TODO should be moved to utility module (needs resolve cyclic deps) */ -public abstract class GetFilesContentVisitor implements ContentVisitor> { + abstract class GetFilesContentVisitor implements ContentVisitor> { private static final Logger logger = Logger.getLogger(GetFilesContentVisitor.class.getName()); diff --git a/Core/src/org/sleuthkit/autopsy/ingest/IngestDataSourceThread.java b/Core/src/org/sleuthkit/autopsy/ingest/IngestDataSourceThread.java index 40e01c81eb..85f62f8785 100644 --- a/Core/src/org/sleuthkit/autopsy/ingest/IngestDataSourceThread.java +++ b/Core/src/org/sleuthkit/autopsy/ingest/IngestDataSourceThread.java @@ -37,7 +37,7 @@ import org.sleuthkit.datamodel.Content; * Worker thread that runs a data source-level ingest module (image, file set virt dir, etc). * Used to process only a single data-source and single module. */ -public class IngestDataSourceThread extends SwingWorker { + class IngestDataSourceThread extends SwingWorker { private final Logger logger = Logger.getLogger(IngestDataSourceThread.class.getName()); private ProgressHandle progress; diff --git a/Core/src/org/sleuthkit/autopsy/ingest/IngestDialogPanel.java b/Core/src/org/sleuthkit/autopsy/ingest/IngestDialogPanel.java index 198f19da13..ff6ef874e9 100644 --- a/Core/src/org/sleuthkit/autopsy/ingest/IngestDialogPanel.java +++ b/Core/src/org/sleuthkit/autopsy/ingest/IngestDialogPanel.java @@ -40,7 +40,7 @@ import org.sleuthkit.autopsy.coreutils.ModuleSettings; /** * main configuration panel for all ingest modules, reusable JPanel component */ -public class IngestDialogPanel extends javax.swing.JPanel { + class IngestDialogPanel extends javax.swing.JPanel { private IngestModuleAbstract currentModule; private ModulesTableModel tableModel; diff --git a/Core/src/org/sleuthkit/autopsy/ingest/IngestMessage.java b/Core/src/org/sleuthkit/autopsy/ingest/IngestMessage.java index de0da0cae3..445210d29a 100644 --- a/Core/src/org/sleuthkit/autopsy/ingest/IngestMessage.java +++ b/Core/src/org/sleuthkit/autopsy/ingest/IngestMessage.java @@ -29,7 +29,7 @@ import org.sleuthkit.datamodel.BlackboardArtifact; * Submitted to user via IngestServices. * Create using factory methods. */ -public class IngestMessage { + class IngestMessage { /** * Level of message. diff --git a/Core/src/org/sleuthkit/autopsy/ingest/IngestMessageMainPanel.form b/Core/src/org/sleuthkit/autopsy/ingest/IngestMessageMainPanel.form index b435917e0c..0c3054593b 100644 --- a/Core/src/org/sleuthkit/autopsy/ingest/IngestMessageMainPanel.form +++ b/Core/src/org/sleuthkit/autopsy/ingest/IngestMessageMainPanel.form @@ -1,6 +1,6 @@ - + @@ -11,6 +11,7 @@ + diff --git a/Core/src/org/sleuthkit/autopsy/ingest/IngestMessageMainPanel.java b/Core/src/org/sleuthkit/autopsy/ingest/IngestMessageMainPanel.java index f950c9f807..5e0bf81fec 100644 --- a/Core/src/org/sleuthkit/autopsy/ingest/IngestMessageMainPanel.java +++ b/Core/src/org/sleuthkit/autopsy/ingest/IngestMessageMainPanel.java @@ -25,7 +25,7 @@ import org.sleuthkit.autopsy.coreutils.Logger; * the main layered pane container for messages table (IngestMessagePanel) and * details view (IngestMessageDetailsPanel) */ -public class IngestMessageMainPanel extends javax.swing.JPanel { + class IngestMessageMainPanel extends javax.swing.JPanel { private IngestMessagePanel messagePanel; private IngestMessageDetailsPanel detailsPanel; diff --git a/Core/src/org/sleuthkit/autopsy/ingest/IngestMessageTopComponent.java b/Core/src/org/sleuthkit/autopsy/ingest/IngestMessageTopComponent.java index f45987a96d..d4a9ab9cce 100644 --- a/Core/src/org/sleuthkit/autopsy/ingest/IngestMessageTopComponent.java +++ b/Core/src/org/sleuthkit/autopsy/ingest/IngestMessageTopComponent.java @@ -44,7 +44,7 @@ import org.sleuthkit.datamodel.Content; /** * Top component which displays something. */ -public final class IngestMessageTopComponent extends TopComponent implements IngestUI { + final class IngestMessageTopComponent extends TopComponent implements IngestUI { private static IngestMessageTopComponent instance; private static final Logger logger = Logger.getLogger(IngestMessageTopComponent.class.getName()); diff --git a/Core/src/org/sleuthkit/autopsy/ingest/IngestMessagesAction.java b/Core/src/org/sleuthkit/autopsy/ingest/IngestMessagesAction.java index 06f31f5ffa..11ed44cf7f 100644 --- a/Core/src/org/sleuthkit/autopsy/ingest/IngestMessagesAction.java +++ b/Core/src/org/sleuthkit/autopsy/ingest/IngestMessagesAction.java @@ -31,7 +31,7 @@ import org.openide.util.actions.Presenter; // @ActionReference(path = "Toolbars/File", position = 575) //}) //@Messages("CTL_IngestMessagesAction=Messages") -public final class IngestMessagesAction extends AbstractAction implements Presenter.Toolbar { + final class IngestMessagesAction extends AbstractAction implements Presenter.Toolbar { @Override public void actionPerformed(ActionEvent e) { diff --git a/Core/src/org/sleuthkit/autopsy/ingest/IngestMessagesToolbar.java b/Core/src/org/sleuthkit/autopsy/ingest/IngestMessagesToolbar.java index 2914cfd05b..f817383595 100644 --- a/Core/src/org/sleuthkit/autopsy/ingest/IngestMessagesToolbar.java +++ b/Core/src/org/sleuthkit/autopsy/ingest/IngestMessagesToolbar.java @@ -34,7 +34,7 @@ import org.sleuthkit.autopsy.casemodule.Case; * Toolbar for Ingest * */ -public class IngestMessagesToolbar extends javax.swing.JPanel { + class IngestMessagesToolbar extends javax.swing.JPanel { private IngestMessagesButton ingestMessagesButton = new IngestMessagesButton(); private static volatile IngestMessagesToolbar instance; diff --git a/Core/src/org/sleuthkit/autopsy/ingest/IngestModuleAbstract.java b/Core/src/org/sleuthkit/autopsy/ingest/IngestModuleAbstract.java index 7165640b75..6bf6b36f57 100644 --- a/Core/src/org/sleuthkit/autopsy/ingest/IngestModuleAbstract.java +++ b/Core/src/org/sleuthkit/autopsy/ingest/IngestModuleAbstract.java @@ -23,7 +23,7 @@ package org.sleuthkit.autopsy.ingest; /** * Base interface for ingest modules */ -public abstract class IngestModuleAbstract { + abstract class IngestModuleAbstract { private String args; diff --git a/Core/src/org/sleuthkit/autopsy/ingest/IngestModuleLoader.java b/Core/src/org/sleuthkit/autopsy/ingest/IngestModuleLoader.java index 69701ac033..b1cee5482e 100644 --- a/Core/src/org/sleuthkit/autopsy/ingest/IngestModuleLoader.java +++ b/Core/src/org/sleuthkit/autopsy/ingest/IngestModuleLoader.java @@ -90,7 +90,7 @@ import org.w3c.dom.NodeList; * NOTE: this will be part of future IngestPipelineManager with IngestManager * code refactored */ -public final class IngestModuleLoader { + final class IngestModuleLoader { private static final String PIPELINE_CONFIG_XML = "pipeline_config.xml"; private static final String XSDFILE = "PipelineConfigSchema.xsd"; diff --git a/Core/src/org/sleuthkit/autopsy/ingest/IngestMonitor.java b/Core/src/org/sleuthkit/autopsy/ingest/IngestMonitor.java index dd059b271e..a591882ca6 100644 --- a/Core/src/org/sleuthkit/autopsy/ingest/IngestMonitor.java +++ b/Core/src/org/sleuthkit/autopsy/ingest/IngestMonitor.java @@ -36,7 +36,7 @@ import org.sleuthkit.autopsy.coreutils.PlatformUtil; /** * Monitor health of the system and stop ingest if necessary */ -public class IngestMonitor { + class IngestMonitor { private static final int INITIAL_INTERVAL_MS = 60000; //1 min. private final Logger logger = Logger.getLogger(IngestMonitor.class.getName()); diff --git a/Core/src/org/sleuthkit/autopsy/ingest/IngestUI.java b/Core/src/org/sleuthkit/autopsy/ingest/IngestUI.java index eb42dd4fec..e4984bf38e 100644 --- a/Core/src/org/sleuthkit/autopsy/ingest/IngestUI.java +++ b/Core/src/org/sleuthkit/autopsy/ingest/IngestUI.java @@ -24,7 +24,7 @@ import org.sleuthkit.datamodel.Content; /** * UI support for ingest */ -public interface IngestUI { + interface IngestUI { void displayMessage(final IngestMessage message); int getMessagesCount(); void clearMessages(); diff --git a/Core/src/org/sleuthkit/autopsy/menuactions/DataContentDynamicMenu.java b/Core/src/org/sleuthkit/autopsy/menuactions/DataContentDynamicMenu.java index 890bbbd6ef..8c09bef862 100644 --- a/Core/src/org/sleuthkit/autopsy/menuactions/DataContentDynamicMenu.java +++ b/Core/src/org/sleuthkit/autopsy/menuactions/DataContentDynamicMenu.java @@ -34,7 +34,7 @@ import org.sleuthkit.autopsy.corecomponents.DataContentTopComponent; * * @author jantonius */ -public class DataContentDynamicMenu extends JMenuItem implements DynamicMenuContent { + class DataContentDynamicMenu extends JMenuItem implements DynamicMenuContent { @Override public JComponent[] getMenuPresenters() { diff --git a/Core/src/org/sleuthkit/autopsy/menuactions/DataContentMenu.java b/Core/src/org/sleuthkit/autopsy/menuactions/DataContentMenu.java index 4468794852..c68b9f84c2 100644 --- a/Core/src/org/sleuthkit/autopsy/menuactions/DataContentMenu.java +++ b/Core/src/org/sleuthkit/autopsy/menuactions/DataContentMenu.java @@ -27,7 +27,7 @@ import org.openide.util.actions.Presenter; /** * Menu item that displays DataContentViewers */ -public class DataContentMenu extends CallableSystemAction implements Presenter.Menu { + class DataContentMenu extends CallableSystemAction implements Presenter.Menu { DataContentMenu(){} diff --git a/Core/src/org/sleuthkit/autopsy/menuactions/DataExplorerDynamicMenu.java b/Core/src/org/sleuthkit/autopsy/menuactions/DataExplorerDynamicMenu.java index 6566146880..3ed7e67b76 100644 --- a/Core/src/org/sleuthkit/autopsy/menuactions/DataExplorerDynamicMenu.java +++ b/Core/src/org/sleuthkit/autopsy/menuactions/DataExplorerDynamicMenu.java @@ -33,7 +33,7 @@ import org.sleuthkit.autopsy.corecomponentinterfaces.DataExplorer; * * @author jantonius */ -public class DataExplorerDynamicMenu extends JMenuItem implements DynamicMenuContent{ + class DataExplorerDynamicMenu extends JMenuItem implements DynamicMenuContent{ DataExplorerDynamicMenu(){ } diff --git a/Core/src/org/sleuthkit/autopsy/menuactions/DataExplorerMenu.java b/Core/src/org/sleuthkit/autopsy/menuactions/DataExplorerMenu.java index 6106690768..947b754e70 100644 --- a/Core/src/org/sleuthkit/autopsy/menuactions/DataExplorerMenu.java +++ b/Core/src/org/sleuthkit/autopsy/menuactions/DataExplorerMenu.java @@ -28,7 +28,7 @@ import org.openide.util.actions.Presenter; * Menu item that tracks available DataExplorers. * @author jantonius */ -public class DataExplorerMenu extends CallableSystemAction implements Presenter.Menu { +class DataExplorerMenu extends CallableSystemAction implements Presenter.Menu { @Override public JMenuItem getMenuPresenter() { diff --git a/Core/src/org/sleuthkit/autopsy/menuactions/DataResultMenu.java b/Core/src/org/sleuthkit/autopsy/menuactions/DataResultMenu.java index 06c67001df..098f6fd0b5 100644 --- a/Core/src/org/sleuthkit/autopsy/menuactions/DataResultMenu.java +++ b/Core/src/org/sleuthkit/autopsy/menuactions/DataResultMenu.java @@ -31,7 +31,7 @@ import org.sleuthkit.autopsy.casemodule.Case; /** * Menu item tracks the DataResult windows */ -public class DataResultMenu extends CallableSystemAction implements Presenter.Menu, PropertyChangeListener { + class DataResultMenu extends CallableSystemAction implements Presenter.Menu, PropertyChangeListener { JMenu menu = new JMenu("DataResult Windows"); diff --git a/Core/src/org/sleuthkit/autopsy/menuactions/OpenTopComponentAction.java b/Core/src/org/sleuthkit/autopsy/menuactions/OpenTopComponentAction.java index 9eafc5fe7c..998f0549c5 100644 --- a/Core/src/org/sleuthkit/autopsy/menuactions/OpenTopComponentAction.java +++ b/Core/src/org/sleuthkit/autopsy/menuactions/OpenTopComponentAction.java @@ -27,7 +27,7 @@ import org.openide.windows.WindowManager; /** * This action opens the TopComponent passed to the constructor */ -public class OpenTopComponentAction extends AbstractAction{ + class OpenTopComponentAction extends AbstractAction{ private TopComponent tc; diff --git a/Core/src/org/sleuthkit/autopsy/menuactions/SearchResultMenu.java b/Core/src/org/sleuthkit/autopsy/menuactions/SearchResultMenu.java index 6830c24f4a..851405e880 100644 --- a/Core/src/org/sleuthkit/autopsy/menuactions/SearchResultMenu.java +++ b/Core/src/org/sleuthkit/autopsy/menuactions/SearchResultMenu.java @@ -31,7 +31,7 @@ import org.sleuthkit.autopsy.directorytree.DirectoryTreeTopComponent; /** * Menu item lists DataResult tabs. */ -public class SearchResultMenu extends JMenuItem implements DynamicMenuContent { + class SearchResultMenu extends JMenuItem implements DynamicMenuContent { SearchResultMenu(){ diff --git a/Core/src/org/sleuthkit/autopsy/menuactions/SpacerPanel.java b/Core/src/org/sleuthkit/autopsy/menuactions/SpacerPanel.java index 88caf19714..46a0252ced 100644 --- a/Core/src/org/sleuthkit/autopsy/menuactions/SpacerPanel.java +++ b/Core/src/org/sleuthkit/autopsy/menuactions/SpacerPanel.java @@ -28,7 +28,7 @@ import org.openide.util.actions.Presenter; * * @author dfickling */ -public class SpacerPanel extends javax.swing.JPanel{ + class SpacerPanel extends javax.swing.JPanel{ SpacerPanel() { this.setPreferredSize(new Dimension(2000, 20)); } diff --git a/Core/src/org/sleuthkit/autopsy/report/FileReportDataTypes.java b/Core/src/org/sleuthkit/autopsy/report/FileReportDataTypes.java index c46c59ca7d..ef6eb1c0ba 100755 --- a/Core/src/org/sleuthkit/autopsy/report/FileReportDataTypes.java +++ b/Core/src/org/sleuthkit/autopsy/report/FileReportDataTypes.java @@ -29,7 +29,7 @@ import org.sleuthkit.datamodel.TskData; * * @author jwallace */ -public enum FileReportDataTypes { + enum FileReportDataTypes { NAME("Name") { @Override diff --git a/Core/src/org/sleuthkit/autopsy/report/FileReportModule.java b/Core/src/org/sleuthkit/autopsy/report/FileReportModule.java index 50c74a55c0..e69f4c0ac8 100755 --- a/Core/src/org/sleuthkit/autopsy/report/FileReportModule.java +++ b/Core/src/org/sleuthkit/autopsy/report/FileReportModule.java @@ -26,7 +26,7 @@ import org.sleuthkit.datamodel.AbstractFile; * * @author jwallace */ -public interface FileReportModule extends ReportModule { + interface FileReportModule extends ReportModule { /** * Initialize the report which will be stored at the given path. * @param path diff --git a/Core/src/org/sleuthkit/autopsy/report/FileReportText.java b/Core/src/org/sleuthkit/autopsy/report/FileReportText.java index 45ef9d736c..7b10b9ac8a 100755 --- a/Core/src/org/sleuthkit/autopsy/report/FileReportText.java +++ b/Core/src/org/sleuthkit/autopsy/report/FileReportText.java @@ -35,7 +35,7 @@ import org.sleuthkit.datamodel.AbstractFile; * * @author jwallace */ -public class FileReportText implements FileReportModule { + class FileReportText implements FileReportModule { private static final Logger logger = Logger.getLogger(FileReportText.class.getName()); private String reportPath; private Writer out; diff --git a/Core/src/org/sleuthkit/autopsy/report/GeneralReportModule.java b/Core/src/org/sleuthkit/autopsy/report/GeneralReportModule.java index 08aa476b9f..8baa4e5050 100644 --- a/Core/src/org/sleuthkit/autopsy/report/GeneralReportModule.java +++ b/Core/src/org/sleuthkit/autopsy/report/GeneralReportModule.java @@ -20,7 +20,7 @@ package org.sleuthkit.autopsy.report; import javax.swing.JPanel; -public interface GeneralReportModule extends ReportModule { + interface GeneralReportModule extends ReportModule { /** * Called to generate the report. Method is responsible for saving the file at the diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportBodyFile.java b/Core/src/org/sleuthkit/autopsy/report/ReportBodyFile.java index c0ea754aa5..d31af46908 100644 --- a/Core/src/org/sleuthkit/autopsy/report/ReportBodyFile.java +++ b/Core/src/org/sleuthkit/autopsy/report/ReportBodyFile.java @@ -40,7 +40,7 @@ import org.sleuthkit.datamodel.*; * ReportBodyFile generates a report in the body file format specified on * The Sleuth Kit wiki as MD5|name|inode|mode_as_string|UID|GID|size|atime|mtime|ctime|crtime. */ -public class ReportBodyFile implements GeneralReportModule { + class ReportBodyFile implements GeneralReportModule { private static final Logger logger = Logger.getLogger(ReportBodyFile.class.getName()); private static ReportBodyFile instance = null; diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportBranding.java b/Core/src/org/sleuthkit/autopsy/report/ReportBranding.java index e8759358e7..173821542b 100644 --- a/Core/src/org/sleuthkit/autopsy/report/ReportBranding.java +++ b/Core/src/org/sleuthkit/autopsy/report/ReportBranding.java @@ -37,7 +37,7 @@ import org.sleuthkit.autopsy.coreutils.PlatformUtil; * * Uses module settings property files to store customizations. */ -public final class ReportBranding implements ReportBrandingProviderI { + final class ReportBranding implements ReportBrandingProviderI { //property names private static final String GENERATOR_LOGO_PATH_PROP = "GeneratorLogoPath"; diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportBrandingProviderI.java b/Core/src/org/sleuthkit/autopsy/report/ReportBrandingProviderI.java index f7814f001c..3bdb762dd7 100644 --- a/Core/src/org/sleuthkit/autopsy/report/ReportBrandingProviderI.java +++ b/Core/src/org/sleuthkit/autopsy/report/ReportBrandingProviderI.java @@ -21,7 +21,7 @@ package org.sleuthkit.autopsy.report; /** * Interface to implement by reports to add on custom branding, logos, etc */ -public interface ReportBrandingProviderI { + interface ReportBrandingProviderI { /** * Get the generator logo path on the local disk (previously set or default), diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportExcel.java b/Core/src/org/sleuthkit/autopsy/report/ReportExcel.java index 5a221e6ef6..2f03a820a5 100644 --- a/Core/src/org/sleuthkit/autopsy/report/ReportExcel.java +++ b/Core/src/org/sleuthkit/autopsy/report/ReportExcel.java @@ -29,7 +29,7 @@ import org.apache.poi.xssf.usermodel.XSSFWorkbook; import org.sleuthkit.autopsy.casemodule.Case; import org.sleuthkit.autopsy.coreutils.Logger; -public class ReportExcel implements TableReportModule { + class ReportExcel implements TableReportModule { private static final Logger logger = Logger.getLogger(ReportExcel.class.getName()); private static ReportExcel instance; diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportGenerationPanel.java b/Core/src/org/sleuthkit/autopsy/report/ReportGenerationPanel.java index 22ac783432..f4bf9cc14c 100644 --- a/Core/src/org/sleuthkit/autopsy/report/ReportGenerationPanel.java +++ b/Core/src/org/sleuthkit/autopsy/report/ReportGenerationPanel.java @@ -29,7 +29,7 @@ import javax.swing.Box; import javax.swing.JOptionPane; import org.sleuthkit.autopsy.report.ReportProgressPanel.ReportStatus; -public class ReportGenerationPanel extends javax.swing.JPanel { + class ReportGenerationPanel extends javax.swing.JPanel { private GridBagConstraints c; private List progressPanels; private Component glue; diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportGenerator.java b/Core/src/org/sleuthkit/autopsy/report/ReportGenerator.java index d43b344b13..3a5e96f247 100644 --- a/Core/src/org/sleuthkit/autopsy/report/ReportGenerator.java +++ b/Core/src/org/sleuthkit/autopsy/report/ReportGenerator.java @@ -71,7 +71,7 @@ import org.sleuthkit.datamodel.TskException; * can be called to show report generation progress using ReportProgressPanel * objects displayed using a dialog box. */ -public class ReportGenerator { + class ReportGenerator { private static final Logger logger = Logger.getLogger(ReportGenerator.class.getName()); private Case currentCase = Case.getCurrentCase(); diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportHTML.java b/Core/src/org/sleuthkit/autopsy/report/ReportHTML.java index 5eef5996dd..33ee24b9d7 100644 --- a/Core/src/org/sleuthkit/autopsy/report/ReportHTML.java +++ b/Core/src/org/sleuthkit/autopsy/report/ReportHTML.java @@ -58,7 +58,7 @@ import org.sleuthkit.datamodel.Content; import org.sleuthkit.datamodel.ContentTag; import org.sleuthkit.datamodel.TskData.TSK_DB_FILES_TYPE_ENUM; -public class ReportHTML implements TableReportModule { + class ReportHTML implements TableReportModule { private static final Logger logger = Logger.getLogger(ReportHTML.class.getName()); private static final String THUMBS_REL_PATH = "thumbs" + File.separator; private static ReportHTML instance; diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportModule.java b/Core/src/org/sleuthkit/autopsy/report/ReportModule.java index 2a3a677b29..615770bd69 100644 --- a/Core/src/org/sleuthkit/autopsy/report/ReportModule.java +++ b/Core/src/org/sleuthkit/autopsy/report/ReportModule.java @@ -25,7 +25,7 @@ package org.sleuthkit.autopsy.report; /** * Interface got report modules that plug in to the reporting infrastructure. */ -public interface ReportModule { + interface ReportModule { /** * Get the name of the report this module generates. diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportProgressPanel.java b/Core/src/org/sleuthkit/autopsy/report/ReportProgressPanel.java index af083db23d..3432cc8773 100644 --- a/Core/src/org/sleuthkit/autopsy/report/ReportProgressPanel.java +++ b/Core/src/org/sleuthkit/autopsy/report/ReportProgressPanel.java @@ -27,7 +27,7 @@ import java.awt.event.MouseListener; import java.io.File; import java.io.IOException; -public class ReportProgressPanel extends javax.swing.JPanel { + class ReportProgressPanel extends javax.swing.JPanel { private ReportStatus STATUS; // Enum to represent if a report is waiting, diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportVisualPanel1.java b/Core/src/org/sleuthkit/autopsy/report/ReportVisualPanel1.java index a9da09980a..fed27ec749 100644 --- a/Core/src/org/sleuthkit/autopsy/report/ReportVisualPanel1.java +++ b/Core/src/org/sleuthkit/autopsy/report/ReportVisualPanel1.java @@ -36,7 +36,7 @@ import javax.swing.event.ListSelectionListener; import org.openide.util.Lookup; import org.sleuthkit.autopsy.coreutils.Logger; -public final class ReportVisualPanel1 extends JPanel implements ListSelectionListener { + final class ReportVisualPanel1 extends JPanel implements ListSelectionListener { private static final Logger logger = Logger.getLogger(ReportVisualPanel1.class.getName()); private ReportWizardPanel1 wizPanel; private List modules = new ArrayList<>(); diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportVisualPanel2.java b/Core/src/org/sleuthkit/autopsy/report/ReportVisualPanel2.java index 8ccd2b0770..67a2eb67ae 100644 --- a/Core/src/org/sleuthkit/autopsy/report/ReportVisualPanel2.java +++ b/Core/src/org/sleuthkit/autopsy/report/ReportVisualPanel2.java @@ -43,7 +43,7 @@ import org.sleuthkit.datamodel.BlackboardArtifact.ARTIFACT_TYPE; import org.sleuthkit.datamodel.TagName; import org.sleuthkit.datamodel.TskCoreException; -public final class ReportVisualPanel2 extends JPanel { + final class ReportVisualPanel2 extends JPanel { private ReportWizardPanel2 wizPanel; private Map tagStates = new LinkedHashMap<>(); diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportWizardFileOptionsPanel.java b/Core/src/org/sleuthkit/autopsy/report/ReportWizardFileOptionsPanel.java index f6fcb9afe1..ad56a8dcc8 100755 --- a/Core/src/org/sleuthkit/autopsy/report/ReportWizardFileOptionsPanel.java +++ b/Core/src/org/sleuthkit/autopsy/report/ReportWizardFileOptionsPanel.java @@ -30,7 +30,7 @@ import org.openide.util.HelpCtx; * * @author jwallace */ -public class ReportWizardFileOptionsPanel implements WizardDescriptor.FinishablePanel{ + class ReportWizardFileOptionsPanel implements WizardDescriptor.FinishablePanel{ private WizardDescriptor wiz; private ReportWizardFileOptionsVisualPanel component; private JButton finishButton; diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportWizardFileOptionsVisualPanel.java b/Core/src/org/sleuthkit/autopsy/report/ReportWizardFileOptionsVisualPanel.java index 1afb83cc06..150905f125 100755 --- a/Core/src/org/sleuthkit/autopsy/report/ReportWizardFileOptionsVisualPanel.java +++ b/Core/src/org/sleuthkit/autopsy/report/ReportWizardFileOptionsVisualPanel.java @@ -37,7 +37,7 @@ import javax.swing.event.ListDataListener; * * @author jwallace */ -public class ReportWizardFileOptionsVisualPanel extends javax.swing.JPanel { +class ReportWizardFileOptionsVisualPanel extends javax.swing.JPanel { private List options; private Map optionStates = new EnumMap<>(FileReportDataTypes.class); private ListModel model; diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportWizardIterator.java b/Core/src/org/sleuthkit/autopsy/report/ReportWizardIterator.java index bb5f7ef3d9..cfec65ba81 100644 --- a/Core/src/org/sleuthkit/autopsy/report/ReportWizardIterator.java +++ b/Core/src/org/sleuthkit/autopsy/report/ReportWizardIterator.java @@ -27,7 +27,7 @@ import javax.swing.event.ChangeListener; import org.openide.WizardDescriptor; import org.openide.util.NbPreferences; -public final class ReportWizardIterator implements WizardDescriptor.Iterator { + final class ReportWizardIterator implements WizardDescriptor.Iterator { private int index; private ReportWizardPanel1 firstPanel; diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportWizardPanel1.java b/Core/src/org/sleuthkit/autopsy/report/ReportWizardPanel1.java index 17671d7624..576bfbdd7d 100644 --- a/Core/src/org/sleuthkit/autopsy/report/ReportWizardPanel1.java +++ b/Core/src/org/sleuthkit/autopsy/report/ReportWizardPanel1.java @@ -29,7 +29,7 @@ import org.openide.WizardDescriptor; import org.openide.util.HelpCtx; import org.openide.util.NbPreferences; -public class ReportWizardPanel1 implements WizardDescriptor.FinishablePanel { + class ReportWizardPanel1 implements WizardDescriptor.FinishablePanel { private WizardDescriptor wiz; private ReportVisualPanel1 component; private JButton nextButton; diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportWizardPanel2.java b/Core/src/org/sleuthkit/autopsy/report/ReportWizardPanel2.java index c0612cb6dd..fec8e3c5a2 100644 --- a/Core/src/org/sleuthkit/autopsy/report/ReportWizardPanel2.java +++ b/Core/src/org/sleuthkit/autopsy/report/ReportWizardPanel2.java @@ -26,7 +26,7 @@ import org.openide.WizardDescriptor; import org.openide.util.HelpCtx; import org.openide.util.NbPreferences; -public class ReportWizardPanel2 implements WizardDescriptor.Panel { + class ReportWizardPanel2 implements WizardDescriptor.Panel { private ReportVisualPanel2 component; private JButton finishButton; private JButton nextButton; diff --git a/Core/src/org/sleuthkit/autopsy/report/SQLiteDBConnect.java b/Core/src/org/sleuthkit/autopsy/report/SQLiteDBConnect.java index 23fb5c8b40..a4dfb75cbf 100644 --- a/Core/src/org/sleuthkit/autopsy/report/SQLiteDBConnect.java +++ b/Core/src/org/sleuthkit/autopsy/report/SQLiteDBConnect.java @@ -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/Core/src/org/sleuthkit/autopsy/report/TableReportModule.java b/Core/src/org/sleuthkit/autopsy/report/TableReportModule.java index 4a7bc9ac50..61e715f644 100644 --- a/Core/src/org/sleuthkit/autopsy/report/TableReportModule.java +++ b/Core/src/org/sleuthkit/autopsy/report/TableReportModule.java @@ -29,7 +29,7 @@ import java.util.List; * The data sent consists of user-chosen fields such as Blackboard Artifacts * and File/Result Tags. */ -public interface TableReportModule extends ReportModule { + interface TableReportModule extends ReportModule { /** * Start the report. Open any output streams, initialize member variables, diff --git a/CoreLibs/src/org/sleuthkit/autopsy/corelibs/ScalrWrapper.java b/CoreLibs/src/org/sleuthkit/autopsy/corelibs/ScalrWrapper.java index fce800e30b..ef2cf7c876 100644 --- a/CoreLibs/src/org/sleuthkit/autopsy/corelibs/ScalrWrapper.java +++ b/CoreLibs/src/org/sleuthkit/autopsy/corelibs/ScalrWrapper.java @@ -27,7 +27,7 @@ import org.imgscalr.Scalr.Method; * Scalr wrapper to deal with exports and provide thread-safety * */ -public class ScalrWrapper { + public class ScalrWrapper { public static synchronized BufferedImage resize(BufferedImage input, int width, int height) { return Scalr.resize(input, width, height, Scalr.OP_ANTIALIAS); diff --git a/branding/core/core.jar/org/netbeans/core/startup/Bundle.properties b/branding/core/core.jar/org/netbeans/core/startup/Bundle.properties index 5334461f63..eab2151dbc 100644 --- a/branding/core/core.jar/org/netbeans/core/startup/Bundle.properties +++ b/branding/core/core.jar/org/netbeans/core/startup/Bundle.properties @@ -1,5 +1,5 @@ #Updated by build script -#Tue, 21 Jan 2014 15:00:14 -0500 +#Tue, 21 Jan 2014 15:31:49 -0500 LBL_splash_window_title=Starting Autopsy SPLASH_HEIGHT=288 SPLASH_WIDTH=538 diff --git a/branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties b/branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties index 07b5e4671a..dc7e5446f7 100644 --- a/branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties +++ b/branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties @@ -1,5 +1,5 @@ #Updated by build script -#Tue, 21 Jan 2014 15:00:14 -0500 +#Tue, 21 Jan 2014 15:31:49 -0500 CTL_MainWindow_Title=Autopsy 3.0.8 CTL_MainWindow_Title_No_Project=Autopsy 3.0.8 From 874c7b24ecdfcc7a07862ef8e54cb40b2214cfea Mon Sep 17 00:00:00 2001 From: shahit2 Date: Wed, 22 Jan 2014 11:05:05 -0500 Subject: [PATCH 10/38] Files that could be changed to non-public have been --- .../org/sleuthkit/autopsy/corecomponents/DataContentPanel.java | 2 +- Core/src/org/sleuthkit/autopsy/corecomponents/OptionsPanel.java | 2 +- Core/src/org/sleuthkit/autopsy/coreutils/ExecUtil.java | 2 +- Core/src/org/sleuthkit/autopsy/coreutils/JLNK.java | 2 +- Core/src/org/sleuthkit/autopsy/coreutils/JLnkParser.java | 2 +- .../org/sleuthkit/autopsy/coreutils/JLnkParserException.java | 2 +- Core/src/org/sleuthkit/autopsy/coreutils/TextUtil.java | 2 +- Core/src/org/sleuthkit/autopsy/datamodel/FilterNodeLeaf.java | 2 +- Core/src/org/sleuthkit/autopsy/datamodel/HighlightLookup.java | 2 +- Core/src/org/sleuthkit/autopsy/datamodel/KeyValueNode.java | 2 +- .../org/sleuthkit/autopsy/directorytree/HashSearchProvider.java | 2 +- Core/src/org/sleuthkit/autopsy/ingest/IngestMessage.java | 2 +- Core/src/org/sleuthkit/autopsy/ingest/IngestMonitor.java | 2 +- Core/src/org/sleuthkit/autopsy/report/SQLiteDBConnect.java | 2 +- .../autopsy/fileextmismatch/AddFileExtensionAction.java | 2 +- .../autopsy/fileextmismatch/FileExtMismatchConfigPanel.java | 2 +- .../autopsy/fileextmismatch/FileExtMismatchIngestModule.java | 2 +- .../fileextmismatch/FileExtMismatchSimpleConfigPanel.java | 2 +- .../sleuthkit/autopsy/fileextmismatch/FileExtMismatchXML.java | 2 +- .../autopsy/filetypeid/FileTypeDetectionInterface.java | 2 +- .../sleuthkit/autopsy/filetypeid/FileTypeIdIngestModule.java | 2 +- .../autopsy/filetypeid/FileTypeIdSimpleConfigPanel.java | 2 +- .../org/sleuthkit/autopsy/filetypeid/TikaFileTypeDetector.java | 2 +- .../org/sleuthkit/autopsy/hashdatabase/HashDbConfigPanel.java | 2 +- .../org/sleuthkit/autopsy/hashdatabase/HashDbIngestModule.java | 2 +- .../src/org/sleuthkit/autopsy/hashdatabase/HashDbManager.java | 2 +- .../org/sleuthkit/autopsy/hashdatabase/HashDbSearchAction.java | 2 +- .../org/sleuthkit/autopsy/hashdatabase/HashDbSearchManager.java | 2 +- .../org/sleuthkit/autopsy/hashdatabase/HashDbSearchPanel.java | 2 +- .../autopsy/hashdatabase/HashDbSearchResultFactory.java | 2 +- .../src/org/sleuthkit/autopsy/hashdatabase/HashDbSearcher.java | 2 +- .../sleuthkit/autopsy/hashdatabase/HashDbSimpleConfigPanel.java | 2 +- .../autopsy/keywordsearch/AbstractFileHtmlExtract.java | 2 +- .../autopsy/keywordsearch/AbstractFileStringContentStream.java | 2 +- .../autopsy/keywordsearch/AbstractFileStringIntStream.java | 2 +- .../autopsy/keywordsearch/AbstractFileStringStream.java | 2 +- .../autopsy/keywordsearch/AbstractFileTikaTextExtract.java | 2 +- .../org/sleuthkit/autopsy/keywordsearch/ByteContentStream.java | 2 +- .../src/org/sleuthkit/autopsy/keywordsearch/ContentHit.java | 2 +- .../src/org/sleuthkit/autopsy/keywordsearch/Ingester.java | 2 +- .../src/org/sleuthkit/autopsy/keywordsearch/Installer.java | 2 +- .../sleuthkit/autopsy/keywordsearch/JerichoParserWrapper.java | 2 +- .../src/org/sleuthkit/autopsy/keywordsearch/Keyword.java | 2 +- .../org/sleuthkit/autopsy/keywordsearch/KeywordQueryFilter.java | 2 +- .../src/org/sleuthkit/autopsy/keywordsearch/KeywordSearch.java | 2 +- .../sleuthkit/autopsy/keywordsearch/KeywordSearchAction.java | 2 +- .../autopsy/keywordsearch/KeywordSearchConfigurationPanel.java | 2 +- .../autopsy/keywordsearch/KeywordSearchConfigurationPanel1.java | 2 +- .../autopsy/keywordsearch/KeywordSearchConfigurationPanel2.java | 2 +- .../autopsy/keywordsearch/KeywordSearchConfigurationPanel3.java | 2 +- .../autopsy/keywordsearch/KeywordSearchIngestModule.java | 2 +- .../autopsy/keywordsearch/KeywordSearchIngestSimplePanel.java | 2 +- .../autopsy/keywordsearch/KeywordSearchListsAbstract.java | 2 +- .../autopsy/keywordsearch/KeywordSearchListsEncase.java | 2 +- .../sleuthkit/autopsy/keywordsearch/KeywordSearchListsXML.java | 2 +- .../autopsy/keywordsearch/KeywordSearchModuleException.java | 2 +- .../org/sleuthkit/autopsy/keywordsearch/KeywordSearchPanel.java | 2 +- .../org/sleuthkit/autopsy/keywordsearch/KeywordSearchQuery.java | 2 +- .../autopsy/keywordsearch/KeywordSearchQueryManager.java | 2 +- .../autopsy/keywordsearch/KeywordSearchResultFactory.java | 2 +- .../sleuthkit/autopsy/keywordsearch/KeywordSearchSettings.java | 2 +- .../org/sleuthkit/autopsy/keywordsearch/KeywordSearchUtil.java | 2 +- .../org/sleuthkit/autopsy/keywordsearch/KeywordWriteResult.java | 2 +- .../src/org/sleuthkit/autopsy/keywordsearch/LuceneQuery.java | 2 +- .../src/org/sleuthkit/autopsy/keywordsearch/MarkupSource.java | 2 +- .../sleuthkit/autopsy/keywordsearch/NoOpenCoreException.java | 2 +- .../src/org/sleuthkit/autopsy/keywordsearch/Server.java | 2 +- .../org/sleuthkit/autopsy/keywordsearch/TermComponentQuery.java | 2 +- .../sleuthkit/autopsy/keywordsearch/TextLanguageIdentifier.java | 2 +- .../sleuthkit/autopsy/keywordsearch/TikaLanguageIdentifier.java | 2 +- .../sleuthkit/autopsy/recentactivity/RAImageIngestModule.java | 2 +- .../sleuthkit/autopsy/scalpel/ScalpelCarverIngestModule.java | 2 +- .../org/sleuthkit/autopsy/sevenzip/SevenZipIngestModule.java | 2 +- Timeline/src/org/sleuthkit/autopsy/timeline/TimelineFrame.java | 2 +- .../org/sleuthkit/autopsy/timeline/TimelineProgressDialog.java | 2 +- .../core/core.jar/org/netbeans/core/startup/Bundle.properties | 2 +- .../org/netbeans/core/windows/view/ui/Bundle.properties | 2 +- .../org/sleuthkit/autopsy/thunderbirdparser/EmailMessage.java | 2 +- .../src/org/sleuthkit/autopsy/thunderbirdparser/MboxParser.java | 2 +- .../src/org/sleuthkit/autopsy/thunderbirdparser/PstParser.java | 2 +- .../thunderbirdparser/ThunderbirdMboxFileIngestModule.java | 2 +- 81 files changed, 81 insertions(+), 81 deletions(-) diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/DataContentPanel.java b/Core/src/org/sleuthkit/autopsy/corecomponents/DataContentPanel.java index 56f6c25363..6f1a061d52 100644 --- a/Core/src/org/sleuthkit/autopsy/corecomponents/DataContentPanel.java +++ b/Core/src/org/sleuthkit/autopsy/corecomponents/DataContentPanel.java @@ -27,7 +27,7 @@ import org.sleuthkit.datamodel.TskCoreException; /** * */ - class DataContentPanel extends javax.swing.JPanel implements DataContent, ChangeListener { + public class DataContentPanel extends javax.swing.JPanel implements DataContent, ChangeListener { private static Logger logger = Logger.getLogger(DataContentPanel.class.getName()); private final List viewers = new ArrayList<>();; diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/OptionsPanel.java b/Core/src/org/sleuthkit/autopsy/corecomponents/OptionsPanel.java index 2cf4f870d5..95ed4c5025 100644 --- a/Core/src/org/sleuthkit/autopsy/corecomponents/OptionsPanel.java +++ b/Core/src/org/sleuthkit/autopsy/corecomponents/OptionsPanel.java @@ -7,7 +7,7 @@ package org.sleuthkit.autopsy.corecomponents; /** * */ - interface OptionsPanel { +public interface OptionsPanel { /** * Store the current state of all options in this OptionsPanel. diff --git a/Core/src/org/sleuthkit/autopsy/coreutils/ExecUtil.java b/Core/src/org/sleuthkit/autopsy/coreutils/ExecUtil.java index 2bec8b7492..820eb6b25d 100644 --- a/Core/src/org/sleuthkit/autopsy/coreutils/ExecUtil.java +++ b/Core/src/org/sleuthkit/autopsy/coreutils/ExecUtil.java @@ -30,7 +30,7 @@ import org.sleuthkit.autopsy.coreutils.Logger; * Takes care of forking a process and reading output / error streams to either a * string buffer or directly to a file writer */ - final class ExecUtil { + public final class ExecUtil { private static final Logger logger = Logger.getLogger(ExecUtil.class.getName()); private Process proc = null; diff --git a/Core/src/org/sleuthkit/autopsy/coreutils/JLNK.java b/Core/src/org/sleuthkit/autopsy/coreutils/JLNK.java index 0ee3ec4b05..3312ab7b06 100644 --- a/Core/src/org/sleuthkit/autopsy/coreutils/JLNK.java +++ b/Core/src/org/sleuthkit/autopsy/coreutils/JLNK.java @@ -31,7 +31,7 @@ import org.sleuthkit.autopsy.coreutils.LnkEnums.NetworkProviderType; * * @author dick */ - class JLNK { + public class JLNK { private int header; private byte[] linkClassIdentifier; private List linkFlags; diff --git a/Core/src/org/sleuthkit/autopsy/coreutils/JLnkParser.java b/Core/src/org/sleuthkit/autopsy/coreutils/JLnkParser.java index 6b6ab26fd3..e0f7b341bc 100644 --- a/Core/src/org/sleuthkit/autopsy/coreutils/JLnkParser.java +++ b/Core/src/org/sleuthkit/autopsy/coreutils/JLnkParser.java @@ -38,7 +38,7 @@ import org.sleuthkit.autopsy.coreutils.LnkEnums.NetworkProviderType; * http://msdn.microsoft.com/en-us/library/windows/desktop/cc144090(v=vs.85).aspx#unknown_74413 * http://blog.0x01000000.org/2010/08/10/lnk-parsing-youre-doing-it-wrong-i/ */ - class JLnkParser { + public class JLnkParser { private byte[] content; private static final Logger logger = Logger.getLogger(JLnkParser.class.getName()); diff --git a/Core/src/org/sleuthkit/autopsy/coreutils/JLnkParserException.java b/Core/src/org/sleuthkit/autopsy/coreutils/JLnkParserException.java index 501f3dd9f0..f9e034df42 100755 --- a/Core/src/org/sleuthkit/autopsy/coreutils/JLnkParserException.java +++ b/Core/src/org/sleuthkit/autopsy/coreutils/JLnkParserException.java @@ -22,7 +22,7 @@ package org.sleuthkit.autopsy.coreutils; * * @author jwallace */ - class JLnkParserException extends Exception { + public class JLnkParserException extends Exception { /** * Constructs an instance of diff --git a/Core/src/org/sleuthkit/autopsy/coreutils/TextUtil.java b/Core/src/org/sleuthkit/autopsy/coreutils/TextUtil.java index 7ffd8effe1..f910b78ed7 100644 --- a/Core/src/org/sleuthkit/autopsy/coreutils/TextUtil.java +++ b/Core/src/org/sleuthkit/autopsy/coreutils/TextUtil.java @@ -23,7 +23,7 @@ import java.awt.ComponentOrientation; /** * Text utilities */ - class TextUtil { + public class TextUtil { /** * Determine and return text orientation diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/FilterNodeLeaf.java b/Core/src/org/sleuthkit/autopsy/datamodel/FilterNodeLeaf.java index 844d658008..cd715a88d5 100644 --- a/Core/src/org/sleuthkit/autopsy/datamodel/FilterNodeLeaf.java +++ b/Core/src/org/sleuthkit/autopsy/datamodel/FilterNodeLeaf.java @@ -24,7 +24,7 @@ import org.openide.nodes.Node; /** * AbstractFile filter node that filters out the children */ - class FilterNodeLeaf extends FilterNode { + public class FilterNodeLeaf extends FilterNode { public FilterNodeLeaf(Node node) { super(node, Children.LEAF); diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/HighlightLookup.java b/Core/src/org/sleuthkit/autopsy/datamodel/HighlightLookup.java index 749e3dbdbb..ab9f2c768f 100644 --- a/Core/src/org/sleuthkit/autopsy/datamodel/HighlightLookup.java +++ b/Core/src/org/sleuthkit/autopsy/datamodel/HighlightLookup.java @@ -29,6 +29,6 @@ import org.sleuthkit.datamodel.Content; * @param isRegex whether the original query was a regex query * @param originalQuery (regex or literal) that may need to be performed again to get all ContentHit results */ - interface HighlightLookup { + public interface HighlightLookup { public HighlightLookup createInstance(Content c, String keywordHitQuery, boolean isRegex, String originalQuery); } diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/KeyValueNode.java b/Core/src/org/sleuthkit/autopsy/datamodel/KeyValueNode.java index fea5fd7850..e1330f0f92 100644 --- a/Core/src/org/sleuthkit/autopsy/datamodel/KeyValueNode.java +++ b/Core/src/org/sleuthkit/autopsy/datamodel/KeyValueNode.java @@ -33,7 +33,7 @@ import org.sleuthkit.datamodel.AbstractFile; * * @author alawrence */ - class KeyValueNode extends AbstractNode { + public class KeyValueNode extends AbstractNode { private KeyValue data; diff --git a/Core/src/org/sleuthkit/autopsy/directorytree/HashSearchProvider.java b/Core/src/org/sleuthkit/autopsy/directorytree/HashSearchProvider.java index 04ce1fdb55..3def34f220 100644 --- a/Core/src/org/sleuthkit/autopsy/directorytree/HashSearchProvider.java +++ b/Core/src/org/sleuthkit/autopsy/directorytree/HashSearchProvider.java @@ -23,6 +23,6 @@ import org.openide.nodes.Node; /** * Lookup interface for hash search (to deal with circular deps) */ - interface HashSearchProvider { + public interface HashSearchProvider { public void search(Node contentNode); } diff --git a/Core/src/org/sleuthkit/autopsy/ingest/IngestMessage.java b/Core/src/org/sleuthkit/autopsy/ingest/IngestMessage.java index 445210d29a..de0da0cae3 100644 --- a/Core/src/org/sleuthkit/autopsy/ingest/IngestMessage.java +++ b/Core/src/org/sleuthkit/autopsy/ingest/IngestMessage.java @@ -29,7 +29,7 @@ import org.sleuthkit.datamodel.BlackboardArtifact; * Submitted to user via IngestServices. * Create using factory methods. */ - class IngestMessage { +public class IngestMessage { /** * Level of message. diff --git a/Core/src/org/sleuthkit/autopsy/ingest/IngestMonitor.java b/Core/src/org/sleuthkit/autopsy/ingest/IngestMonitor.java index a591882ca6..b483c3d35c 100644 --- a/Core/src/org/sleuthkit/autopsy/ingest/IngestMonitor.java +++ b/Core/src/org/sleuthkit/autopsy/ingest/IngestMonitor.java @@ -36,7 +36,7 @@ import org.sleuthkit.autopsy.coreutils.PlatformUtil; /** * Monitor health of the system and stop ingest if necessary */ - class IngestMonitor { + public class IngestMonitor { private static final int INITIAL_INTERVAL_MS = 60000; //1 min. private final Logger logger = Logger.getLogger(IngestMonitor.class.getName()); diff --git a/Core/src/org/sleuthkit/autopsy/report/SQLiteDBConnect.java b/Core/src/org/sleuthkit/autopsy/report/SQLiteDBConnect.java index a4dfb75cbf..97142c840a 100644 --- a/Core/src/org/sleuthkit/autopsy/report/SQLiteDBConnect.java +++ b/Core/src/org/sleuthkit/autopsy/report/SQLiteDBConnect.java @@ -32,7 +32,7 @@ import org.sleuthkit.autopsy.coreutils.Logger; /** * Database connection class & utilities * */ - class SQLiteDBConnect { + public class SQLiteDBConnect { public String sDriver = ""; public String sUrl = null; diff --git a/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/AddFileExtensionAction.java b/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/AddFileExtensionAction.java index b0e8ea28fb..dd79826361 100644 --- a/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/AddFileExtensionAction.java +++ b/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/AddFileExtensionAction.java @@ -31,7 +31,7 @@ import javax.swing.JOptionPane; * Do the context menu action for adding a new filename extension to * the mismatch list for the MIME type of the selected node. */ -public class AddFileExtensionAction extends AbstractAction { + class AddFileExtensionAction extends AbstractAction { private String extStr; private String mimeTypeStr; diff --git a/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/FileExtMismatchConfigPanel.java b/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/FileExtMismatchConfigPanel.java index 2b2ca04ae1..b83a69490d 100644 --- a/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/FileExtMismatchConfigPanel.java +++ b/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/FileExtMismatchConfigPanel.java @@ -37,7 +37,7 @@ import org.sleuthkit.autopsy.filetypeid.FileTypeIdIngestModule; /** * Container panel for File Extension Mismatch Ingest Module advanced configuration options */ -public final class FileExtMismatchConfigPanel extends javax.swing.JPanel implements OptionsPanel { +final class FileExtMismatchConfigPanel extends javax.swing.JPanel implements OptionsPanel { private static Logger logger = Logger.getLogger(FileExtMismatchConfigPanel.class.getName()); private HashMap editableMap = new HashMap<>(); private ArrayList mimeList = null; diff --git a/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/FileExtMismatchIngestModule.java b/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/FileExtMismatchIngestModule.java index 9037b9756c..5945f29b74 100644 --- a/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/FileExtMismatchIngestModule.java +++ b/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/FileExtMismatchIngestModule.java @@ -47,7 +47,7 @@ import org.sleuthkit.datamodel.TskException; /** * Flags mismatched filename extensions based on file signature. */ -public class FileExtMismatchIngestModule extends org.sleuthkit.autopsy.ingest.IngestModuleAbstractFile { + class FileExtMismatchIngestModule extends org.sleuthkit.autopsy.ingest.IngestModuleAbstractFile { private static FileExtMismatchIngestModule defaultInstance = null; private static final Logger logger = Logger.getLogger(FileExtMismatchIngestModule.class.getName()); public static final String MODULE_NAME = "File Extension Mismatch Detection"; diff --git a/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/FileExtMismatchSimpleConfigPanel.java b/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/FileExtMismatchSimpleConfigPanel.java index 526fef6f9b..0d01ffde3f 100644 --- a/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/FileExtMismatchSimpleConfigPanel.java +++ b/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/FileExtMismatchSimpleConfigPanel.java @@ -22,7 +22,7 @@ package org.sleuthkit.autopsy.fileextmismatch; /** * Instances of this class provide a simplified UI for managing the hash sets configuration. */ -public class FileExtMismatchSimpleConfigPanel extends javax.swing.JPanel { + class FileExtMismatchSimpleConfigPanel extends javax.swing.JPanel { public FileExtMismatchSimpleConfigPanel() { initComponents(); diff --git a/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/FileExtMismatchXML.java b/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/FileExtMismatchXML.java index 8de27f4b6f..19f2d96f95 100644 --- a/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/FileExtMismatchXML.java +++ b/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/FileExtMismatchXML.java @@ -42,7 +42,7 @@ import org.w3c.dom.NodeList; * Storage of file extension mismatch configuration, which maps mimetypes to * allowable filename extensions. */ -public class FileExtMismatchXML { + class FileExtMismatchXML { private static final Logger logger = Logger.getLogger(FileExtMismatchXML.class.getName()); private static FileExtMismatchXML defaultInstance = null; diff --git a/FileTypeId/src/org/sleuthkit/autopsy/filetypeid/FileTypeDetectionInterface.java b/FileTypeId/src/org/sleuthkit/autopsy/filetypeid/FileTypeDetectionInterface.java index 47f4feb77b..a28a10ded7 100644 --- a/FileTypeId/src/org/sleuthkit/autopsy/filetypeid/FileTypeDetectionInterface.java +++ b/FileTypeId/src/org/sleuthkit/autopsy/filetypeid/FileTypeDetectionInterface.java @@ -27,7 +27,7 @@ import org.sleuthkit.datamodel.AbstractFile; * to an extension string list instead of the third-party library's extension * reporting. */ -public interface FileTypeDetectionInterface { + interface FileTypeDetectionInterface { // Struct to hold multiple values for return public class FileIdInfo { diff --git a/FileTypeId/src/org/sleuthkit/autopsy/filetypeid/FileTypeIdIngestModule.java b/FileTypeId/src/org/sleuthkit/autopsy/filetypeid/FileTypeIdIngestModule.java index 9e50ec68bb..15ac19da18 100644 --- a/FileTypeId/src/org/sleuthkit/autopsy/filetypeid/FileTypeIdIngestModule.java +++ b/FileTypeId/src/org/sleuthkit/autopsy/filetypeid/FileTypeIdIngestModule.java @@ -39,7 +39,7 @@ import org.sleuthkit.datamodel.TskException; * Detects the type of a file based on signature (magic) values. * Posts results to the blackboard. */ -public class FileTypeIdIngestModule extends org.sleuthkit.autopsy.ingest.IngestModuleAbstractFile { + public class FileTypeIdIngestModule extends org.sleuthkit.autopsy.ingest.IngestModuleAbstractFile { private static FileTypeIdIngestModule defaultInstance = null; public final static String MODULE_NAME = "File Type Identification"; public final static String MODULE_DESCRIPTION = "Matches file types based on binary signatures."; diff --git a/FileTypeId/src/org/sleuthkit/autopsy/filetypeid/FileTypeIdSimpleConfigPanel.java b/FileTypeId/src/org/sleuthkit/autopsy/filetypeid/FileTypeIdSimpleConfigPanel.java index 43576d8184..cffd6afd5c 100644 --- a/FileTypeId/src/org/sleuthkit/autopsy/filetypeid/FileTypeIdSimpleConfigPanel.java +++ b/FileTypeId/src/org/sleuthkit/autopsy/filetypeid/FileTypeIdSimpleConfigPanel.java @@ -22,7 +22,7 @@ package org.sleuthkit.autopsy.filetypeid; /** * Instances of this class provide a simplified UI for managing the hash sets configuration. */ -public class FileTypeIdSimpleConfigPanel extends javax.swing.JPanel { + class FileTypeIdSimpleConfigPanel extends javax.swing.JPanel { public FileTypeIdSimpleConfigPanel() { initComponents(); diff --git a/FileTypeId/src/org/sleuthkit/autopsy/filetypeid/TikaFileTypeDetector.java b/FileTypeId/src/org/sleuthkit/autopsy/filetypeid/TikaFileTypeDetector.java index ff24f485e5..7822b933e5 100644 --- a/FileTypeId/src/org/sleuthkit/autopsy/filetypeid/TikaFileTypeDetector.java +++ b/FileTypeId/src/org/sleuthkit/autopsy/filetypeid/TikaFileTypeDetector.java @@ -26,7 +26,7 @@ import org.apache.tika.mime.MimeTypes; import org.sleuthkit.datamodel.AbstractFile; -public class TikaFileTypeDetector implements FileTypeDetectionInterface { +class TikaFileTypeDetector implements FileTypeDetectionInterface { private static Tika tikaInst = new Tika(); diff --git a/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashDbConfigPanel.java b/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashDbConfigPanel.java index 4fa82d4a2c..bb6df9a6aa 100644 --- a/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashDbConfigPanel.java +++ b/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashDbConfigPanel.java @@ -46,7 +46,7 @@ import org.sleuthkit.autopsy.hashdatabase.HashDbManager.HashDb.KnownFilesType; /** * Instances of this class provide a comprehensive UI for managing the hash sets configuration. */ -public final class HashDbConfigPanel extends javax.swing.JPanel implements OptionsPanel { + final class HashDbConfigPanel extends javax.swing.JPanel implements OptionsPanel { private static final String NO_SELECTION_TEXT = "No database selected"; private static final String ERROR_GETTING_PATH_TEXT = "Error occurred getting path"; private static final String ERROR_GETTING_INDEX_STATUS_TEXT = "Error occurred getting status"; diff --git a/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashDbIngestModule.java b/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashDbIngestModule.java index 91ecb5de88..baa3ee9ea2 100644 --- a/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashDbIngestModule.java +++ b/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashDbIngestModule.java @@ -45,7 +45,7 @@ import org.sleuthkit.datamodel.TskException; import org.sleuthkit.autopsy.hashdatabase.HashDbManager.HashDb; import org.sleuthkit.datamodel.HashInfo; -public class HashDbIngestModule extends IngestModuleAbstractFile { +class HashDbIngestModule extends IngestModuleAbstractFile { private static HashDbIngestModule instance = null; public final static String MODULE_NAME = "Hash Lookup"; public final static String MODULE_DESCRIPTION = "Identifies known and notables files using supplied hash databases, such as a standard NSRL database."; diff --git a/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashDbManager.java b/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashDbManager.java index 3dd27307e7..dc93d92ab7 100755 --- a/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashDbManager.java +++ b/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashDbManager.java @@ -56,7 +56,7 @@ import org.sleuthkit.datamodel.TskCoreException; * This class implements a singleton that manages the set of hash databases * used to classify files as unknown, known or known bad. */ -public class HashDbManager implements PropertyChangeListener { +class HashDbManager implements PropertyChangeListener { private static final String ROOT_ELEMENT = "hash_sets"; private static final String SET_ELEMENT = "hash_set"; diff --git a/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashDbSearchAction.java b/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashDbSearchAction.java index 1f815ee60e..960efe949f 100644 --- a/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashDbSearchAction.java +++ b/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashDbSearchAction.java @@ -36,7 +36,7 @@ import org.sleuthkit.datamodel.FsContent; * specific Content attached; it is manually programmed into a Node's available * actions. */ -public class HashDbSearchAction extends CallableSystemAction implements HashSearchProvider { +class HashDbSearchAction extends CallableSystemAction implements HashSearchProvider { private static final InitializeContentVisitor initializeCV = new InitializeContentVisitor(); private AbstractFile file; diff --git a/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashDbSearchManager.java b/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashDbSearchManager.java index 4a64c42df7..ffe2b99587 100644 --- a/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashDbSearchManager.java +++ b/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashDbSearchManager.java @@ -34,7 +34,7 @@ import org.sleuthkit.datamodel.AbstractFile; * Interface/Node manager for hash searching. The manager takes in the raw * map of MD5 hashes to files, flattens the map, and sends it to the HashDbSearchResultFactory. */ -public class HashDbSearchManager { + class HashDbSearchManager { private Map> map; private List kvContents; diff --git a/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashDbSearchPanel.java b/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashDbSearchPanel.java index e400c9e14b..be291f91d2 100644 --- a/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashDbSearchPanel.java +++ b/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashDbSearchPanel.java @@ -35,7 +35,7 @@ import org.sleuthkit.autopsy.ingest.IngestManager; /** * Searches for files by md5 hash, based off the hash given in this panel. */ -public class HashDbSearchPanel extends javax.swing.JPanel implements ActionListener { + class HashDbSearchPanel extends javax.swing.JPanel implements ActionListener { private static final Logger logger = Logger.getLogger(HashDbSearchPanel.class.getName()); private static HashDbSearchPanel instance; diff --git a/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashDbSearchResultFactory.java b/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashDbSearchResultFactory.java index f4cca5075a..e5b4e09f0e 100644 --- a/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashDbSearchResultFactory.java +++ b/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashDbSearchResultFactory.java @@ -29,7 +29,7 @@ import org.sleuthkit.datamodel.AbstractFile; /** * Factory class to create a KeyValueFileNode for each KeyValueContent in the Collection. */ -public class HashDbSearchResultFactory extends ChildFactory { + class HashDbSearchResultFactory extends ChildFactory { Collection kvContents; HashDbSearchResultFactory(Collection kvContents) { diff --git a/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashDbSearcher.java b/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashDbSearcher.java index 8d1a9ba00d..c775bb5cf1 100644 --- a/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashDbSearcher.java +++ b/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashDbSearcher.java @@ -33,7 +33,7 @@ import org.sleuthkit.datamodel.SleuthkitCase; * Searches by MD5 hash to find all files with the same hash, and * subsequently the same content. */ -public class HashDbSearcher { + class HashDbSearcher { /** * Given a string hash value, find all files with that hash. diff --git a/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashDbSimpleConfigPanel.java b/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashDbSimpleConfigPanel.java index 4149ccccfd..ae27c7984f 100644 --- a/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashDbSimpleConfigPanel.java +++ b/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashDbSimpleConfigPanel.java @@ -36,7 +36,7 @@ import org.sleuthkit.autopsy.hashdatabase.HashDbManager.HashDb; /** * Instances of this class provide a simplified UI for managing the hash sets configuration. */ -public class HashDbSimpleConfigPanel extends javax.swing.JPanel { + class HashDbSimpleConfigPanel extends javax.swing.JPanel { private HashDatabasesTableModel knownTableModel; private HashDatabasesTableModel knownBadTableModel; diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/AbstractFileHtmlExtract.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/AbstractFileHtmlExtract.java index 39e59dbe90..e63545a904 100644 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/AbstractFileHtmlExtract.java +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/AbstractFileHtmlExtract.java @@ -37,7 +37,7 @@ import org.sleuthkit.datamodel.ReadContentInputStream; * divided into chunks and indexed with Solr. If HTML extraction succeeds, * chunks are indexed with Solr. */ -public class AbstractFileHtmlExtract implements AbstractFileExtract { + class AbstractFileHtmlExtract implements AbstractFileExtract { private static final Logger logger = Logger.getLogger(AbstractFileHtmlExtract.class.getName()); static final Charset outCharset = Server.DEFAULT_INDEXED_TEXT_CHARSET; diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/AbstractFileStringContentStream.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/AbstractFileStringContentStream.java index a6e6c49900..63873f9dd3 100644 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/AbstractFileStringContentStream.java +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/AbstractFileStringContentStream.java @@ -31,7 +31,7 @@ import org.sleuthkit.datamodel.AbstractFile; /** * Wrapper over InputStream that implements ContentStream to feed to Solr. */ -public class AbstractFileStringContentStream implements ContentStream { + class AbstractFileStringContentStream implements ContentStream { //input private AbstractFile content; diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/AbstractFileStringIntStream.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/AbstractFileStringIntStream.java index 90c843d3b8..03a9ebbea5 100644 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/AbstractFileStringIntStream.java +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/AbstractFileStringIntStream.java @@ -36,7 +36,7 @@ import org.sleuthkit.datamodel.TskCoreException; * * Currently not-thread safe (reusing static buffers for efficiency) */ -public class AbstractFileStringIntStream extends InputStream { + class AbstractFileStringIntStream extends InputStream { private AbstractFile content; private final byte[] oneCharBuf = new byte[1]; diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/AbstractFileStringStream.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/AbstractFileStringStream.java index 0123bbe79a..36ff7fc4f2 100644 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/AbstractFileStringStream.java +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/AbstractFileStringStream.java @@ -36,7 +36,7 @@ import org.sleuthkit.datamodel.TskException; * For other script/languages support and better encoding detection use AbstractFileStringIntStream streaming class, * which wraps around StringExtract extractor. */ -public class AbstractFileStringStream extends InputStream { + class AbstractFileStringStream extends InputStream { //args private AbstractFile content; diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/AbstractFileTikaTextExtract.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/AbstractFileTikaTextExtract.java index 20248d1167..2e802586c3 100644 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/AbstractFileTikaTextExtract.java +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/AbstractFileTikaTextExtract.java @@ -60,7 +60,7 @@ import org.sleuthkit.datamodel.TskCoreException; * parsers-supported content type. * */ -public class AbstractFileTikaTextExtract implements AbstractFileExtract { +class AbstractFileTikaTextExtract implements AbstractFileExtract { private static final Logger logger = Logger.getLogger(IngestModuleAbstractFile.class.getName()); private static final Charset OUTPUT_CHARSET = Server.DEFAULT_INDEXED_TEXT_CHARSET; diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/ByteContentStream.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/ByteContentStream.java index ab053273dd..fc8d132596 100644 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/ByteContentStream.java +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/ByteContentStream.java @@ -32,7 +32,7 @@ import org.sleuthkit.datamodel.AbstractContent; * Stream of bytes representing string with specified encoding * to feed into Solr as ContentStream */ -public class ByteContentStream implements ContentStream { +class ByteContentStream implements ContentStream { //input diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/ContentHit.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/ContentHit.java index c9ece0e770..b1e962b055 100644 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/ContentHit.java +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/ContentHit.java @@ -27,7 +27,7 @@ import org.sleuthkit.datamodel.AbstractFile; * Represents result of keyword search query containing the Content it hit * and chunk information, if the result hit is a content chunk */ -public class ContentHit { +class ContentHit { private AbstractFile content; private int chunkID = 0; diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Ingester.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Ingester.java index 46993b21bf..d4a7c2fffc 100644 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Ingester.java +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Ingester.java @@ -62,7 +62,7 @@ import org.sleuthkit.datamodel.TskCoreException; /** * Handles indexing files on a Solr core. */ -public class Ingester { +class Ingester { private static final Logger logger = Logger.getLogger(Ingester.class.getName()); private boolean uncommitedIngests = false; diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Installer.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Installer.java index 96ba214ced..2683be17b8 100644 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Installer.java +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Installer.java @@ -34,7 +34,7 @@ import org.sleuthkit.autopsy.coreutils.Version; * In addition, the default KeywordSearch config files (NSRL, Options, Scripts) * are generated here, if they config files do not already exist. */ -public class Installer extends ModuleInstall { +class Installer extends ModuleInstall { private static final Logger logger = Logger.getLogger(Installer.class.getName()); private final static int SERVER_START_RETRIES = 5; diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/JerichoParserWrapper.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/JerichoParserWrapper.java index ba723ddff4..7c98ec2d18 100644 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/JerichoParserWrapper.java +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/JerichoParserWrapper.java @@ -36,7 +36,7 @@ import net.htmlparser.jericho.StartTagType; * the text, comments, tag attributes, and other important information * found in the HTML. */ -public class JerichoParserWrapper { +class JerichoParserWrapper { private static final Logger logger = Logger.getLogger(JerichoParserWrapper.class.getName()); private InputStream in; private StringBuilder out; diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Keyword.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Keyword.java index f715a97e87..39035a1684 100644 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Keyword.java +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Keyword.java @@ -24,7 +24,7 @@ import org.sleuthkit.datamodel.BlackboardAttribute; /** * Representation of single keyword to search for */ -public class Keyword { +class Keyword { private String keywordString; // keyword to search for private boolean isLiteral; // false if reg exp private BlackboardAttribute.ATTRIBUTE_TYPE keywordType = null; diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordQueryFilter.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordQueryFilter.java index 1afbc464a9..8d7990ba1b 100644 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordQueryFilter.java +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordQueryFilter.java @@ -27,7 +27,7 @@ import java.util.Set; * Filter to restrict query only specific files, chunks, images * Single filter supports multiple ids per file/chunk/image, that act as OR filter */ -public class KeywordQueryFilter { +class KeywordQueryFilter { public static enum FilterType { diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearch.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearch.java index a39961e0a1..96d3562474 100644 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearch.java +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearch.java @@ -36,7 +36,7 @@ import org.sleuthkit.autopsy.keywordsearch.KeywordSearchResultFactory.ResultWrit * Wrapper over KeywordSearch Solr server singleton. * The class also provides some global types and property change support on the server events. */ -public class KeywordSearch { +class KeywordSearch { private static Server server; //we want a custom java.util.logging.Logger here for a reason diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchAction.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchAction.java index 68b730b550..2134ac55ce 100644 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchAction.java +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchAction.java @@ -23,7 +23,7 @@ import java.awt.event.ActionEvent; import javax.swing.AbstractAction; import org.openide.util.actions.Presenter; -public final class KeywordSearchAction extends AbstractAction implements Presenter.Toolbar { +final class KeywordSearchAction extends AbstractAction implements Presenter.Toolbar { @Override public void actionPerformed(ActionEvent e) { diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchConfigurationPanel.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchConfigurationPanel.java index 6fa8618dfc..a3e1ee5314 100644 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchConfigurationPanel.java +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchConfigurationPanel.java @@ -24,7 +24,7 @@ import org.sleuthkit.autopsy.corecomponents.OptionsPanel; /** * Container panel for keyword search advanced configuration options */ -public final class KeywordSearchConfigurationPanel extends javax.swing.JPanel implements OptionsPanel { +final class KeywordSearchConfigurationPanel extends javax.swing.JPanel implements OptionsPanel { private KeywordSearchConfigurationPanel1 listsPanel; private KeywordSearchConfigurationPanel3 languagesPanel; diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchConfigurationPanel1.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchConfigurationPanel1.java index f40185e96b..991f0d4c3a 100644 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchConfigurationPanel1.java +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchConfigurationPanel1.java @@ -35,7 +35,7 @@ import org.sleuthkit.autopsy.ingest.IngestManager; /** * Panel containing all other Keyword search Options panels. */ -public class KeywordSearchConfigurationPanel1 extends javax.swing.JPanel implements OptionsPanel { +class KeywordSearchConfigurationPanel1 extends javax.swing.JPanel implements OptionsPanel { KeywordSearchListsManagementPanel listsManagementPanel; KeywordSearchEditListPanel editListPanel; diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchConfigurationPanel2.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchConfigurationPanel2.java index 75ffc4ee32..e0b4dc0d89 100644 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchConfigurationPanel2.java +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchConfigurationPanel2.java @@ -30,7 +30,7 @@ import org.sleuthkit.autopsy.keywordsearch.KeywordSearchIngestModule.UpdateFrequ /** * General, not per list, keyword search configuration and status display widget */ -public class KeywordSearchConfigurationPanel2 extends javax.swing.JPanel implements OptionsPanel { +class KeywordSearchConfigurationPanel2 extends javax.swing.JPanel implements OptionsPanel { private final Logger logger = Logger.getLogger(KeywordSearchConfigurationPanel2.class.getName()); diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchConfigurationPanel3.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchConfigurationPanel3.java index 263e5d860e..ff736bfc2e 100644 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchConfigurationPanel3.java +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchConfigurationPanel3.java @@ -36,7 +36,7 @@ import org.sleuthkit.autopsy.ingest.IngestManager; /** * Advanced configuration panel handling languages config. */ -public class KeywordSearchConfigurationPanel3 extends javax.swing.JPanel implements OptionsPanel { +class KeywordSearchConfigurationPanel3 extends javax.swing.JPanel implements OptionsPanel { private static KeywordSearchConfigurationPanel3 instance = null; private final Logger logger = Logger.getLogger(KeywordSearchConfigurationPanel3.class.getName()); diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchIngestModule.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchIngestModule.java index 4942c41a14..de51b5ac97 100644 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchIngestModule.java +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchIngestModule.java @@ -76,7 +76,7 @@ import org.sleuthkit.datamodel.TskData.FileKnown; * * Registered as a module in layer.xml */ -public final class KeywordSearchIngestModule extends IngestModuleAbstractFile { +final class KeywordSearchIngestModule extends IngestModuleAbstractFile { enum UpdateFrequency { diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchIngestSimplePanel.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchIngestSimplePanel.java index 7c6b8090d6..b488548e55 100644 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchIngestSimplePanel.java +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchIngestSimplePanel.java @@ -32,7 +32,7 @@ import org.sleuthkit.autopsy.coreutils.StringExtract.StringExtractUnicodeTable.S /** * Simple ingest config panel */ -public class KeywordSearchIngestSimplePanel extends javax.swing.JPanel { +class KeywordSearchIngestSimplePanel extends javax.swing.JPanel { private final static Logger logger = Logger.getLogger(KeywordSearchIngestSimplePanel.class.getName()); public static final String PROP_OPTIONS = "Keyword Search_Options"; diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchListsAbstract.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchListsAbstract.java index ab61cee3aa..ab68f1f847 100644 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchListsAbstract.java +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchListsAbstract.java @@ -33,7 +33,7 @@ import org.sleuthkit.datamodel.BlackboardAttribute; /** * Keyword list saving, loading, and editing abstract class. */ -public abstract class KeywordSearchListsAbstract { +abstract class KeywordSearchListsAbstract { protected String filePath; Map theLists; //the keyword data diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchListsEncase.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchListsEncase.java index 9c3694a2dd..9ad11804a3 100644 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchListsEncase.java +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchListsEncase.java @@ -39,7 +39,7 @@ import java.util.logging.Level; * and finally the EncaseFileEntries are converted to KeywordSearchLists * */ -public class KeywordSearchListsEncase extends KeywordSearchListsAbstract{ +class KeywordSearchListsEncase extends KeywordSearchListsAbstract{ ArrayList entriesUnsorted; EncaseFileEntry rootEntry; diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchListsXML.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchListsXML.java index 5891f8a406..328059e44f 100644 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchListsXML.java +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchListsXML.java @@ -39,7 +39,7 @@ import org.w3c.dom.NodeList; * Manages reading and writing of keyword lists to user settings XML file keywords.xml * or to any file provided in constructor */ -public class KeywordSearchListsXML extends KeywordSearchListsAbstract{ +class KeywordSearchListsXML extends KeywordSearchListsAbstract{ private static final String ROOT_EL = "keyword_lists"; private static final String LIST_EL = "keyword_list"; diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchModuleException.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchModuleException.java index 8f114cbf1a..38d7719d68 100644 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchModuleException.java +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchModuleException.java @@ -22,7 +22,7 @@ package org.sleuthkit.autopsy.keywordsearch; /** * Generic Keyword search module exception, wrapper for underlying exceptions */ -public class KeywordSearchModuleException extends Exception { +class KeywordSearchModuleException extends Exception { public KeywordSearchModuleException(String message) { super(message); diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchPanel.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchPanel.java index 1f77cdcc47..f15601ef11 100644 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchPanel.java +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchPanel.java @@ -49,7 +49,7 @@ import org.sleuthkit.autopsy.casemodule.Case; * due to the necessity to find a font that displays both Arabic and Asian fonts at an acceptable size. * The default, Tahoma 14, could not perform this task at the desired size, and neither could numerous other fonts. */ -public class KeywordSearchPanel extends AbstractKeywordSearchPerformer { +class KeywordSearchPanel extends AbstractKeywordSearchPerformer { private static final Logger logger = Logger.getLogger(KeywordSearchPanel.class.getName()); private KeywordPropertyChangeListener listener; diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchQuery.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchQuery.java index 29a1707a76..e55ba17cfd 100644 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchQuery.java +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchQuery.java @@ -29,7 +29,7 @@ import org.sleuthkit.datamodel.AbstractFile; * engines or methods of using the same engine. One of these * is created for each query. */ -public interface KeywordSearchQuery { +interface KeywordSearchQuery { /** * validate the query pre execution diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchQueryManager.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchQueryManager.java index eec153c0d8..ff9d5daaee 100644 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchQueryManager.java +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchQueryManager.java @@ -36,7 +36,7 @@ import org.sleuthkit.autopsy.keywordsearch.KeywordSearch.QueryType; * Responsible for running a keyword search query and displaying * the results. */ -public class KeywordSearchQueryManager { +class KeywordSearchQueryManager { // how to display the results public enum Presentation { diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchResultFactory.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchResultFactory.java index 6c677eec85..dbd03d5f07 100644 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchResultFactory.java +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchResultFactory.java @@ -59,7 +59,7 @@ import org.sleuthkit.datamodel.TskData.TSK_DB_FILES_TYPE_ENUM; * responsible for assembling nodes and columns in the right way * and performing lazy queries as needed */ -public class KeywordSearchResultFactory extends ChildFactory { +class KeywordSearchResultFactory extends ChildFactory { //common properties (superset of all Node properties) to be displayed as columns //these are merged with FsContentPropertyType defined properties diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchSettings.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchSettings.java index f421d89c52..e4b667141e 100644 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchSettings.java +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchSettings.java @@ -33,7 +33,7 @@ import org.sleuthkit.autopsy.keywordsearch.KeywordSearchIngestModule.UpdateFrequ //This file contains constants and settings for KeywordSearch -public class KeywordSearchSettings { +class KeywordSearchSettings { public static final String MODULE_NAME = "KeywordSearch"; static final String PROPERTIES_OPTIONS = MODULE_NAME+"_Options"; static final String PROPERTIES_NSRL = MODULE_NAME+"_NSRL"; diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchUtil.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchUtil.java index 04149c0806..91d0aee2c0 100644 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchUtil.java +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchUtil.java @@ -27,7 +27,7 @@ import org.sleuthkit.datamodel.AbstractFile; import org.sleuthkit.datamodel.FsContent; import org.sleuthkit.datamodel.TskException; -public class KeywordSearchUtil { +class KeywordSearchUtil { public enum DIALOG_MESSAGE_TYPE { diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordWriteResult.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordWriteResult.java index 353c5aaf31..a28666c7d2 100644 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordWriteResult.java +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordWriteResult.java @@ -27,7 +27,7 @@ import org.sleuthkit.datamodel.BlackboardAttribute; /** * result of writing keyword search result to blackboard (cached artifact and attributes) */ -public class KeywordWriteResult { +class KeywordWriteResult { private BlackboardArtifact artifact; private Map attributes; diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/LuceneQuery.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/LuceneQuery.java index b046a82e5a..30f30d4252 100644 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/LuceneQuery.java +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/LuceneQuery.java @@ -46,7 +46,7 @@ import org.sleuthkit.datamodel.TskException; * Performs a normal string (i.e. non-regexp) query to SOLR/Lucene. * By default, matches in all fields. */ -public class LuceneQuery implements KeywordSearchQuery { +class LuceneQuery implements KeywordSearchQuery { private static final Logger logger = Logger.getLogger(LuceneQuery.class.getName()); private String keywordString; //original unescaped query diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/MarkupSource.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/MarkupSource.java index 45d044c9aa..8a43906d64 100644 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/MarkupSource.java +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/MarkupSource.java @@ -26,7 +26,7 @@ import java.util.LinkedHashMap; * highlight the keyword hits and a version that does not do markup * so that you can simply view the stored text. */ -public interface MarkupSource { +interface MarkupSource { /** * @return text optionally marked up with the subsest of HTML that Swing diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/NoOpenCoreException.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/NoOpenCoreException.java index dc9f0b61ac..c9c841ec6d 100644 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/NoOpenCoreException.java +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/NoOpenCoreException.java @@ -22,7 +22,7 @@ package org.sleuthkit.autopsy.keywordsearch; * * Exception thrown when no core is open */ -public class NoOpenCoreException extends Exception { +class NoOpenCoreException extends Exception { NoOpenCoreException() { super("No currently open Solr core."); diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Server.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Server.java index d78a630112..8afa56bc3a 100644 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Server.java +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Server.java @@ -65,7 +65,7 @@ import org.apache.solr.client.solrj.impl.XMLResponseParser; /** * Handles for keeping track of a Solr server and its cores */ -public class Server { +class Server { // field names that are used in SOLR schema public static enum Schema { diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/TermComponentQuery.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/TermComponentQuery.java index 6002cf5a70..3f08f5900e 100644 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/TermComponentQuery.java +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/TermComponentQuery.java @@ -45,7 +45,7 @@ import org.sleuthkit.datamodel.TskException; /** * Performs a regular expression query to the SOLR/Lucene instance. */ -public class TermComponentQuery implements KeywordSearchQuery { +class TermComponentQuery implements KeywordSearchQuery { private static final int TERMS_UNLIMITED = -1; //corresponds to field in Solr schema, analyzed with white-space tokenizer only diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/TextLanguageIdentifier.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/TextLanguageIdentifier.java index 75d33ea067..421d90987a 100755 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/TextLanguageIdentifier.java +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/TextLanguageIdentifier.java @@ -24,7 +24,7 @@ import org.sleuthkit.datamodel.AbstractFile; * * */ -public interface TextLanguageIdentifier { +interface TextLanguageIdentifier { /** * attempts to identify the language of the given String and add it to the diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/TikaLanguageIdentifier.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/TikaLanguageIdentifier.java index 7d42399f89..70c85f766b 100755 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/TikaLanguageIdentifier.java +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/TikaLanguageIdentifier.java @@ -29,7 +29,7 @@ import org.sleuthkit.datamodel.TskCoreException; * TextLanguageIdentifier implementation based on a wrapped Tike * LanguageIdentifier */ -public class TikaLanguageIdentifier implements TextLanguageIdentifier { +class TikaLanguageIdentifier implements TextLanguageIdentifier { private static final Logger logger = Logger.getLogger(TikaLanguageIdentifier.class.getName()); private static final int MIN_STRING_LENGTH = 1000; diff --git a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/RAImageIngestModule.java b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/RAImageIngestModule.java index c5565bc3c8..3f0cbb830c 100644 --- a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/RAImageIngestModule.java +++ b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/RAImageIngestModule.java @@ -42,7 +42,7 @@ import org.sleuthkit.datamodel.Content; * Recent activity image ingest module * */ -public final class RAImageIngestModule extends IngestModuleDataSource { +final class RAImageIngestModule extends IngestModuleDataSource { private static final Logger logger = Logger.getLogger(RAImageIngestModule.class.getName()); private static RAImageIngestModule defaultInstance = null; diff --git a/ScalpelCarver/src/org/sleuthkit/autopsy/scalpel/ScalpelCarverIngestModule.java b/ScalpelCarver/src/org/sleuthkit/autopsy/scalpel/ScalpelCarverIngestModule.java index 8c9e7c1fde..98bfbdf29c 100644 --- a/ScalpelCarver/src/org/sleuthkit/autopsy/scalpel/ScalpelCarverIngestModule.java +++ b/ScalpelCarver/src/org/sleuthkit/autopsy/scalpel/ScalpelCarverIngestModule.java @@ -50,7 +50,7 @@ import org.sleuthkit.datamodel.Volume; /** * Scalpel carving ingest module */ -public class ScalpelCarverIngestModule { // extends IngestModuleAbstractFile { // disable autodiscovery for now { +class ScalpelCarverIngestModule { // extends IngestModuleAbstractFile { // disable autodiscovery for now { private static final Logger logger = Logger.getLogger(ScalpelCarverIngestModule.class.getName()); diff --git a/SevenZip/src/org/sleuthkit/autopsy/sevenzip/SevenZipIngestModule.java b/SevenZip/src/org/sleuthkit/autopsy/sevenzip/SevenZipIngestModule.java index 4f79973dcd..c6b9d9ebde 100644 --- a/SevenZip/src/org/sleuthkit/autopsy/sevenzip/SevenZipIngestModule.java +++ b/SevenZip/src/org/sleuthkit/autopsy/sevenzip/SevenZipIngestModule.java @@ -66,7 +66,7 @@ import org.sleuthkit.datamodel.TskData; * * Updates datamodel / directory tree with new files. */ -public final class SevenZipIngestModule extends IngestModuleAbstractFile { +final class SevenZipIngestModule extends IngestModuleAbstractFile { private static final Logger logger = Logger.getLogger(SevenZipIngestModule.class.getName()); public static final String MODULE_NAME = "Archive Extractor"; diff --git a/Timeline/src/org/sleuthkit/autopsy/timeline/TimelineFrame.java b/Timeline/src/org/sleuthkit/autopsy/timeline/TimelineFrame.java index e59dbe39d9..57e754a50c 100644 --- a/Timeline/src/org/sleuthkit/autopsy/timeline/TimelineFrame.java +++ b/Timeline/src/org/sleuthkit/autopsy/timeline/TimelineFrame.java @@ -29,7 +29,7 @@ import java.awt.Image; * * Ready timeline frame with layout to hold dynamic components */ -public class TimelineFrame extends javax.swing.JFrame { + class TimelineFrame extends javax.swing.JFrame { /** * Creates new form TimelineFrame diff --git a/Timeline/src/org/sleuthkit/autopsy/timeline/TimelineProgressDialog.java b/Timeline/src/org/sleuthkit/autopsy/timeline/TimelineProgressDialog.java index 99f324b5d3..a1b834fb5c 100644 --- a/Timeline/src/org/sleuthkit/autopsy/timeline/TimelineProgressDialog.java +++ b/Timeline/src/org/sleuthkit/autopsy/timeline/TimelineProgressDialog.java @@ -31,7 +31,7 @@ import org.openide.windows.WindowManager; /** * Dialog with progress bar that pops up when timeline is being generated */ -public class TimelineProgressDialog extends javax.swing.JDialog { + class TimelineProgressDialog extends javax.swing.JDialog { /** * A return status code - returned if Cancel button has been pressed diff --git a/branding/core/core.jar/org/netbeans/core/startup/Bundle.properties b/branding/core/core.jar/org/netbeans/core/startup/Bundle.properties index eab2151dbc..13353e71a6 100644 --- a/branding/core/core.jar/org/netbeans/core/startup/Bundle.properties +++ b/branding/core/core.jar/org/netbeans/core/startup/Bundle.properties @@ -1,5 +1,5 @@ #Updated by build script -#Tue, 21 Jan 2014 15:31:49 -0500 +#Wed, 22 Jan 2014 11:01:41 -0500 LBL_splash_window_title=Starting Autopsy SPLASH_HEIGHT=288 SPLASH_WIDTH=538 diff --git a/branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties b/branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties index dc7e5446f7..bbd90839ed 100644 --- a/branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties +++ b/branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties @@ -1,5 +1,5 @@ #Updated by build script -#Tue, 21 Jan 2014 15:31:49 -0500 +#Wed, 22 Jan 2014 11:01:41 -0500 CTL_MainWindow_Title=Autopsy 3.0.8 CTL_MainWindow_Title_No_Project=Autopsy 3.0.8 diff --git a/thunderbirdparser/src/org/sleuthkit/autopsy/thunderbirdparser/EmailMessage.java b/thunderbirdparser/src/org/sleuthkit/autopsy/thunderbirdparser/EmailMessage.java index f015857716..976d6c5c70 100755 --- a/thunderbirdparser/src/org/sleuthkit/autopsy/thunderbirdparser/EmailMessage.java +++ b/thunderbirdparser/src/org/sleuthkit/autopsy/thunderbirdparser/EmailMessage.java @@ -29,7 +29,7 @@ import java.util.List; * the original format or source. * @author jwallace */ -public class EmailMessage { +class EmailMessage { private String recipients = ""; private String bcc = ""; private String cc = ""; diff --git a/thunderbirdparser/src/org/sleuthkit/autopsy/thunderbirdparser/MboxParser.java b/thunderbirdparser/src/org/sleuthkit/autopsy/thunderbirdparser/MboxParser.java index fda4a220c5..05086b1ee6 100755 --- a/thunderbirdparser/src/org/sleuthkit/autopsy/thunderbirdparser/MboxParser.java +++ b/thunderbirdparser/src/org/sleuthkit/autopsy/thunderbirdparser/MboxParser.java @@ -62,7 +62,7 @@ import org.sleuthkit.autopsy.ingest.IngestServices; * * @author jwallace */ -public class MboxParser { + class MboxParser { private static final Logger logger = Logger.getLogger(MboxParser.class.getName()); private DefaultMessageBuilder messageBuilder; private IngestServices services; diff --git a/thunderbirdparser/src/org/sleuthkit/autopsy/thunderbirdparser/PstParser.java b/thunderbirdparser/src/org/sleuthkit/autopsy/thunderbirdparser/PstParser.java index 4b5269474b..a43aef5dc9 100755 --- a/thunderbirdparser/src/org/sleuthkit/autopsy/thunderbirdparser/PstParser.java +++ b/thunderbirdparser/src/org/sleuthkit/autopsy/thunderbirdparser/PstParser.java @@ -43,7 +43,7 @@ import org.sleuthkit.datamodel.TskCoreException; * * @author jwallace */ -public class PstParser { +class PstParser { private static final Logger logger = Logger.getLogger(PstParser.class.getName()); /** * First four bytes of a pst file. diff --git a/thunderbirdparser/src/org/sleuthkit/autopsy/thunderbirdparser/ThunderbirdMboxFileIngestModule.java b/thunderbirdparser/src/org/sleuthkit/autopsy/thunderbirdparser/ThunderbirdMboxFileIngestModule.java index 4527cf737b..4216eec00c 100644 --- a/thunderbirdparser/src/org/sleuthkit/autopsy/thunderbirdparser/ThunderbirdMboxFileIngestModule.java +++ b/thunderbirdparser/src/org/sleuthkit/autopsy/thunderbirdparser/ThunderbirdMboxFileIngestModule.java @@ -48,7 +48,7 @@ import org.sleuthkit.datamodel.TskException; * File-level ingest module that detects MBOX files based on signature. * Understands Thunderbird folder layout to provide additional structure and metadata. */ -public class ThunderbirdMboxFileIngestModule extends IngestModuleAbstractFile { +class ThunderbirdMboxFileIngestModule extends IngestModuleAbstractFile { private static final Logger logger = Logger.getLogger(ThunderbirdMboxFileIngestModule.class.getName()); private static ThunderbirdMboxFileIngestModule instance = null; From a3b9bc105af4c274822cb4e4072b6c431d7bfb27 Mon Sep 17 00:00:00 2001 From: shahit2 Date: Wed, 22 Jan 2014 12:10:27 -0500 Subject: [PATCH 11/38] added Mimetypes/filters --- .../autopsy/fileextmismatch/Bundle.properties | 1 + .../FileExtMismatchConfigPanel.java | 6 +- .../FileExtMismatchIngestModule.java | 21 ++- .../FileExtMismatchSimpleConfigPanel.form | 32 ++-- .../FileExtMismatchSimpleConfigPanel.java | 34 +++- .../fileextmismatch/FileExtMismatchXML.java | 8 +- .../fileextmismatch/mismatch_config.xml | 163 +++++++++++++++++- 7 files changed, 230 insertions(+), 35 deletions(-) diff --git a/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/Bundle.properties b/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/Bundle.properties index 0172466a3d..c31389a1dd 100644 --- a/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/Bundle.properties +++ b/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/Bundle.properties @@ -16,3 +16,4 @@ FileExtMismatchConfigPanel.mimeRemoveErrLabel.text=\ FileExtMismatchConfigPanel.extRemoveErrLabel.text=\ FileExtMismatchConfigPanel.saveMsgLabel.text=\ FileExtMismatchSimpleConfigPanel.skipNoExtCheckBox.text=Skip Files Without Extensions +FileExtMismatchSimpleConfigPanel.SkipTextPlain.text=Skip text/plain MIME type diff --git a/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/FileExtMismatchConfigPanel.java b/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/FileExtMismatchConfigPanel.java index 2b2ca04ae1..7102d10377 100644 --- a/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/FileExtMismatchConfigPanel.java +++ b/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/FileExtMismatchConfigPanel.java @@ -392,7 +392,11 @@ public final class FileExtMismatchConfigPanel extends javax.swing.JPanel impleme mimeErrLabel.setText("MIME type text is empty!"); return; } - + if (newMime.equals( "application/octet-stream")){ + mimeErrLabel.setForeground(Color.red); + mimeErrLabel.setText("MIME type not supported!"); + return; + } if (mimeList.contains(newMime)) { mimeErrLabel.setForeground(Color.red); mimeErrLabel.setText("MIME type already exists!"); diff --git a/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/FileExtMismatchIngestModule.java b/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/FileExtMismatchIngestModule.java index 459f61d694..6ba7312f1b 100644 --- a/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/FileExtMismatchIngestModule.java +++ b/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/FileExtMismatchIngestModule.java @@ -60,7 +60,8 @@ public class FileExtMismatchIngestModule extends org.sleuthkit.autopsy.ingest.In private static long numFiles = 0; private static boolean skipKnown = false; private static boolean skipNoExt = true; - + private static boolean skipTextPlain = false; + private int attrId = -1; private int attrId2 = -1; private FileExtMismatchSimpleConfigPanel simpleConfigPanel; @@ -132,7 +133,11 @@ public class FileExtMismatchIngestModule extends org.sleuthkit.autopsy.ingest.In private boolean compareSigTypeToExt(AbstractFile abstractFile) { try { - currActualExt = abstractFile.getNameExtension(); + currActualExt = ""; + int i = abstractFile.getName().lastIndexOf("."); + if ((i > -1) && ((i + 1) < abstractFile.getName().length())) { + currActualExt = abstractFile.getName().substring(i + 1).toLowerCase(); + } // If we are skipping names with no extension if (skipNoExt && currActualExt.isEmpty()) { @@ -148,7 +153,13 @@ public class FileExtMismatchIngestModule extends org.sleuthkit.autopsy.ingest.In for (BlackboardAttribute att : atrList) { if (att.getAttributeTypeID() == BlackboardAttribute.ATTRIBUTE_TYPE.TSK_FILE_TYPE_SIG.getTypeID()) { currActualSigType = att.getValueString(); - + if (skipTextPlain) + { + if (!currActualExt.isEmpty()&&currActualSigType.equals("text/plain")) + { + return false; + } + } //get known allowed values from the map for this type String[] slist = SigTypeToExtMap.get(att.getValueString()); if (slist != null) { @@ -258,6 +269,8 @@ public class FileExtMismatchIngestModule extends org.sleuthkit.autopsy.ingest.In public static void setSkipNoExt(boolean flag) { skipNoExt = flag; } - + public static void setSkipTextPlain(boolean flag) { + skipTextPlain = flag; + } } diff --git a/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/FileExtMismatchSimpleConfigPanel.form b/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/FileExtMismatchSimpleConfigPanel.form index a112c72b72..0f0a844218 100644 --- a/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/FileExtMismatchSimpleConfigPanel.form +++ b/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/FileExtMismatchSimpleConfigPanel.form @@ -16,24 +16,26 @@ - - - - - + + + + + + - + - - - - + + + + + @@ -64,5 +66,15 @@ + + + + + + + + + + diff --git a/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/FileExtMismatchSimpleConfigPanel.java b/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/FileExtMismatchSimpleConfigPanel.java index 526fef6f9b..bd96ac919a 100644 --- a/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/FileExtMismatchSimpleConfigPanel.java +++ b/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/FileExtMismatchSimpleConfigPanel.java @@ -46,6 +46,7 @@ public class FileExtMismatchSimpleConfigPanel extends javax.swing.JPanel { skipKnownCheckBox = new javax.swing.JCheckBox(); skipNoExtCheckBox = new javax.swing.JCheckBox(); + skipTextPlain = new javax.swing.JCheckBox(); skipKnownCheckBox.setSelected(true); skipKnownCheckBox.setText(org.openide.util.NbBundle.getMessage(FileExtMismatchSimpleConfigPanel.class, "FileExtMismatchSimpleConfigPanel.skipKnownCheckBox.text")); // NOI18N @@ -64,25 +65,34 @@ public class FileExtMismatchSimpleConfigPanel extends javax.swing.JPanel { } }); + skipTextPlain.setText(org.openide.util.NbBundle.getMessage(FileExtMismatchSimpleConfigPanel.class, "FileExtMismatchSimpleConfigPanel.skipTextPlain.text")); // NOI18N + skipTextPlain.addActionListener(new java.awt.event.ActionListener() { + public void actionPerformed(java.awt.event.ActionEvent evt) { + skipTextPlainActionPerformed(evt); + } + }); + javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this); this.setLayout(layout); layout.setHorizontalGroup( layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(layout.createSequentialGroup() - .addGap(10, 10, 10) - .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false) - .addComponent(skipKnownCheckBox, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) - .addComponent(skipNoExtCheckBox, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) - .addContainerGap(127, Short.MAX_VALUE)) + .addContainerGap() + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addComponent(skipTextPlain) + .addComponent(skipNoExtCheckBox) + .addComponent(skipKnownCheckBox, javax.swing.GroupLayout.PREFERRED_SIZE, 165, javax.swing.GroupLayout.PREFERRED_SIZE)) + .addGap(0, 197, Short.MAX_VALUE)) ); layout.setVerticalGroup( layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(layout.createSequentialGroup() - .addGap(11, 11, 11) - .addComponent(skipKnownCheckBox) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addComponent(skipNoExtCheckBox) - .addContainerGap(152, Short.MAX_VALUE)) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(skipTextPlain) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(skipKnownCheckBox) + .addContainerGap(72, Short.MAX_VALUE)) ); }// //GEN-END:initComponents @@ -94,8 +104,14 @@ public class FileExtMismatchSimpleConfigPanel extends javax.swing.JPanel { FileExtMismatchIngestModule.setSkipNoExt(skipNoExtCheckBox.isSelected()); }//GEN-LAST:event_skipNoExtCheckBoxActionPerformed + private void skipTextPlainActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_skipTextPlainActionPerformed + FileExtMismatchIngestModule.setSkipTextPlain(skipTextPlain.isSelected()); + + }//GEN-LAST:event_skipTextPlainActionPerformed + // Variables declaration - do not modify//GEN-BEGIN:variables private javax.swing.JCheckBox skipKnownCheckBox; private javax.swing.JCheckBox skipNoExtCheckBox; + private javax.swing.JCheckBox skipTextPlain; // End of variables declaration//GEN-END:variables } diff --git a/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/FileExtMismatchXML.java b/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/FileExtMismatchXML.java index 8de27f4b6f..4eb27b85c1 100644 --- a/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/FileExtMismatchXML.java +++ b/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/FileExtMismatchXML.java @@ -54,7 +54,7 @@ public class FileExtMismatchXML { private static final String EXT_EL = "ext"; private static final String SIG_MIMETYPE_ATTR = "mimetype"; - private static final String DEFAULT_CONFIG_FILE_NAME = "mismatch_config.xml"; + private static final String DEFAULT_CONFIG_FILE_NAME = "mismatch_config.xml"; protected String filePath; @@ -79,7 +79,7 @@ public class FileExtMismatchXML { } return defaultInstance; } - + /** * Load and parse XML * @@ -111,7 +111,7 @@ public class FileExtMismatchXML { for(int sigIndex = 0; sigIndex < numSigs; ++sigIndex) { Element sigEl = (Element)sigNList.item(sigIndex); final String mimetype = sigEl.getAttribute(SIG_MIMETYPE_ATTR); - + NodeList extNList = sigEl.getElementsByTagName(EXT_EL); final int numExts = extNList.getLength(); @@ -181,4 +181,6 @@ public class FileExtMismatchXML { } return success; } + } + \ No newline at end of file diff --git a/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/mismatch_config.xml b/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/mismatch_config.xml index bada97fa28..8c88fcb430 100644 --- a/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/mismatch_config.xml +++ b/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/mismatch_config.xml @@ -1,5 +1,6 @@ + txt ini @@ -36,7 +37,6 @@ php php3 phtml - adp h hpp hxx @@ -113,7 +113,45 @@ winprf winprf_backup svg - + psp + jsp + oem + map + det + ins + ph + prx + sif + idl + isl + nld + sve + ita + fra + esn + enu + deu + sep + sve + cht + chs + psm + rq0 + old + eng + dlg + org + ic + ths + sig + std + cmp + stp + rst + lng + xdc + tha + sys doc docx @@ -223,11 +261,22 @@ hta wpl htt - adp - + shtml + + jpg - jpeg + jpeg + jpe + jif + jfif + jfi + + + psd + + + nef tif @@ -249,14 +298,19 @@ ico + mp4 + m4r mov qt mp4 - + + + rm + 3gp @@ -273,6 +327,7 @@ wmv asf + wma wma @@ -281,10 +336,17 @@ mpg mpeg + m1v + m2v + mpe + mpv flv - + + + m4v + rm @@ -293,5 +355,90 @@ swf - + + + + aif + aiff + + + aif + aiff + + + flac + + + wav + + + m4a + mp4 + + + mp2 + mp3 + mpa + m2a + + + aac + + + mp2 + mp3 + mpa + m2a + + + mp2 + mp3 + mpa + m2a + + + m3u + + + mid + midi + + + ogg + + + + rar + + + arj + + + tar + + + gz + gzip + tgz + + + bzip + bz + + + cab + + + jar + + + bzip2 + + + cpio + + + + exe + \ No newline at end of file From 8c25744d11a7d1aaea614232c66d64981fabeb64 Mon Sep 17 00:00:00 2001 From: shahit2 Date: Wed, 22 Jan 2014 13:07:17 -0500 Subject: [PATCH 12/38] Mismatch Changes --- .../fileextmismatch/FileExtMismatchIngestModule.java | 8 ++------ .../FileExtMismatchSimpleConfigPanel.form | 12 ++++++------ .../FileExtMismatchSimpleConfigPanel.java | 2 +- 3 files changed, 9 insertions(+), 13 deletions(-) diff --git a/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/FileExtMismatchIngestModule.java b/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/FileExtMismatchIngestModule.java index 6ba7312f1b..f4167f758b 100644 --- a/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/FileExtMismatchIngestModule.java +++ b/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/FileExtMismatchIngestModule.java @@ -133,12 +133,8 @@ public class FileExtMismatchIngestModule extends org.sleuthkit.autopsy.ingest.In private boolean compareSigTypeToExt(AbstractFile abstractFile) { try { - currActualExt = ""; - int i = abstractFile.getName().lastIndexOf("."); - if ((i > -1) && ((i + 1) < abstractFile.getName().length())) { - currActualExt = abstractFile.getName().substring(i + 1).toLowerCase(); - } - + currActualExt = abstractFile.getNameExtension(); + // If we are skipping names with no extension if (skipNoExt && currActualExt.isEmpty()) { return false; diff --git a/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/FileExtMismatchSimpleConfigPanel.form b/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/FileExtMismatchSimpleConfigPanel.form index 0f0a844218..21d366a524 100644 --- a/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/FileExtMismatchSimpleConfigPanel.form +++ b/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/FileExtMismatchSimpleConfigPanel.form @@ -19,11 +19,11 @@ - + - + @@ -32,7 +32,7 @@ - + @@ -66,14 +66,14 @@ - + - + - + diff --git a/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/FileExtMismatchSimpleConfigPanel.java b/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/FileExtMismatchSimpleConfigPanel.java index bd96ac919a..6974f95959 100644 --- a/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/FileExtMismatchSimpleConfigPanel.java +++ b/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/FileExtMismatchSimpleConfigPanel.java @@ -82,7 +82,7 @@ public class FileExtMismatchSimpleConfigPanel extends javax.swing.JPanel { .addComponent(skipTextPlain) .addComponent(skipNoExtCheckBox) .addComponent(skipKnownCheckBox, javax.swing.GroupLayout.PREFERRED_SIZE, 165, javax.swing.GroupLayout.PREFERRED_SIZE)) - .addGap(0, 197, Short.MAX_VALUE)) + .addGap(0, 327, Short.MAX_VALUE)) ); layout.setVerticalGroup( layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) From cd423367854b373a973c9d551c2ca35bef558cd3 Mon Sep 17 00:00:00 2001 From: shahit2 Date: Wed, 22 Jan 2014 16:36:42 -0500 Subject: [PATCH 13/38] committing --- .../autopsy/actions/AddTagAction.java | 2 +- .../actions/GetTagNameAndCommentDialog.java | 2 +- .../autopsy/actions/GetTagNameDialog.java | 2 +- .../sleuthkit/autopsy/actions/TagAction.java | 2 +- .../casemodule/AddImageErrorsDialog.java | 2 +- .../autopsy/casemodule/AddImageTask.java | 2 +- .../AddImageWizardAddingProgressPanel.java | 2 +- .../AddImageWizardAddingProgressVisual.java | 2 +- .../AddImageWizardChooseDataSourcePanel.java | 2 +- .../AddImageWizardChooseDataSourceVisual.java | 2 +- .../AddImageWizardIngestConfigPanel.java | 2 +- .../AddImageWizardIngestConfigVisual.java | 2 +- .../casemodule/AddImageWizardIterator.java | 2 +- .../autopsy/casemodule/AddLocalFilesTask.java | 2 +- .../autopsy/casemodule/ButtonColumn.java | 2 +- .../casemodule/CaseActionException.java | 2 +- .../autopsy/casemodule/CaseCloseAction.java | 2 +- .../casemodule/CaseConfigFileInterface.java | 2 +- .../autopsy/casemodule/CaseDeleteAction.java | 2 +- .../casemodule/CaseNewActionInterface.java | 2 +- .../casemodule/CasePropertiesAction.java | 2 +- .../casemodule/CasePropertiesForm.form | 2 +- .../casemodule/CasePropertiesForm.java | 2 +- .../autopsy/casemodule/CueBannerPanel.java | 2 +- .../autopsy/casemodule/GeneralFilter.java | 2 +- .../autopsy/casemodule/ImageFilePanel.java | 2 +- .../autopsy/casemodule/LocalDiskPanel.java | 2 +- .../autopsy/casemodule/LocalFilesPanel.java | 2 +- .../casemodule/MissingImageDialog.java | 2 +- .../casemodule/NewCaseVisualPanel1.java | 2 +- .../casemodule/NewCaseVisualPanel2.java | 2 +- .../casemodule/NewCaseWizardAction.java | 2 +- .../casemodule/NewCaseWizardPanel1.java | 2 +- .../casemodule/NewCaseWizardPanel2.java | 2 +- .../casemodule/OpenRecentCasePanel.java | 2 +- .../autopsy/casemodule/RecentCases.java | 2 +- .../autopsy/casemodule/RecentItems.java | 2 +- .../casemodule/StartupWindowInterface.java | 2 +- .../casemodule/StartupWindowProvider.java | 2 +- .../autopsy/casemodule/UpdateRecentCases.java | 2 +- .../autopsy/casemodule/XMLCaseManagement.java | 2 +- .../AbstractDataResultViewer.java | 2 +- .../corecomponents/CustomAboutAction.java | 2 +- .../corecomponents/DataResultViewerTable.java | 2 +- .../DataResultViewerThumbnail.java | 2 +- .../autopsy/corecomponents/FrameCapture.java | 2 +- .../autopsy/corecomponents/GeneralPanel.java | 2 +- .../corecomponents/MediaViewImagePanel.java | 2 +- .../corecomponents/MediaViewVideoPanel.java | 2 +- .../corecomponents/NoTabsTabDisplayerUI.java | 2 +- .../ProductInformationPanel.java | 2 +- .../corecomponents/TableFilterChildren.java | 2 +- .../corecomponents/ThumbnailViewChildren.java | 2 +- .../corecomponents/ThumbnailViewNode.java | 2 +- .../autopsy/corecomponents/VideoFrame.java | 2 +- .../sleuthkit/autopsy/coreutils/LnkEnums.java | 2 +- .../autopsy/coreutils/TestLogger.java | 2 +- .../coreutils/TimestampingFormatter.java | 2 +- .../datamodel/AbstractContentChildren.java | 2 +- .../datamodel/ArtifactTypeChildren.java | 2 +- .../autopsy/datamodel/AutopsyItemVisitor.java | 2 +- .../datamodel/AutopsyVisitableItem.java | 2 +- .../autopsy/datamodel/ContentChildren.java | 2 +- .../datamodel/ContentHierarchyVisitor.java | 2 +- .../datamodel/ContentIdHierarchyVisitor.java | 2 +- .../autopsy/datamodel/ContentNode.java | 2 +- .../autopsy/datamodel/ContentNodeVisitor.java | 2 +- .../autopsy/datamodel/ContentTagNode.java | 2 +- .../autopsy/datamodel/ExtractedContent.java | 2 +- .../datamodel/ExtractedContentChildren.java | 2 +- .../autopsy/datamodel/FileTypeChildren.java | 2 +- .../datamodel/FileTypeExtensionFilters.java | 2 +- .../autopsy/datamodel/FileTypeExtensions.java | 2 +- .../autopsy/datamodel/FileTypesChildren.java | 2 +- .../autopsy/datamodel/RecentFiles.java | 2 +- .../datamodel/RecentFilesChildren.java | 2 +- .../datamodel/RecentFilesFilterChildren.java | 2 +- .../autopsy/datamodel/TagsNodeKey.java | 2 +- .../directorytree/ChangeViewAction.java | 2 +- .../autopsy/directorytree/CollapseAction.java | 2 +- .../DataResultFilterChildren.java | 2 +- .../DirectoryTreeFilterChildren.java | 2 +- .../DirectoryTreeFilterNode.java | 2 +- .../directorytree/ExtractUnallocAction.java | 2 +- .../directorytree/FileSystemDetailsPanel.java | 2 +- .../directorytree/ImageDetailsPanel.form | 48 +++++++++---------- .../directorytree/ImageDetailsPanel.java | 2 +- .../directorytree/ResultDeleteAction.java | 2 +- .../ViewAssociatedContentAction.java | 2 +- .../directorytree/VolumeDetailsPanel.form | 2 +- .../directorytree/VolumeDetailsPanel.java | 2 +- .../SampleDataSourceIngestModule.java | 2 +- .../examples/SampleFileIngestModule.java | 2 +- .../ingest/GetFilesContentVisitor.java | 2 +- .../ingest/IngestDataSourceThread.java | 2 +- .../autopsy/ingest/IngestDialogPanel.java | 2 +- .../ingest/IngestMessageDetailsPanel.java | 2 +- .../ingest/IngestMessageMainPanel.java | 2 +- .../autopsy/ingest/IngestMessagePanel.java | 2 +- .../ingest/IngestMessageTopComponent.java | 2 +- .../autopsy/ingest/IngestMessagesAction.java | 2 +- .../autopsy/ingest/IngestMessagesToolbar.java | 2 +- .../autopsy/ingest/IngestModuleAbstract.java | 2 +- .../autopsy/ingest/IngestModuleLoader.java | 2 +- .../autopsy/ingest/IngestScheduler.java | 2 +- .../sleuthkit/autopsy/ingest/IngestUI.java | 2 +- .../autopsy/ingest/ScheduledTask.java | 2 +- .../autopsy/report/FileReportModule.java | 2 +- .../autopsy/report/FileReportText.java | 2 +- .../autopsy/report/GeneralReportModule.java | 2 +- .../autopsy/report/ReportBodyFile.java | 2 +- .../autopsy/report/ReportBranding.java | 2 +- .../report/ReportBrandingProviderI.java | 2 +- .../sleuthkit/autopsy/report/ReportExcel.java | 2 +- .../autopsy/report/ReportGenerator.java | 2 +- .../sleuthkit/autopsy/report/ReportHTML.java | 2 +- .../autopsy/report/ReportModule.java | 2 +- .../autopsy/report/ReportProgressPanel.java | 2 +- .../autopsy/report/ReportVisualPanel1.java | 2 +- .../autopsy/report/ReportVisualPanel2.java | 2 +- .../report/ReportWizardFileOptionsPanel.java | 2 +- .../ReportWizardFileOptionsVisualPanel.java | 2 +- .../autopsy/report/ReportWizardIterator.java | 2 +- .../autopsy/report/ReportWizardPanel1.java | 2 +- .../autopsy/report/ReportWizardPanel2.java | 2 +- .../autopsy/report/TableReportModule.java | 2 +- .../netbeans/core/startup/Bundle.properties | 2 +- .../core/windows/view/ui/Bundle.properties | 2 +- 128 files changed, 151 insertions(+), 151 deletions(-) diff --git a/Core/src/org/sleuthkit/autopsy/actions/AddTagAction.java b/Core/src/org/sleuthkit/autopsy/actions/AddTagAction.java index 65f6a5e589..0e44fd71b6 100755 --- a/Core/src/org/sleuthkit/autopsy/actions/AddTagAction.java +++ b/Core/src/org/sleuthkit/autopsy/actions/AddTagAction.java @@ -35,7 +35,7 @@ import org.sleuthkit.autopsy.coreutils.Logger; * An abstract base class for Actions that allow users to tag SleuthKit data * model objects. */ -abstract class AddTagAction extends TagAction implements Presenter.Popup { +public abstract class AddTagAction extends TagAction implements Presenter.Popup { private static final String NO_COMMENT = ""; AddTagAction(String menuText) { diff --git a/Core/src/org/sleuthkit/autopsy/actions/GetTagNameAndCommentDialog.java b/Core/src/org/sleuthkit/autopsy/actions/GetTagNameAndCommentDialog.java index 1260f920cd..05a6338272 100644 --- a/Core/src/org/sleuthkit/autopsy/actions/GetTagNameAndCommentDialog.java +++ b/Core/src/org/sleuthkit/autopsy/actions/GetTagNameAndCommentDialog.java @@ -37,7 +37,7 @@ import org.sleuthkit.autopsy.coreutils.Logger; import org.sleuthkit.datamodel.TagName; import org.sleuthkit.datamodel.TskCoreException; - class GetTagNameAndCommentDialog extends JDialog { + public class GetTagNameAndCommentDialog extends JDialog { private static final String NO_TAG_NAMES_MESSAGE = "No Tags"; private final HashMap tagNames = new HashMap<>(); private TagNameAndComment tagNameAndComment = null; diff --git a/Core/src/org/sleuthkit/autopsy/actions/GetTagNameDialog.java b/Core/src/org/sleuthkit/autopsy/actions/GetTagNameDialog.java index 8e9d961b7e..222a5d320f 100644 --- a/Core/src/org/sleuthkit/autopsy/actions/GetTagNameDialog.java +++ b/Core/src/org/sleuthkit/autopsy/actions/GetTagNameDialog.java @@ -41,7 +41,7 @@ import org.sleuthkit.autopsy.coreutils.Logger; import org.sleuthkit.datamodel.TagName; import org.sleuthkit.datamodel.TskCoreException; - class GetTagNameDialog extends JDialog { + public class GetTagNameDialog extends JDialog { private static final String TAG_ICON_PATH = "org/sleuthkit/autopsy/images/tag-folder-blue-icon-16.png"; private final HashMap tagNames = new HashMap<>(); private TagName tagName = null; diff --git a/Core/src/org/sleuthkit/autopsy/actions/TagAction.java b/Core/src/org/sleuthkit/autopsy/actions/TagAction.java index 376e52ce62..e85c418f17 100755 --- a/Core/src/org/sleuthkit/autopsy/actions/TagAction.java +++ b/Core/src/org/sleuthkit/autopsy/actions/TagAction.java @@ -26,7 +26,7 @@ import org.sleuthkit.datamodel.BlackboardArtifact; /** * Abstract base class for Actions involving tags. */ - abstract class TagAction extends AbstractAction { + public abstract class TagAction extends AbstractAction { public TagAction(String menuText) { super(menuText); } diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/AddImageErrorsDialog.java b/Core/src/org/sleuthkit/autopsy/casemodule/AddImageErrorsDialog.java index e18bf56f14..d0f2d3fa65 100644 --- a/Core/src/org/sleuthkit/autopsy/casemodule/AddImageErrorsDialog.java +++ b/Core/src/org/sleuthkit/autopsy/casemodule/AddImageErrorsDialog.java @@ -21,7 +21,7 @@ package org.sleuthkit.autopsy.casemodule; /** * Dialog to show add image error messages */ - class AddImageErrorsDialog extends javax.swing.JDialog { + public class AddImageErrorsDialog extends javax.swing.JDialog { /** * Creates new form AddImageErrorsDialog diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/AddImageTask.java b/Core/src/org/sleuthkit/autopsy/casemodule/AddImageTask.java index 7cc3348ca9..9171154ab4 100644 --- a/Core/src/org/sleuthkit/autopsy/casemodule/AddImageTask.java +++ b/Core/src/org/sleuthkit/autopsy/casemodule/AddImageTask.java @@ -43,7 +43,7 @@ import org.sleuthkit.datamodel.TskException; * It updates the given ProgressMonitor as it works through adding the image, * and et the end, calls the specified Callback. */ - class AddImageTask implements Runnable { +public class AddImageTask implements Runnable { private Logger logger = Logger.getLogger(AddImageTask.class.getName()); diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/AddImageWizardAddingProgressPanel.java b/Core/src/org/sleuthkit/autopsy/casemodule/AddImageWizardAddingProgressPanel.java index 476bbdd1df..ee9a700feb 100644 --- a/Core/src/org/sleuthkit/autopsy/casemodule/AddImageWizardAddingProgressPanel.java +++ b/Core/src/org/sleuthkit/autopsy/casemodule/AddImageWizardAddingProgressPanel.java @@ -39,7 +39,7 @@ import org.sleuthkit.autopsy.corecomponentinterfaces.DSPProgressMonitor; * {@link AddImageWizardIngestConfigPanel} (which is a bit weird if you ask m * -jm) */ -class AddImageWizardAddingProgressPanel implements WizardDescriptor.FinishablePanel { +public class AddImageWizardAddingProgressPanel implements WizardDescriptor.FinishablePanel { /** * flag to indicate that the image adding process is finished and this panel diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/AddImageWizardAddingProgressVisual.java b/Core/src/org/sleuthkit/autopsy/casemodule/AddImageWizardAddingProgressVisual.java index a7be36a1d7..3bd6a393fa 100644 --- a/Core/src/org/sleuthkit/autopsy/casemodule/AddImageWizardAddingProgressVisual.java +++ b/Core/src/org/sleuthkit/autopsy/casemodule/AddImageWizardAddingProgressVisual.java @@ -28,7 +28,7 @@ import org.openide.WizardDescriptor; * visual component to display progress bar and status updates while adding an * image in the wizard */ - class AddImageWizardAddingProgressVisual extends javax.swing.JPanel { + public class AddImageWizardAddingProgressVisual extends javax.swing.JPanel { private static final String ADDING_DATA_SOURCE_COMPLETE = "Adding Data Source - Complete"; private String errorLog = ""; diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/AddImageWizardChooseDataSourcePanel.java b/Core/src/org/sleuthkit/autopsy/casemodule/AddImageWizardChooseDataSourcePanel.java index d662439f3b..c78948f853 100644 --- a/Core/src/org/sleuthkit/autopsy/casemodule/AddImageWizardChooseDataSourcePanel.java +++ b/Core/src/org/sleuthkit/autopsy/casemodule/AddImageWizardChooseDataSourcePanel.java @@ -37,7 +37,7 @@ import org.sleuthkit.autopsy.coreutils.ModuleSettings; * The "Add Image" wizard panel1 handling the logic of selecting image file(s) * to add to Case, and pick the time zone. */ -class AddImageWizardChooseDataSourcePanel implements WizardDescriptor.Panel, PropertyChangeListener { +public class AddImageWizardChooseDataSourcePanel implements WizardDescriptor.Panel, PropertyChangeListener { /** * The visual component that displays this panel. If you need to access the diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/AddImageWizardChooseDataSourceVisual.java b/Core/src/org/sleuthkit/autopsy/casemodule/AddImageWizardChooseDataSourceVisual.java index 885b5cced0..0d6c640e22 100644 --- a/Core/src/org/sleuthkit/autopsy/casemodule/AddImageWizardChooseDataSourceVisual.java +++ b/Core/src/org/sleuthkit/autopsy/casemodule/AddImageWizardChooseDataSourceVisual.java @@ -45,7 +45,7 @@ import org.sleuthkit.autopsy.corecomponentinterfaces.DataSourceProcessor; * Allows the user to choose the data source type and then select the data source * */ -final class AddImageWizardChooseDataSourceVisual extends JPanel { +public final class AddImageWizardChooseDataSourceVisual extends JPanel { static final Logger logger = Logger.getLogger(AddImageWizardChooseDataSourceVisual.class.getName()); diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/AddImageWizardIngestConfigPanel.java b/Core/src/org/sleuthkit/autopsy/casemodule/AddImageWizardIngestConfigPanel.java index a83d4549dc..32cef4a095 100644 --- a/Core/src/org/sleuthkit/autopsy/casemodule/AddImageWizardIngestConfigPanel.java +++ b/Core/src/org/sleuthkit/autopsy/casemodule/AddImageWizardIngestConfigPanel.java @@ -43,7 +43,7 @@ import org.sleuthkit.autopsy.corecomponentinterfaces.DataSourceProcessor; * TODO: review this for dead code. think about moving logic of adding image to * 3rd panel( {@link AddImageWizardAddingProgressPanel}) separate class -jm */ -class AddImageWizardIngestConfigPanel implements WizardDescriptor.Panel { +public class AddImageWizardIngestConfigPanel implements WizardDescriptor.Panel { private static final Logger logger = Logger.getLogger(AddImageWizardIngestConfigPanel.class.getName()); private IngestConfigurator ingestConfig; diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/AddImageWizardIngestConfigVisual.java b/Core/src/org/sleuthkit/autopsy/casemodule/AddImageWizardIngestConfigVisual.java index 07aebf2484..09eca94dc5 100644 --- a/Core/src/org/sleuthkit/autopsy/casemodule/AddImageWizardIngestConfigVisual.java +++ b/Core/src/org/sleuthkit/autopsy/casemodule/AddImageWizardIngestConfigVisual.java @@ -27,7 +27,7 @@ import javax.swing.JPanel; * * */ - class AddImageWizardIngestConfigVisual extends javax.swing.JPanel { + public class AddImageWizardIngestConfigVisual extends javax.swing.JPanel { //could this be something more specific than JPanel? - jm private JPanel ingestPanel = null; diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/AddImageWizardIterator.java b/Core/src/org/sleuthkit/autopsy/casemodule/AddImageWizardIterator.java index b786b5b171..68e2738e2f 100644 --- a/Core/src/org/sleuthkit/autopsy/casemodule/AddImageWizardIterator.java +++ b/Core/src/org/sleuthkit/autopsy/casemodule/AddImageWizardIterator.java @@ -31,7 +31,7 @@ import org.openide.WizardDescriptor; * The iterator class for the "Add Image" wizard panel. This class is used to * iterate on the sequence of panels of the "Add Image" wizard panel. */ -class AddImageWizardIterator implements WizardDescriptor.Iterator { +public class AddImageWizardIterator implements WizardDescriptor.Iterator { private int index = 0; private List> panels; diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/AddLocalFilesTask.java b/Core/src/org/sleuthkit/autopsy/casemodule/AddLocalFilesTask.java index 0abf9bb75d..c6b419fec2 100644 --- a/Core/src/org/sleuthkit/autopsy/casemodule/AddLocalFilesTask.java +++ b/Core/src/org/sleuthkit/autopsy/casemodule/AddLocalFilesTask.java @@ -40,7 +40,7 @@ import org.sleuthkit.datamodel.TskCoreException; * manager methods acquire the locks for each transaction when adding * logical files. */ - class AddLocalFilesTask implements Runnable { + public class AddLocalFilesTask implements Runnable { private Logger logger = Logger.getLogger(AddLocalFilesTask.class.getName()); diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/ButtonColumn.java b/Core/src/org/sleuthkit/autopsy/casemodule/ButtonColumn.java index 8494bbd25f..80d2d101f1 100644 --- a/Core/src/org/sleuthkit/autopsy/casemodule/ButtonColumn.java +++ b/Core/src/org/sleuthkit/autopsy/casemodule/ButtonColumn.java @@ -44,7 +44,7 @@ import javax.swing.table.*; * the model row number of the button that was clicked. * */ -class ButtonColumn extends AbstractCellEditor +public class ButtonColumn extends AbstractCellEditor implements TableCellRenderer, TableCellEditor, ActionListener, MouseListener { private JTable table; diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/CaseActionException.java b/Core/src/org/sleuthkit/autopsy/casemodule/CaseActionException.java index 4f7e2fa6d2..8412ba8e0d 100644 --- a/Core/src/org/sleuthkit/autopsy/casemodule/CaseActionException.java +++ b/Core/src/org/sleuthkit/autopsy/casemodule/CaseActionException.java @@ -21,7 +21,7 @@ package org.sleuthkit.autopsy.casemodule; /** * Exception thrown when case action (such as open, close, create) resulted in an error */ - class CaseActionException extends Exception { + public class CaseActionException extends Exception { public CaseActionException(String message) { super(message); diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/CaseCloseAction.java b/Core/src/org/sleuthkit/autopsy/casemodule/CaseCloseAction.java index e99844ce66..f23398614c 100644 --- a/Core/src/org/sleuthkit/autopsy/casemodule/CaseCloseAction.java +++ b/Core/src/org/sleuthkit/autopsy/casemodule/CaseCloseAction.java @@ -45,7 +45,7 @@ import org.openide.util.actions.Presenter; * The action to close the current Case. This class should be disabled on * creation and it will be enabled on new case creation or case opened. */ - final class CaseCloseAction extends CallableSystemAction implements Presenter.Toolbar{ + public final class CaseCloseAction extends CallableSystemAction implements Presenter.Toolbar{ JButton toolbarButton = new JButton(); diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/CaseConfigFileInterface.java b/Core/src/org/sleuthkit/autopsy/casemodule/CaseConfigFileInterface.java index 4a91bf9c1e..cdcd1c81f6 100644 --- a/Core/src/org/sleuthkit/autopsy/casemodule/CaseConfigFileInterface.java +++ b/Core/src/org/sleuthkit/autopsy/casemodule/CaseConfigFileInterface.java @@ -25,7 +25,7 @@ package org.sleuthkit.autopsy.casemodule; * The interface for the classes that edit the case configuration file */ //TODO: check that this can just be deleted. -interface CaseConfigFileInterface { +public interface CaseConfigFileInterface { public void open(String conFilePath) throws Exception; // opens the confiuation store (XML, DB...) public void writeFile() throws Exception; // writes out the configuration to store public void close() throws Exception; // close and clear the document handler diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/CaseDeleteAction.java b/Core/src/org/sleuthkit/autopsy/casemodule/CaseDeleteAction.java index 72ed22351b..87a80fb2c2 100644 --- a/Core/src/org/sleuthkit/autopsy/casemodule/CaseDeleteAction.java +++ b/Core/src/org/sleuthkit/autopsy/casemodule/CaseDeleteAction.java @@ -66,7 +66,7 @@ import org.openide.util.actions.CallableSystemAction; * The action to delete the current Case. This class should be disabled on * creation and it will be enabled on new case creation or case opened. */ - final class CaseDeleteAction extends CallableSystemAction { + public final class CaseDeleteAction extends CallableSystemAction { private JPanel caller; // for error handling diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/CaseNewActionInterface.java b/Core/src/org/sleuthkit/autopsy/casemodule/CaseNewActionInterface.java index 1d84f6c61d..7f58026b68 100644 --- a/Core/src/org/sleuthkit/autopsy/casemodule/CaseNewActionInterface.java +++ b/Core/src/org/sleuthkit/autopsy/casemodule/CaseNewActionInterface.java @@ -25,6 +25,6 @@ import java.awt.event.ActionListener; /** * */ - interface CaseNewActionInterface extends ActionListener { + public interface CaseNewActionInterface extends ActionListener { } diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/CasePropertiesAction.java b/Core/src/org/sleuthkit/autopsy/casemodule/CasePropertiesAction.java index 76ff941278..f01c882070 100644 --- a/Core/src/org/sleuthkit/autopsy/casemodule/CasePropertiesAction.java +++ b/Core/src/org/sleuthkit/autopsy/casemodule/CasePropertiesAction.java @@ -40,7 +40,7 @@ import org.sleuthkit.autopsy.coreutils.Logger; * * @author jantonius */ - final class CasePropertiesAction extends CallableSystemAction { + public final class CasePropertiesAction extends CallableSystemAction { private static JDialog popUpWindow; diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/CasePropertiesForm.form b/Core/src/org/sleuthkit/autopsy/casemodule/CasePropertiesForm.form index ddbcd7e243..59b72df4dc 100644 --- a/Core/src/org/sleuthkit/autopsy/casemodule/CasePropertiesForm.form +++ b/Core/src/org/sleuthkit/autopsy/casemodule/CasePropertiesForm.form @@ -1,4 +1,4 @@ - +
diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/CasePropertiesForm.java b/Core/src/org/sleuthkit/autopsy/casemodule/CasePropertiesForm.java index 5ff08adcad..b307212c0e 100644 --- a/Core/src/org/sleuthkit/autopsy/casemodule/CasePropertiesForm.java +++ b/Core/src/org/sleuthkit/autopsy/casemodule/CasePropertiesForm.java @@ -44,7 +44,7 @@ import org.openide.util.actions.CallableSystemAction; * * @author jantonius */ -class CasePropertiesForm extends javax.swing.JPanel{ +public class CasePropertiesForm extends javax.swing.JPanel{ Case current = null; private static JPanel caller; // panel for error diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/CueBannerPanel.java b/Core/src/org/sleuthkit/autopsy/casemodule/CueBannerPanel.java index cd30342965..9f7fafb027 100644 --- a/Core/src/org/sleuthkit/autopsy/casemodule/CueBannerPanel.java +++ b/Core/src/org/sleuthkit/autopsy/casemodule/CueBannerPanel.java @@ -33,7 +33,7 @@ import org.openide.util.Lookup; /** * */ - class CueBannerPanel extends javax.swing.JPanel { + public class CueBannerPanel extends javax.swing.JPanel { final private static String title = "Open Recent Case"; final private static JFrame frame = new JFrame(title); diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/GeneralFilter.java b/Core/src/org/sleuthkit/autopsy/casemodule/GeneralFilter.java index d7a8e4df37..06da488f7d 100644 --- a/Core/src/org/sleuthkit/autopsy/casemodule/GeneralFilter.java +++ b/Core/src/org/sleuthkit/autopsy/casemodule/GeneralFilter.java @@ -27,7 +27,7 @@ import javax.swing.filechooser.FileFilter; /** * FileFilter helper class. Matches files based on extension */ - class GeneralFilter extends FileFilter{ + public class GeneralFilter extends FileFilter{ // Extensions & Descriptions for commonly used filters diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/ImageFilePanel.java b/Core/src/org/sleuthkit/autopsy/casemodule/ImageFilePanel.java index 6a99067af7..a87d3d2f82 100644 --- a/Core/src/org/sleuthkit/autopsy/casemodule/ImageFilePanel.java +++ b/Core/src/org/sleuthkit/autopsy/casemodule/ImageFilePanel.java @@ -39,7 +39,7 @@ import org.sleuthkit.autopsy.coreutils.ModuleSettings; /** * ImageTypePanel for adding an image file such as .img, .E0x, .00x, etc. */ - class ImageFilePanel extends JPanel implements DocumentListener { + public class ImageFilePanel extends JPanel implements DocumentListener { private final String PROP_LASTIMAGE_PATH = "LBL_LastImage_PATH"; diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/LocalDiskPanel.java b/Core/src/org/sleuthkit/autopsy/casemodule/LocalDiskPanel.java index efe949ef7f..710dc28a9b 100644 --- a/Core/src/org/sleuthkit/autopsy/casemodule/LocalDiskPanel.java +++ b/Core/src/org/sleuthkit/autopsy/casemodule/LocalDiskPanel.java @@ -47,7 +47,7 @@ import org.sleuthkit.autopsy.coreutils.PlatformUtil; /** * ImageTypePanel for adding a local disk or partition such as PhysicalDrive0 or C:. */ - class LocalDiskPanel extends JPanel { + public class LocalDiskPanel extends JPanel { private static final Logger logger = Logger.getLogger(LocalDiskPanel.class.getName()); private static LocalDiskPanel instance; diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/LocalFilesPanel.java b/Core/src/org/sleuthkit/autopsy/casemodule/LocalFilesPanel.java index 5966775be0..73d76dc1bb 100644 --- a/Core/src/org/sleuthkit/autopsy/casemodule/LocalFilesPanel.java +++ b/Core/src/org/sleuthkit/autopsy/casemodule/LocalFilesPanel.java @@ -30,7 +30,7 @@ import org.sleuthkit.autopsy.corecomponentinterfaces.DataSourceProcessor; /** * Add input wizard subpanel for adding local files / dirs to the case */ - class LocalFilesPanel extends JPanel { + public class LocalFilesPanel extends JPanel { private PropertyChangeSupport pcs = null; private Set currentFiles = new TreeSet(); //keep currents in a set to disallow duplicates per add diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/MissingImageDialog.java b/Core/src/org/sleuthkit/autopsy/casemodule/MissingImageDialog.java index d2d865aa0c..5de2f07f19 100644 --- a/Core/src/org/sleuthkit/autopsy/casemodule/MissingImageDialog.java +++ b/Core/src/org/sleuthkit/autopsy/casemodule/MissingImageDialog.java @@ -39,7 +39,7 @@ import org.sleuthkit.datamodel.TskCoreException; - class MissingImageDialog extends javax.swing.JDialog { + public class MissingImageDialog extends javax.swing.JDialog { private static final Logger logger = Logger.getLogger(MissingImageDialog.class.getName()); long obj_id; SleuthkitCase db; diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/NewCaseVisualPanel1.java b/Core/src/org/sleuthkit/autopsy/casemodule/NewCaseVisualPanel1.java index 3c4dd72bcf..ab6ee87d95 100644 --- a/Core/src/org/sleuthkit/autopsy/casemodule/NewCaseVisualPanel1.java +++ b/Core/src/org/sleuthkit/autopsy/casemodule/NewCaseVisualPanel1.java @@ -32,7 +32,7 @@ import javax.swing.event.DocumentListener; * * @author jantonius */ -final class NewCaseVisualPanel1 extends JPanel implements DocumentListener{ +public final class NewCaseVisualPanel1 extends JPanel implements DocumentListener{ private JFileChooser fc = new JFileChooser(); private NewCaseWizardPanel1 wizPanel; diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/NewCaseVisualPanel2.java b/Core/src/org/sleuthkit/autopsy/casemodule/NewCaseVisualPanel2.java index 5232f17835..1f35f2370e 100644 --- a/Core/src/org/sleuthkit/autopsy/casemodule/NewCaseVisualPanel2.java +++ b/Core/src/org/sleuthkit/autopsy/casemodule/NewCaseVisualPanel2.java @@ -28,7 +28,7 @@ package org.sleuthkit.autopsy.casemodule; * * @author dfickling */ - class NewCaseVisualPanel2 extends javax.swing.JPanel { + public class NewCaseVisualPanel2 extends javax.swing.JPanel { /** Creates new form NewCaseVisualPanel2 */ public NewCaseVisualPanel2() { diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/NewCaseWizardAction.java b/Core/src/org/sleuthkit/autopsy/casemodule/NewCaseWizardAction.java index 63f4ad5c56..a2d0460363 100644 --- a/Core/src/org/sleuthkit/autopsy/casemodule/NewCaseWizardAction.java +++ b/Core/src/org/sleuthkit/autopsy/casemodule/NewCaseWizardAction.java @@ -38,7 +38,7 @@ import org.sleuthkit.autopsy.coreutils.Logger; /** * Action to open the New Case wizard. */ - final class NewCaseWizardAction extends CallableSystemAction { + public final class NewCaseWizardAction extends CallableSystemAction { private WizardDescriptor.Panel[] panels; diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/NewCaseWizardPanel1.java b/Core/src/org/sleuthkit/autopsy/casemodule/NewCaseWizardPanel1.java index 52be7a1a7d..062aa7f804 100644 --- a/Core/src/org/sleuthkit/autopsy/casemodule/NewCaseWizardPanel1.java +++ b/Core/src/org/sleuthkit/autopsy/casemodule/NewCaseWizardPanel1.java @@ -40,7 +40,7 @@ import org.sleuthkit.autopsy.coreutils.ModuleSettings; * data of wizard step. It defers creation and initialization of UI component of * wizard panel into getComponent() method. */ -class NewCaseWizardPanel1 implements WizardDescriptor.ValidatingPanel { +public class NewCaseWizardPanel1 implements WizardDescriptor.ValidatingPanel { /** * The visual component that displays this panel. If you need to access the diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/NewCaseWizardPanel2.java b/Core/src/org/sleuthkit/autopsy/casemodule/NewCaseWizardPanel2.java index 7efdc4c8d5..8821a896f5 100644 --- a/Core/src/org/sleuthkit/autopsy/casemodule/NewCaseWizardPanel2.java +++ b/Core/src/org/sleuthkit/autopsy/casemodule/NewCaseWizardPanel2.java @@ -37,7 +37,7 @@ import org.openide.util.HelpCtx; * * @author jantonius */ -class NewCaseWizardPanel2 implements WizardDescriptor.ValidatingPanel { +public class NewCaseWizardPanel2 implements WizardDescriptor.ValidatingPanel { /** * The visual component that displays this panel. If you need to access the diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/OpenRecentCasePanel.java b/Core/src/org/sleuthkit/autopsy/casemodule/OpenRecentCasePanel.java index e7d5fc2b11..bbb8de86e6 100644 --- a/Core/src/org/sleuthkit/autopsy/casemodule/OpenRecentCasePanel.java +++ b/Core/src/org/sleuthkit/autopsy/casemodule/OpenRecentCasePanel.java @@ -34,7 +34,7 @@ import org.sleuthkit.autopsy.coreutils.Logger; * Panel show from the splash dialog that shows recent cases and allows them to * be opened. */ -class OpenRecentCasePanel extends javax.swing.JPanel { +public class OpenRecentCasePanel extends javax.swing.JPanel { static String[] caseNames; static String[] casePaths; diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/RecentCases.java b/Core/src/org/sleuthkit/autopsy/casemodule/RecentCases.java index 670b83144e..c12b2e22b9 100644 --- a/Core/src/org/sleuthkit/autopsy/casemodule/RecentCases.java +++ b/Core/src/org/sleuthkit/autopsy/casemodule/RecentCases.java @@ -43,7 +43,7 @@ import org.sleuthkit.autopsy.coreutils.Logger; * The constructor is called when the autopsy is running. * All the method to create and modify the properties file are within this class */ - final class RecentCases extends CallableSystemAction implements Presenter.Menu { + public final class RecentCases extends CallableSystemAction implements Presenter.Menu { static final int LENGTH = 5; static final String NAME_PROP_KEY = "LBL_RecentCase_Name"; diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/RecentItems.java b/Core/src/org/sleuthkit/autopsy/casemodule/RecentItems.java index d8f5fcaca7..5aba63d600 100644 --- a/Core/src/org/sleuthkit/autopsy/casemodule/RecentItems.java +++ b/Core/src/org/sleuthkit/autopsy/casemodule/RecentItems.java @@ -32,7 +32,7 @@ import org.sleuthkit.autopsy.coreutils.Logger; * This class is used to add the action to the recent case menu item. When the * the recent case menu is pressed, it should open that selected case. */ -class RecentItems implements ActionListener { +public class RecentItems implements ActionListener { String caseName; String casePath; diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/StartupWindowInterface.java b/Core/src/org/sleuthkit/autopsy/casemodule/StartupWindowInterface.java index 1c7e40f386..f5890fa409 100644 --- a/Core/src/org/sleuthkit/autopsy/casemodule/StartupWindowInterface.java +++ b/Core/src/org/sleuthkit/autopsy/casemodule/StartupWindowInterface.java @@ -21,7 +21,7 @@ package org.sleuthkit.autopsy.casemodule; /** * Interface for startup window implementations */ - interface StartupWindowInterface { + public interface StartupWindowInterface { /** * Shows and makes active the startup window diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/StartupWindowProvider.java b/Core/src/org/sleuthkit/autopsy/casemodule/StartupWindowProvider.java index 79b12a125e..7828765055 100644 --- a/Core/src/org/sleuthkit/autopsy/casemodule/StartupWindowProvider.java +++ b/Core/src/org/sleuthkit/autopsy/casemodule/StartupWindowProvider.java @@ -32,7 +32,7 @@ import org.sleuthkit.autopsy.coreutils.Logger; * is to implement StartupWindowInterface and register it with lookup as a ServiceProvider. * The custom startup window is automatically chosen over the default one, given it is the only external module custom startup window. */ - class StartupWindowProvider implements StartupWindowInterface { + public class StartupWindowProvider implements StartupWindowInterface { private static volatile StartupWindowProvider instance; private static final Logger logger = Logger.getLogger(StartupWindowProvider.class.getName()); diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/UpdateRecentCases.java b/Core/src/org/sleuthkit/autopsy/casemodule/UpdateRecentCases.java index 9667768397..a6712d0534 100644 --- a/Core/src/org/sleuthkit/autopsy/casemodule/UpdateRecentCases.java +++ b/Core/src/org/sleuthkit/autopsy/casemodule/UpdateRecentCases.java @@ -28,7 +28,7 @@ import org.openide.util.actions.SystemAction; /** * This class is used to change / update the list of recent cases dynamically. */ - class UpdateRecentCases extends JMenuItem implements DynamicMenuContent { + public class UpdateRecentCases extends JMenuItem implements DynamicMenuContent { int length; static boolean hasRecentCase = false; diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/XMLCaseManagement.java b/Core/src/org/sleuthkit/autopsy/casemodule/XMLCaseManagement.java index 45d8ac4784..a9076bfa1f 100644 --- a/Core/src/org/sleuthkit/autopsy/casemodule/XMLCaseManagement.java +++ b/Core/src/org/sleuthkit/autopsy/casemodule/XMLCaseManagement.java @@ -45,7 +45,7 @@ import org.xml.sax.SAXException; * * @author jantonius */ - class XMLCaseManagement implements CaseConfigFileInterface { + public class XMLCaseManagement implements CaseConfigFileInterface { final static String XSDFILE = "CaseSchema.xsd"; final static String TOP_ROOT_NAME = "AutopsyCase"; diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/AbstractDataResultViewer.java b/Core/src/org/sleuthkit/autopsy/corecomponents/AbstractDataResultViewer.java index ece4ce5565..74fe6af266 100644 --- a/Core/src/org/sleuthkit/autopsy/corecomponents/AbstractDataResultViewer.java +++ b/Core/src/org/sleuthkit/autopsy/corecomponents/AbstractDataResultViewer.java @@ -36,7 +36,7 @@ import org.sleuthkit.autopsy.coreutils.Logger; * Additionally, the ExplorerManager.Provider interface is implemented to * supply an ExplorerManager to derived classes and their child components. */ - abstract class AbstractDataResultViewer extends JPanel implements DataResultViewer, Provider { + public abstract class AbstractDataResultViewer extends JPanel implements DataResultViewer, Provider { private static final Logger logger = Logger.getLogger(AbstractDataResultViewer.class.getName()); protected transient ExplorerManager em; diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/CustomAboutAction.java b/Core/src/org/sleuthkit/autopsy/corecomponents/CustomAboutAction.java index 37d21e2748..c69feb15b7 100644 --- a/Core/src/org/sleuthkit/autopsy/corecomponents/CustomAboutAction.java +++ b/Core/src/org/sleuthkit/autopsy/corecomponents/CustomAboutAction.java @@ -28,7 +28,7 @@ import org.sleuthkit.autopsy.coreutils.Logger; /** * Action to open custom implementation of the "About" window from the Help menu. */ - class CustomAboutAction extends AboutAction { +public class CustomAboutAction extends AboutAction { @Override public void performAction() { diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/DataResultViewerTable.java b/Core/src/org/sleuthkit/autopsy/corecomponents/DataResultViewerTable.java index 5723151e53..6cde1ad2a2 100644 --- a/Core/src/org/sleuthkit/autopsy/corecomponents/DataResultViewerTable.java +++ b/Core/src/org/sleuthkit/autopsy/corecomponents/DataResultViewerTable.java @@ -55,7 +55,7 @@ import org.sleuthkit.autopsy.corecomponentinterfaces.DataResultViewer; // service provider when DataResultViewers can be made compatible with node // multiple selection actions. //@ServiceProvider(service = DataResultViewer.class) - class DataResultViewerTable extends AbstractDataResultViewer { + public class DataResultViewerTable extends AbstractDataResultViewer { private String firstColumnLabel = "Name"; private Set propertiesAcc = new LinkedHashSet<>(); diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/DataResultViewerThumbnail.java b/Core/src/org/sleuthkit/autopsy/corecomponents/DataResultViewerThumbnail.java index bdbe02a4f1..90b640e3ba 100644 --- a/Core/src/org/sleuthkit/autopsy/corecomponents/DataResultViewerThumbnail.java +++ b/Core/src/org/sleuthkit/autopsy/corecomponents/DataResultViewerThumbnail.java @@ -57,7 +57,7 @@ import org.sleuthkit.datamodel.TskCoreException; // service provider when DataResultViewers can be made compatible with node // multi-selection actions. //@ServiceProvider(service = DataResultViewer.class) - final class DataResultViewerThumbnail extends AbstractDataResultViewer { + public final class DataResultViewerThumbnail extends AbstractDataResultViewer { private static final Logger logger = Logger.getLogger(DataResultViewerThumbnail.class.getName()); //flag to keep track if images are being loaded diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/FrameCapture.java b/Core/src/org/sleuthkit/autopsy/corecomponents/FrameCapture.java index f416403114..0e817dc694 100644 --- a/Core/src/org/sleuthkit/autopsy/corecomponents/FrameCapture.java +++ b/Core/src/org/sleuthkit/autopsy/corecomponents/FrameCapture.java @@ -6,7 +6,7 @@ import java.util.List; /** * Interface used to capture frames from a video file. */ - interface FrameCapture { + public interface FrameCapture { /** * @param file the video file to use diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/GeneralPanel.java b/Core/src/org/sleuthkit/autopsy/corecomponents/GeneralPanel.java index 2b702bef4b..d223a58c40 100644 --- a/Core/src/org/sleuthkit/autopsy/corecomponents/GeneralPanel.java +++ b/Core/src/org/sleuthkit/autopsy/corecomponents/GeneralPanel.java @@ -21,7 +21,7 @@ package org.sleuthkit.autopsy.corecomponents; import java.util.prefs.Preferences; import org.openide.util.NbPreferences; -final class GeneralPanel extends javax.swing.JPanel { +public final class GeneralPanel extends javax.swing.JPanel { private final GeneralOptionsPanelController controller; private static final String KEEP_PREFERRED_VIEWER = "keepPreferredViewer"; diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/MediaViewImagePanel.java b/Core/src/org/sleuthkit/autopsy/corecomponents/MediaViewImagePanel.java index 596cf66657..e5acab4cb7 100644 --- a/Core/src/org/sleuthkit/autopsy/corecomponents/MediaViewImagePanel.java +++ b/Core/src/org/sleuthkit/autopsy/corecomponents/MediaViewImagePanel.java @@ -44,7 +44,7 @@ import org.sleuthkit.datamodel.ReadContentInputStream; * Container for the image viewer part of media view, on a layered pane. To be * used with JavaFx image viewer only. */ - class MediaViewImagePanel extends javax.swing.JPanel { + public class MediaViewImagePanel extends javax.swing.JPanel { private JFXPanel fxPanel; private ImageView fxImageView; diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/MediaViewVideoPanel.java b/Core/src/org/sleuthkit/autopsy/corecomponents/MediaViewVideoPanel.java index 3801f39199..7251777665 100644 --- a/Core/src/org/sleuthkit/autopsy/corecomponents/MediaViewVideoPanel.java +++ b/Core/src/org/sleuthkit/autopsy/corecomponents/MediaViewVideoPanel.java @@ -29,7 +29,7 @@ import org.sleuthkit.datamodel.AbstractFile; * Video viewer part of the Media View layered pane. * Uses different engines depending on platform. */ - abstract class MediaViewVideoPanel extends JPanel implements FrameCapture { + public abstract class MediaViewVideoPanel extends JPanel implements FrameCapture { private static final Logger logger = Logger.getLogger(MediaViewVideoPanel.class.getName()); diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/NoTabsTabDisplayerUI.java b/Core/src/org/sleuthkit/autopsy/corecomponents/NoTabsTabDisplayerUI.java index 67d114ecc6..5171b6a46d 100644 --- a/Core/src/org/sleuthkit/autopsy/corecomponents/NoTabsTabDisplayerUI.java +++ b/Core/src/org/sleuthkit/autopsy/corecomponents/NoTabsTabDisplayerUI.java @@ -33,7 +33,7 @@ import org.netbeans.swing.tabcontrol.TabDisplayerUI; * * @author dfickling */ - class NoTabsTabDisplayerUI extends TabDisplayerUI { + public class NoTabsTabDisplayerUI extends TabDisplayerUI { /** Creates a new instance of NoTabsTabDisplayerUI */ public NoTabsTabDisplayerUI(TabDisplayer displayer) { diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/ProductInformationPanel.java b/Core/src/org/sleuthkit/autopsy/corecomponents/ProductInformationPanel.java index e42bc9d65a..d4d37c6396 100644 --- a/Core/src/org/sleuthkit/autopsy/corecomponents/ProductInformationPanel.java +++ b/Core/src/org/sleuthkit/autopsy/corecomponents/ProductInformationPanel.java @@ -43,7 +43,7 @@ import org.sleuthkit.datamodel.SleuthkitJNI; /** * Custom "About" window panel. */ - class ProductInformationPanel extends JPanel implements HyperlinkListener { + public class ProductInformationPanel extends JPanel implements HyperlinkListener { private URL url = null; private Icon about; diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/TableFilterChildren.java b/Core/src/org/sleuthkit/autopsy/corecomponents/TableFilterChildren.java index dcc3a78846..d14ec5fd0a 100644 --- a/Core/src/org/sleuthkit/autopsy/corecomponents/TableFilterChildren.java +++ b/Core/src/org/sleuthkit/autopsy/corecomponents/TableFilterChildren.java @@ -25,7 +25,7 @@ import org.openide.nodes.Node; /** * Complementary class to TableFilterNode. */ -class TableFilterChildren extends FilterNode.Children { +public class TableFilterChildren extends FilterNode.Children { /** the constructor */ TableFilterChildren(Node arg) { diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/ThumbnailViewChildren.java b/Core/src/org/sleuthkit/autopsy/corecomponents/ThumbnailViewChildren.java index d8131ccbc6..8730126791 100644 --- a/Core/src/org/sleuthkit/autopsy/corecomponents/ThumbnailViewChildren.java +++ b/Core/src/org/sleuthkit/autopsy/corecomponents/ThumbnailViewChildren.java @@ -39,7 +39,7 @@ import org.sleuthkit.datamodel.Content; * Filter-node like class, but adds additional hierarchy (pages) as parents of * the filtered nodes. */ -class ThumbnailViewChildren extends Children.Keys { +public class ThumbnailViewChildren extends Children.Keys { static final int IMAGES_PER_PAGE = 200; private Node parent; diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/ThumbnailViewNode.java b/Core/src/org/sleuthkit/autopsy/corecomponents/ThumbnailViewNode.java index 4cdc1f128a..6b6bd003a2 100644 --- a/Core/src/org/sleuthkit/autopsy/corecomponents/ThumbnailViewNode.java +++ b/Core/src/org/sleuthkit/autopsy/corecomponents/ThumbnailViewNode.java @@ -29,7 +29,7 @@ import org.sleuthkit.datamodel.Content; * Node that wraps around original node and adds the bitmap icon representing * the picture */ -class ThumbnailViewNode extends FilterNode { +public class ThumbnailViewNode extends FilterNode { private SoftReference iconCache = null; private int iconSize = ImageUtils.ICON_SIZE_MEDIUM; diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/VideoFrame.java b/Core/src/org/sleuthkit/autopsy/corecomponents/VideoFrame.java index ce4080fb2c..abc4fd7507 100644 --- a/Core/src/org/sleuthkit/autopsy/corecomponents/VideoFrame.java +++ b/Core/src/org/sleuthkit/autopsy/corecomponents/VideoFrame.java @@ -5,7 +5,7 @@ import java.awt.Image; /** * */ - class VideoFrame { + public class VideoFrame { private Image frame; private long timeMillis; diff --git a/Core/src/org/sleuthkit/autopsy/coreutils/LnkEnums.java b/Core/src/org/sleuthkit/autopsy/coreutils/LnkEnums.java index 5b35043057..8c074f4fdd 100644 --- a/Core/src/org/sleuthkit/autopsy/coreutils/LnkEnums.java +++ b/Core/src/org/sleuthkit/autopsy/coreutils/LnkEnums.java @@ -22,7 +22,7 @@ package org.sleuthkit.autopsy.coreutils; * * @author dick */ - class LnkEnums { + public class LnkEnums { private static final byte[] CDRIVES = new byte[] { (byte)0xe0, 0x4f, (byte)0xd0, 0x20, (byte)0xea, 0x3a, 0x69, 0x10, (byte)0xa2, (byte)0xd8, 0x08, 0x00, 0x2b, 0x30, 0x30, (byte)0x9d }; diff --git a/Core/src/org/sleuthkit/autopsy/coreutils/TestLogger.java b/Core/src/org/sleuthkit/autopsy/coreutils/TestLogger.java index e03ff9d05a..08942f3221 100644 --- a/Core/src/org/sleuthkit/autopsy/coreutils/TestLogger.java +++ b/Core/src/org/sleuthkit/autopsy/coreutils/TestLogger.java @@ -28,7 +28,7 @@ import java.util.logging.Level; /* * Toolbar button for testing logging. Not a normal part of application. */ - final class TestLogger implements ActionListener { +public final class TestLogger implements ActionListener { static final Logger logger = Logger.getLogger(TestLogger.class.getName()); Formatter fmt; diff --git a/Core/src/org/sleuthkit/autopsy/coreutils/TimestampingFormatter.java b/Core/src/org/sleuthkit/autopsy/coreutils/TimestampingFormatter.java index 77d2c269cd..54fe199106 100644 --- a/Core/src/org/sleuthkit/autopsy/coreutils/TimestampingFormatter.java +++ b/Core/src/org/sleuthkit/autopsy/coreutils/TimestampingFormatter.java @@ -30,7 +30,7 @@ import java.util.logging.LogRecord; * Formatter to wrap another formatter and prepend a timestampe to each formatted string * Not currently used. */ - class TimestampingFormatter extends Formatter { + public class TimestampingFormatter extends Formatter { Formatter original; DateFormat timestampFormat = DateFormat.getDateTimeInstance(DateFormat.LONG, DateFormat.LONG, Locale.US); diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/AbstractContentChildren.java b/Core/src/org/sleuthkit/autopsy/datamodel/AbstractContentChildren.java index 87494f2e1f..18ec09974a 100644 --- a/Core/src/org/sleuthkit/autopsy/datamodel/AbstractContentChildren.java +++ b/Core/src/org/sleuthkit/autopsy/datamodel/AbstractContentChildren.java @@ -38,7 +38,7 @@ import org.sleuthkit.datamodel.Volume; * Abstract subclass for ContentChildren and RootContentChildren implementations * that handles creating Nodes from Content objects. */ -abstract class AbstractContentChildren extends Keys { +public abstract class AbstractContentChildren extends Keys { private final CreateSleuthkitNodeVisitor createSleuthkitNodeVisitor = new CreateSleuthkitNodeVisitor(); private final CreateAutopsyNodeVisitor createAutopsyNodeVisitor = new CreateAutopsyNodeVisitor(); diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/ArtifactTypeChildren.java b/Core/src/org/sleuthkit/autopsy/datamodel/ArtifactTypeChildren.java index e5f81d1844..5084df3506 100644 --- a/Core/src/org/sleuthkit/autopsy/datamodel/ArtifactTypeChildren.java +++ b/Core/src/org/sleuthkit/autopsy/datamodel/ArtifactTypeChildren.java @@ -31,7 +31,7 @@ import org.sleuthkit.datamodel.TskException; * * @author dfickling */ -class ArtifactTypeChildren extends ChildFactory{ +public class ArtifactTypeChildren extends ChildFactory{ private SleuthkitCase skCase; private BlackboardArtifact.ARTIFACT_TYPE type; diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/AutopsyItemVisitor.java b/Core/src/org/sleuthkit/autopsy/datamodel/AutopsyItemVisitor.java index 3a53552739..ad88c8a486 100644 --- a/Core/src/org/sleuthkit/autopsy/datamodel/AutopsyItemVisitor.java +++ b/Core/src/org/sleuthkit/autopsy/datamodel/AutopsyItemVisitor.java @@ -22,7 +22,7 @@ package org.sleuthkit.autopsy.datamodel; * * @author dfickling */ - interface AutopsyItemVisitor { + public interface AutopsyItemVisitor { T visit(ExtractedContent ec); diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/AutopsyVisitableItem.java b/Core/src/org/sleuthkit/autopsy/datamodel/AutopsyVisitableItem.java index 90d35b307c..c2428f57c6 100644 --- a/Core/src/org/sleuthkit/autopsy/datamodel/AutopsyVisitableItem.java +++ b/Core/src/org/sleuthkit/autopsy/datamodel/AutopsyVisitableItem.java @@ -21,7 +21,7 @@ package org.sleuthkit.autopsy.datamodel; /** * Abstraction for certain top level items displayed in the GUI */ - interface AutopsyVisitableItem { + public interface AutopsyVisitableItem { /** * visitor pattern support diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/ContentChildren.java b/Core/src/org/sleuthkit/autopsy/datamodel/ContentChildren.java index bfcd35ad5c..55b74259a1 100644 --- a/Core/src/org/sleuthkit/autopsy/datamodel/ContentChildren.java +++ b/Core/src/org/sleuthkit/autopsy/datamodel/ContentChildren.java @@ -28,7 +28,7 @@ import org.sleuthkit.datamodel.Content; * Class for Children of all ContentNodes. Handles creating child ContentNodes. * TODO consider a ContentChildren child factory */ -class ContentChildren extends AbstractContentChildren { +public class ContentChildren extends AbstractContentChildren { private static final Logger logger = Logger.getLogger(ContentChildren.class.getName()); //private static final int MAX_CHILD_COUNT = 1000000; diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/ContentHierarchyVisitor.java b/Core/src/org/sleuthkit/autopsy/datamodel/ContentHierarchyVisitor.java index f6ebcc78c9..0225a51864 100644 --- a/Core/src/org/sleuthkit/autopsy/datamodel/ContentHierarchyVisitor.java +++ b/Core/src/org/sleuthkit/autopsy/datamodel/ContentHierarchyVisitor.java @@ -38,7 +38,7 @@ import org.sleuthkit.datamodel.VolumeSystem; * past subclasses that aren't part of the exposed hierarchy (VolumeSystem, * FileSystem, and root Directories) */ - class ContentHierarchyVisitor extends ContentVisitor.Default> { + public class ContentHierarchyVisitor extends ContentVisitor.Default> { private static final Logger logger = Logger.getLogger(ContentHierarchyVisitor.class.getName()); private static final ContentHierarchyVisitor INSTANCE = new ContentHierarchyVisitor(); diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/ContentIdHierarchyVisitor.java b/Core/src/org/sleuthkit/autopsy/datamodel/ContentIdHierarchyVisitor.java index dbce27c925..72ded24b36 100644 --- a/Core/src/org/sleuthkit/autopsy/datamodel/ContentIdHierarchyVisitor.java +++ b/Core/src/org/sleuthkit/autopsy/datamodel/ContentIdHierarchyVisitor.java @@ -38,7 +38,7 @@ import org.sleuthkit.datamodel.VolumeSystem; * past subclasses that aren't part of the exposed hierarchy (VolumeSystem, * FileSystem, and root Directories) */ - class ContentIdHierarchyVisitor extends ContentVisitor.Default> { +public class ContentIdHierarchyVisitor extends ContentVisitor.Default> { private static final Logger logger = Logger.getLogger(ContentHierarchyVisitor.class.getName()); private static final ContentIdHierarchyVisitor INSTANCE = new ContentIdHierarchyVisitor(); diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/ContentNode.java b/Core/src/org/sleuthkit/autopsy/datamodel/ContentNode.java index 89b7876015..8a1b8ad77f 100644 --- a/Core/src/org/sleuthkit/autopsy/datamodel/ContentNode.java +++ b/Core/src/org/sleuthkit/autopsy/datamodel/ContentNode.java @@ -26,7 +26,7 @@ import org.openide.util.Lookup; * Provides basic information such as ID, parent ID, etc. */ - abstract class ContentNode extends DisplayableItemNode{ + public abstract class ContentNode extends DisplayableItemNode{ public ContentNode(Children children) { super(children); diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/ContentNodeVisitor.java b/Core/src/org/sleuthkit/autopsy/datamodel/ContentNodeVisitor.java index 4fd9d12c54..7685f0cdc5 100644 --- a/Core/src/org/sleuthkit/autopsy/datamodel/ContentNodeVisitor.java +++ b/Core/src/org/sleuthkit/autopsy/datamodel/ContentNodeVisitor.java @@ -22,7 +22,7 @@ package org.sleuthkit.autopsy.datamodel; * Interface for visitor pattern on ContentNodes * @param visit method return type */ - interface ContentNodeVisitor { +public interface ContentNodeVisitor { T visit(DirectoryNode dn); diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/ContentTagNode.java b/Core/src/org/sleuthkit/autopsy/datamodel/ContentTagNode.java index 5749b53aa3..4023c703e7 100755 --- a/Core/src/org/sleuthkit/autopsy/datamodel/ContentTagNode.java +++ b/Core/src/org/sleuthkit/autopsy/datamodel/ContentTagNode.java @@ -36,7 +36,7 @@ import org.sleuthkit.datamodel.TskCoreException; * consisting of content and blackboard artifact tags, grouped first by tag * type, then by tag name. */ - class ContentTagNode extends DisplayableItemNode { + public class ContentTagNode extends DisplayableItemNode { private static final String ICON_PATH = "org/sleuthkit/autopsy/images/blue-tag-icon-16.png"; private final ContentTag tag; diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/ExtractedContent.java b/Core/src/org/sleuthkit/autopsy/datamodel/ExtractedContent.java index 394eb2228e..81bc791adf 100644 --- a/Core/src/org/sleuthkit/autopsy/datamodel/ExtractedContent.java +++ b/Core/src/org/sleuthkit/autopsy/datamodel/ExtractedContent.java @@ -24,7 +24,7 @@ import org.sleuthkit.datamodel.SleuthkitCase; * Parent of the "extracted content" artifacts to be displayed in the tree. Other * artifacts are displayed under other more specific parents. */ - class ExtractedContent implements AutopsyVisitableItem{ +public class ExtractedContent implements AutopsyVisitableItem{ SleuthkitCase skCase; diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/ExtractedContentChildren.java b/Core/src/org/sleuthkit/autopsy/datamodel/ExtractedContentChildren.java index d5d92183b2..41ae98a2d0 100644 --- a/Core/src/org/sleuthkit/autopsy/datamodel/ExtractedContentChildren.java +++ b/Core/src/org/sleuthkit/autopsy/datamodel/ExtractedContentChildren.java @@ -37,7 +37,7 @@ import org.sleuthkit.datamodel.TskCoreException; * has all of the blackboard artifacts that are not displayed in a more specific form elsewhere * in the tree. */ -class ExtractedContentChildren extends ChildFactory { +public class ExtractedContentChildren extends ChildFactory { private SleuthkitCase skCase; private final ArrayList doNotShow; diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/FileTypeChildren.java b/Core/src/org/sleuthkit/autopsy/datamodel/FileTypeChildren.java index 3376e9f0d9..2c3b0d4731 100644 --- a/Core/src/org/sleuthkit/autopsy/datamodel/FileTypeChildren.java +++ b/Core/src/org/sleuthkit/autopsy/datamodel/FileTypeChildren.java @@ -40,7 +40,7 @@ import org.sleuthkit.datamodel.TskData; /** * Children factory for a specific file type - does the database query. */ -class FileTypeChildren extends ChildFactory { +public class FileTypeChildren extends ChildFactory { private SleuthkitCase skCase; private FileTypeExtensionFilters.SearchFilterInterface filter; diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/FileTypeExtensionFilters.java b/Core/src/org/sleuthkit/autopsy/datamodel/FileTypeExtensionFilters.java index b90a257419..c5373ce415 100644 --- a/Core/src/org/sleuthkit/autopsy/datamodel/FileTypeExtensionFilters.java +++ b/Core/src/org/sleuthkit/autopsy/datamodel/FileTypeExtensionFilters.java @@ -25,7 +25,7 @@ import org.sleuthkit.datamodel.SleuthkitCase; /** * Filters database results by file extension. */ - class FileTypeExtensionFilters implements AutopsyVisitableItem { + public class FileTypeExtensionFilters implements AutopsyVisitableItem { private SleuthkitCase skCase; diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/FileTypeExtensions.java b/Core/src/org/sleuthkit/autopsy/datamodel/FileTypeExtensions.java index f24272ef01..0b067a4678 100644 --- a/Core/src/org/sleuthkit/autopsy/datamodel/FileTypeExtensions.java +++ b/Core/src/org/sleuthkit/autopsy/datamodel/FileTypeExtensions.java @@ -25,7 +25,7 @@ import java.util.List; * Contains Lists of commonly known and used file type extensions * and 'getters' to obtain them. */ - class FileTypeExtensions { +public class FileTypeExtensions { private final static List IMAGE_EXTENSIONS = Arrays.asList(".jpg", ".jpeg", ".png", ".psd", ".nef", ".tiff", ".bmp"); private final static List VIDEO_EXTENSIONS = Arrays.asList(".aaf", ".3gp", ".asf", ".avi", ".m1v", ".m2v", ".m4v", ".mp4", ".mov", ".mpeg", ".mpg", ".mpe", ".mp4", ".rm", ".wmv", ".mpv", ".flv", ".swf"); diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/FileTypesChildren.java b/Core/src/org/sleuthkit/autopsy/datamodel/FileTypesChildren.java index e55124bebc..6cef6c94a5 100644 --- a/Core/src/org/sleuthkit/autopsy/datamodel/FileTypesChildren.java +++ b/Core/src/org/sleuthkit/autopsy/datamodel/FileTypesChildren.java @@ -28,7 +28,7 @@ import org.sleuthkit.datamodel.SleuthkitCase; /** * */ -class FileTypesChildren extends ChildFactory { +public class FileTypesChildren extends ChildFactory { private SleuthkitCase skCase; private FileTypeExtensionFilters.RootFilter filter; diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/RecentFiles.java b/Core/src/org/sleuthkit/autopsy/datamodel/RecentFiles.java index 2745951574..258e20925b 100644 --- a/Core/src/org/sleuthkit/autopsy/datamodel/RecentFiles.java +++ b/Core/src/org/sleuthkit/autopsy/datamodel/RecentFiles.java @@ -23,7 +23,7 @@ import org.sleuthkit.datamodel.SleuthkitCase; /** * Recent files node support */ - class RecentFiles implements AutopsyVisitableItem { + public class RecentFiles implements AutopsyVisitableItem { SleuthkitCase skCase; diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/RecentFilesChildren.java b/Core/src/org/sleuthkit/autopsy/datamodel/RecentFilesChildren.java index b2247873df..f5aa7eef77 100644 --- a/Core/src/org/sleuthkit/autopsy/datamodel/RecentFilesChildren.java +++ b/Core/src/org/sleuthkit/autopsy/datamodel/RecentFilesChildren.java @@ -34,7 +34,7 @@ import org.sleuthkit.datamodel.SleuthkitCase; * * @author dfickling */ - class RecentFilesChildren extends ChildFactory { + public class RecentFilesChildren extends ChildFactory { private SleuthkitCase skCase; private Calendar lastDay; diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/RecentFilesFilterChildren.java b/Core/src/org/sleuthkit/autopsy/datamodel/RecentFilesFilterChildren.java index 374fe54db2..f284a00bd7 100644 --- a/Core/src/org/sleuthkit/autopsy/datamodel/RecentFilesFilterChildren.java +++ b/Core/src/org/sleuthkit/autopsy/datamodel/RecentFilesFilterChildren.java @@ -42,7 +42,7 @@ import org.sleuthkit.datamodel.TskData; * * @author dfickling */ - class RecentFilesFilterChildren extends ChildFactory { + public class RecentFilesFilterChildren extends ChildFactory { private SleuthkitCase skCase; private RecentFilesFilter filter; diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/TagsNodeKey.java b/Core/src/org/sleuthkit/autopsy/datamodel/TagsNodeKey.java index dad36cfa34..e037798e4f 100755 --- a/Core/src/org/sleuthkit/autopsy/datamodel/TagsNodeKey.java +++ b/Core/src/org/sleuthkit/autopsy/datamodel/TagsNodeKey.java @@ -23,7 +23,7 @@ package org.sleuthkit.autopsy.datamodel; * RootContentChildren class. RootContentChildren is a NetBeans child node * factory built on top of the NetBeans Children.Keys class. */ - class TagsNodeKey implements AutopsyVisitableItem { + public class TagsNodeKey implements AutopsyVisitableItem { // Creation of a TagsNode object corresponding to a TagsNodeKey object is done // by a CreateAutopsyNodeVisitor dispatched from the AbstractContentChildren // override of Children.Keys.createNodes(). diff --git a/Core/src/org/sleuthkit/autopsy/directorytree/ChangeViewAction.java b/Core/src/org/sleuthkit/autopsy/directorytree/ChangeViewAction.java index 1c6c42ce58..6bf3075f19 100644 --- a/Core/src/org/sleuthkit/autopsy/directorytree/ChangeViewAction.java +++ b/Core/src/org/sleuthkit/autopsy/directorytree/ChangeViewAction.java @@ -34,7 +34,7 @@ import org.sleuthkit.autopsy.coreutils.Logger; * * @author jantonius */ - class ChangeViewAction extends AbstractAction implements Presenter.Popup { + public class ChangeViewAction extends AbstractAction implements Presenter.Popup { private int type; // type 1 = hex view, 2 = string view private Node node; diff --git a/Core/src/org/sleuthkit/autopsy/directorytree/CollapseAction.java b/Core/src/org/sleuthkit/autopsy/directorytree/CollapseAction.java index 9d27a8a20d..719939e741 100644 --- a/Core/src/org/sleuthkit/autopsy/directorytree/CollapseAction.java +++ b/Core/src/org/sleuthkit/autopsy/directorytree/CollapseAction.java @@ -30,7 +30,7 @@ import org.sleuthkit.autopsy.coreutils.Logger; * * @author jantonius */ -class CollapseAction extends AbstractAction { +public class CollapseAction extends AbstractAction { CollapseAction(String title) { super(title); diff --git a/Core/src/org/sleuthkit/autopsy/directorytree/DataResultFilterChildren.java b/Core/src/org/sleuthkit/autopsy/directorytree/DataResultFilterChildren.java index 2dfa1380dc..cd148c9e9f 100644 --- a/Core/src/org/sleuthkit/autopsy/directorytree/DataResultFilterChildren.java +++ b/Core/src/org/sleuthkit/autopsy/directorytree/DataResultFilterChildren.java @@ -27,7 +27,7 @@ import org.openide.nodes.Node; * DataResultFilterNode that created in the DataResultFilterNode.java. * */ - class DataResultFilterChildren extends FilterNode.Children { + public class DataResultFilterChildren extends FilterNode.Children { ExplorerManager sourceEm; diff --git a/Core/src/org/sleuthkit/autopsy/directorytree/DirectoryTreeFilterChildren.java b/Core/src/org/sleuthkit/autopsy/directorytree/DirectoryTreeFilterChildren.java index 753ae4a691..1ae930f121 100644 --- a/Core/src/org/sleuthkit/autopsy/directorytree/DirectoryTreeFilterChildren.java +++ b/Core/src/org/sleuthkit/autopsy/directorytree/DirectoryTreeFilterChildren.java @@ -47,7 +47,7 @@ import org.sleuthkit.datamodel.Volume; * hides files, '..', and other children that should not be displayed. facility * to customize nodes view in dir tree: hide them or set no children */ -class DirectoryTreeFilterChildren extends FilterNode.Children { +public class DirectoryTreeFilterChildren extends FilterNode.Children { private final ShowItemVisitor showItemV = new ShowItemVisitor(); private final IsLeafItemVisitor isLeafItemV = new IsLeafItemVisitor(); diff --git a/Core/src/org/sleuthkit/autopsy/directorytree/DirectoryTreeFilterNode.java b/Core/src/org/sleuthkit/autopsy/directorytree/DirectoryTreeFilterNode.java index cd3322fd81..c952f01489 100755 --- a/Core/src/org/sleuthkit/autopsy/directorytree/DirectoryTreeFilterNode.java +++ b/Core/src/org/sleuthkit/autopsy/directorytree/DirectoryTreeFilterNode.java @@ -44,7 +44,7 @@ import org.sleuthkit.datamodel.TskCoreException; * the children filter so that files and such are hidden from the tree. * */ -class DirectoryTreeFilterNode extends FilterNode { +public class DirectoryTreeFilterNode extends FilterNode { private static final Action collapseAll = new CollapseAction("Collapse All"); private static final Logger logger = Logger.getLogger(DirectoryTreeFilterNode.class.getName()); diff --git a/Core/src/org/sleuthkit/autopsy/directorytree/ExtractUnallocAction.java b/Core/src/org/sleuthkit/autopsy/directorytree/ExtractUnallocAction.java index 5469db6581..22d18eb03d 100644 --- a/Core/src/org/sleuthkit/autopsy/directorytree/ExtractUnallocAction.java +++ b/Core/src/org/sleuthkit/autopsy/directorytree/ExtractUnallocAction.java @@ -55,7 +55,7 @@ import org.sleuthkit.datamodel.VolumeSystem; /** * Extracts all the unallocated space as a single file */ - final class ExtractUnallocAction extends AbstractAction { + public final class ExtractUnallocAction extends AbstractAction { private final List LstUnallocs = new ArrayList(); private static final List lockedVols = new ArrayList(); diff --git a/Core/src/org/sleuthkit/autopsy/directorytree/FileSystemDetailsPanel.java b/Core/src/org/sleuthkit/autopsy/directorytree/FileSystemDetailsPanel.java index 9363d7f7b5..f5d4edc9ef 100644 --- a/Core/src/org/sleuthkit/autopsy/directorytree/FileSystemDetailsPanel.java +++ b/Core/src/org/sleuthkit/autopsy/directorytree/FileSystemDetailsPanel.java @@ -25,7 +25,7 @@ import java.awt.event.ActionListener; * * @author jantonius */ - class FileSystemDetailsPanel extends javax.swing.JPanel { +public class FileSystemDetailsPanel extends javax.swing.JPanel { /** Creates new form FileSystemDetailsPanel */ FileSystemDetailsPanel() { diff --git a/Core/src/org/sleuthkit/autopsy/directorytree/ImageDetailsPanel.form b/Core/src/org/sleuthkit/autopsy/directorytree/ImageDetailsPanel.form index a9508bc56e..a007c9b657 100644 --- a/Core/src/org/sleuthkit/autopsy/directorytree/ImageDetailsPanel.form +++ b/Core/src/org/sleuthkit/autopsy/directorytree/ImageDetailsPanel.form @@ -21,29 +21,32 @@ - + - - - - - + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - @@ -73,10 +76,7 @@ - - - - + diff --git a/Core/src/org/sleuthkit/autopsy/directorytree/ImageDetailsPanel.java b/Core/src/org/sleuthkit/autopsy/directorytree/ImageDetailsPanel.java index 07241253e6..93361fa4bf 100644 --- a/Core/src/org/sleuthkit/autopsy/directorytree/ImageDetailsPanel.java +++ b/Core/src/org/sleuthkit/autopsy/directorytree/ImageDetailsPanel.java @@ -31,7 +31,7 @@ import java.awt.event.ActionListener; * * @author jantonius */ -class ImageDetailsPanel extends javax.swing.JPanel { +public class ImageDetailsPanel extends javax.swing.JPanel { /** Creates new form ImageDetailsPanel */ ImageDetailsPanel() { diff --git a/Core/src/org/sleuthkit/autopsy/directorytree/ResultDeleteAction.java b/Core/src/org/sleuthkit/autopsy/directorytree/ResultDeleteAction.java index 05ff64d947..4fdbbff34f 100644 --- a/Core/src/org/sleuthkit/autopsy/directorytree/ResultDeleteAction.java +++ b/Core/src/org/sleuthkit/autopsy/directorytree/ResultDeleteAction.java @@ -36,7 +36,7 @@ import org.sleuthkit.datamodel.SleuthkitCase; * @deprecated do not use, it is here in case we ever pick up on this work */ @Deprecated - class ResultDeleteAction extends AbstractAction { + public class ResultDeleteAction extends AbstractAction { private enum ActionType { diff --git a/Core/src/org/sleuthkit/autopsy/directorytree/ViewAssociatedContentAction.java b/Core/src/org/sleuthkit/autopsy/directorytree/ViewAssociatedContentAction.java index aefde11f20..0db3672d27 100644 --- a/Core/src/org/sleuthkit/autopsy/directorytree/ViewAssociatedContentAction.java +++ b/Core/src/org/sleuthkit/autopsy/directorytree/ViewAssociatedContentAction.java @@ -28,7 +28,7 @@ import org.sleuthkit.datamodel.Content; /** * View the content associated with the given BlackboardArtifactNode */ -class ViewAssociatedContentAction extends AbstractAction { +public class ViewAssociatedContentAction extends AbstractAction { private Content content; diff --git a/Core/src/org/sleuthkit/autopsy/directorytree/VolumeDetailsPanel.form b/Core/src/org/sleuthkit/autopsy/directorytree/VolumeDetailsPanel.form index 5c73074beb..b6ce798205 100644 --- a/Core/src/org/sleuthkit/autopsy/directorytree/VolumeDetailsPanel.form +++ b/Core/src/org/sleuthkit/autopsy/directorytree/VolumeDetailsPanel.form @@ -1,4 +1,4 @@ - + diff --git a/Core/src/org/sleuthkit/autopsy/directorytree/VolumeDetailsPanel.java b/Core/src/org/sleuthkit/autopsy/directorytree/VolumeDetailsPanel.java index 3a4aa9660f..69f741b584 100644 --- a/Core/src/org/sleuthkit/autopsy/directorytree/VolumeDetailsPanel.java +++ b/Core/src/org/sleuthkit/autopsy/directorytree/VolumeDetailsPanel.java @@ -25,7 +25,7 @@ import java.awt.event.ActionListener; /** * This is the form / panel to show the Volume Details. */ -class VolumeDetailsPanel extends javax.swing.JPanel { +public class VolumeDetailsPanel extends javax.swing.JPanel { /** Creates new form VolumeDetailPanel */ VolumeDetailsPanel() { diff --git a/Core/src/org/sleuthkit/autopsy/examples/SampleDataSourceIngestModule.java b/Core/src/org/sleuthkit/autopsy/examples/SampleDataSourceIngestModule.java index da4a7b99b7..df2a6489dd 100755 --- a/Core/src/org/sleuthkit/autopsy/examples/SampleDataSourceIngestModule.java +++ b/Core/src/org/sleuthkit/autopsy/examples/SampleDataSourceIngestModule.java @@ -50,7 +50,7 @@ import org.sleuthkit.datamodel.TskCoreException; * Sample DataSource-level ingest module that doesn't do much at all. * Just exists to show basic idea of these modules */ - class SampleDataSourceIngestModule extends org.sleuthkit.autopsy.ingest.IngestModuleDataSource { + public class SampleDataSourceIngestModule extends org.sleuthkit.autopsy.ingest.IngestModuleDataSource { /* Data Source modules operate on a disk or set of logical files. They * are passed in teh data source refernce and query it for things they want. diff --git a/Core/src/org/sleuthkit/autopsy/examples/SampleFileIngestModule.java b/Core/src/org/sleuthkit/autopsy/examples/SampleFileIngestModule.java index 464c79888c..4b65ee05a4 100755 --- a/Core/src/org/sleuthkit/autopsy/examples/SampleFileIngestModule.java +++ b/Core/src/org/sleuthkit/autopsy/examples/SampleFileIngestModule.java @@ -53,7 +53,7 @@ import org.sleuthkit.datamodel.TskData; * IngestModuleLoader will not load things from the org.sleuthkit.autopsy.examples package. * Either change the package or the loading code to make this module actually run. */ - class SampleFileIngestModule extends org.sleuthkit.autopsy.ingest.IngestModuleAbstractFile { + public class SampleFileIngestModule extends org.sleuthkit.autopsy.ingest.IngestModuleAbstractFile { private int attrId = -1; private static SampleFileIngestModule defaultInstance = null; diff --git a/Core/src/org/sleuthkit/autopsy/ingest/GetFilesContentVisitor.java b/Core/src/org/sleuthkit/autopsy/ingest/GetFilesContentVisitor.java index 65290a5b3c..004e3db640 100644 --- a/Core/src/org/sleuthkit/autopsy/ingest/GetFilesContentVisitor.java +++ b/Core/src/org/sleuthkit/autopsy/ingest/GetFilesContentVisitor.java @@ -39,7 +39,7 @@ import org.sleuthkit.datamodel.LayoutFile; * Abstract visitor for getting all the files from content * TODO should be moved to utility module (needs resolve cyclic deps) */ - abstract class GetFilesContentVisitor implements ContentVisitor> { + public abstract class GetFilesContentVisitor implements ContentVisitor> { private static final Logger logger = Logger.getLogger(GetFilesContentVisitor.class.getName()); diff --git a/Core/src/org/sleuthkit/autopsy/ingest/IngestDataSourceThread.java b/Core/src/org/sleuthkit/autopsy/ingest/IngestDataSourceThread.java index 85f62f8785..3e3092249c 100644 --- a/Core/src/org/sleuthkit/autopsy/ingest/IngestDataSourceThread.java +++ b/Core/src/org/sleuthkit/autopsy/ingest/IngestDataSourceThread.java @@ -37,7 +37,7 @@ import org.sleuthkit.datamodel.Content; * Worker thread that runs a data source-level ingest module (image, file set virt dir, etc). * Used to process only a single data-source and single module. */ - class IngestDataSourceThread extends SwingWorker { + public class IngestDataSourceThread extends SwingWorker { private final Logger logger = Logger.getLogger(IngestDataSourceThread.class.getName()); private ProgressHandle progress; diff --git a/Core/src/org/sleuthkit/autopsy/ingest/IngestDialogPanel.java b/Core/src/org/sleuthkit/autopsy/ingest/IngestDialogPanel.java index ff6ef874e9..a35fa8e76c 100644 --- a/Core/src/org/sleuthkit/autopsy/ingest/IngestDialogPanel.java +++ b/Core/src/org/sleuthkit/autopsy/ingest/IngestDialogPanel.java @@ -40,7 +40,7 @@ import org.sleuthkit.autopsy.coreutils.ModuleSettings; /** * main configuration panel for all ingest modules, reusable JPanel component */ - class IngestDialogPanel extends javax.swing.JPanel { + public class IngestDialogPanel extends javax.swing.JPanel { private IngestModuleAbstract currentModule; private ModulesTableModel tableModel; diff --git a/Core/src/org/sleuthkit/autopsy/ingest/IngestMessageDetailsPanel.java b/Core/src/org/sleuthkit/autopsy/ingest/IngestMessageDetailsPanel.java index 37a97ae2d1..997a450005 100644 --- a/Core/src/org/sleuthkit/autopsy/ingest/IngestMessageDetailsPanel.java +++ b/Core/src/org/sleuthkit/autopsy/ingest/IngestMessageDetailsPanel.java @@ -38,7 +38,7 @@ import org.sleuthkit.datamodel.TskException; /** * Details panel within IngestMessagePanel */ -class IngestMessageDetailsPanel extends javax.swing.JPanel { +public class IngestMessageDetailsPanel extends javax.swing.JPanel { private IngestMessageMainPanel mainPanel; diff --git a/Core/src/org/sleuthkit/autopsy/ingest/IngestMessageMainPanel.java b/Core/src/org/sleuthkit/autopsy/ingest/IngestMessageMainPanel.java index 5e0bf81fec..f950c9f807 100644 --- a/Core/src/org/sleuthkit/autopsy/ingest/IngestMessageMainPanel.java +++ b/Core/src/org/sleuthkit/autopsy/ingest/IngestMessageMainPanel.java @@ -25,7 +25,7 @@ import org.sleuthkit.autopsy.coreutils.Logger; * the main layered pane container for messages table (IngestMessagePanel) and * details view (IngestMessageDetailsPanel) */ - class IngestMessageMainPanel extends javax.swing.JPanel { +public class IngestMessageMainPanel extends javax.swing.JPanel { private IngestMessagePanel messagePanel; private IngestMessageDetailsPanel detailsPanel; diff --git a/Core/src/org/sleuthkit/autopsy/ingest/IngestMessagePanel.java b/Core/src/org/sleuthkit/autopsy/ingest/IngestMessagePanel.java index 6d8cf6f1bc..3af6f77b59 100644 --- a/Core/src/org/sleuthkit/autopsy/ingest/IngestMessagePanel.java +++ b/Core/src/org/sleuthkit/autopsy/ingest/IngestMessagePanel.java @@ -56,7 +56,7 @@ import org.sleuthkit.datamodel.BlackboardArtifact; * Notification window showing messages from modules to user * */ -class IngestMessagePanel extends JPanel implements TableModelListener { +public class IngestMessagePanel extends JPanel implements TableModelListener { private MessageTableModel tableModel; private MessageTableRenderer renderer; diff --git a/Core/src/org/sleuthkit/autopsy/ingest/IngestMessageTopComponent.java b/Core/src/org/sleuthkit/autopsy/ingest/IngestMessageTopComponent.java index d4a9ab9cce..f45987a96d 100644 --- a/Core/src/org/sleuthkit/autopsy/ingest/IngestMessageTopComponent.java +++ b/Core/src/org/sleuthkit/autopsy/ingest/IngestMessageTopComponent.java @@ -44,7 +44,7 @@ import org.sleuthkit.datamodel.Content; /** * Top component which displays something. */ - final class IngestMessageTopComponent extends TopComponent implements IngestUI { +public final class IngestMessageTopComponent extends TopComponent implements IngestUI { private static IngestMessageTopComponent instance; private static final Logger logger = Logger.getLogger(IngestMessageTopComponent.class.getName()); diff --git a/Core/src/org/sleuthkit/autopsy/ingest/IngestMessagesAction.java b/Core/src/org/sleuthkit/autopsy/ingest/IngestMessagesAction.java index 11ed44cf7f..6625187030 100644 --- a/Core/src/org/sleuthkit/autopsy/ingest/IngestMessagesAction.java +++ b/Core/src/org/sleuthkit/autopsy/ingest/IngestMessagesAction.java @@ -31,7 +31,7 @@ import org.openide.util.actions.Presenter; // @ActionReference(path = "Toolbars/File", position = 575) //}) //@Messages("CTL_IngestMessagesAction=Messages") - final class IngestMessagesAction extends AbstractAction implements Presenter.Toolbar { + public final class IngestMessagesAction extends AbstractAction implements Presenter.Toolbar { @Override public void actionPerformed(ActionEvent e) { diff --git a/Core/src/org/sleuthkit/autopsy/ingest/IngestMessagesToolbar.java b/Core/src/org/sleuthkit/autopsy/ingest/IngestMessagesToolbar.java index f817383595..5d691f0360 100644 --- a/Core/src/org/sleuthkit/autopsy/ingest/IngestMessagesToolbar.java +++ b/Core/src/org/sleuthkit/autopsy/ingest/IngestMessagesToolbar.java @@ -34,7 +34,7 @@ import org.sleuthkit.autopsy.casemodule.Case; * Toolbar for Ingest * */ - class IngestMessagesToolbar extends javax.swing.JPanel { + public class IngestMessagesToolbar extends javax.swing.JPanel { private IngestMessagesButton ingestMessagesButton = new IngestMessagesButton(); private static volatile IngestMessagesToolbar instance; diff --git a/Core/src/org/sleuthkit/autopsy/ingest/IngestModuleAbstract.java b/Core/src/org/sleuthkit/autopsy/ingest/IngestModuleAbstract.java index 6bf6b36f57..c77c19bc29 100644 --- a/Core/src/org/sleuthkit/autopsy/ingest/IngestModuleAbstract.java +++ b/Core/src/org/sleuthkit/autopsy/ingest/IngestModuleAbstract.java @@ -23,7 +23,7 @@ package org.sleuthkit.autopsy.ingest; /** * Base interface for ingest modules */ - abstract class IngestModuleAbstract { + public abstract class IngestModuleAbstract { private String args; diff --git a/Core/src/org/sleuthkit/autopsy/ingest/IngestModuleLoader.java b/Core/src/org/sleuthkit/autopsy/ingest/IngestModuleLoader.java index b1cee5482e..7816325ef5 100644 --- a/Core/src/org/sleuthkit/autopsy/ingest/IngestModuleLoader.java +++ b/Core/src/org/sleuthkit/autopsy/ingest/IngestModuleLoader.java @@ -90,7 +90,7 @@ import org.w3c.dom.NodeList; * NOTE: this will be part of future IngestPipelineManager with IngestManager * code refactored */ - final class IngestModuleLoader { + public final class IngestModuleLoader { private static final String PIPELINE_CONFIG_XML = "pipeline_config.xml"; private static final String XSDFILE = "PipelineConfigSchema.xsd"; diff --git a/Core/src/org/sleuthkit/autopsy/ingest/IngestScheduler.java b/Core/src/org/sleuthkit/autopsy/ingest/IngestScheduler.java index 9b88c24047..7e51f1c882 100644 --- a/Core/src/org/sleuthkit/autopsy/ingest/IngestScheduler.java +++ b/Core/src/org/sleuthkit/autopsy/ingest/IngestScheduler.java @@ -59,7 +59,7 @@ import org.sleuthkit.datamodel.TskData.TSK_FS_META_TYPE_ENUM; * pipelines. * */ -class IngestScheduler { +public class IngestScheduler { private static IngestScheduler instance; private static final Logger logger = Logger.getLogger(IngestScheduler.class.getName()); private final DataSourceScheduler dataSourceScheduler = new DataSourceScheduler(); diff --git a/Core/src/org/sleuthkit/autopsy/ingest/IngestUI.java b/Core/src/org/sleuthkit/autopsy/ingest/IngestUI.java index e4984bf38e..9ac57e2d0e 100644 --- a/Core/src/org/sleuthkit/autopsy/ingest/IngestUI.java +++ b/Core/src/org/sleuthkit/autopsy/ingest/IngestUI.java @@ -24,7 +24,7 @@ import org.sleuthkit.datamodel.Content; /** * UI support for ingest */ - interface IngestUI { + public interface IngestUI { void displayMessage(final IngestMessage message); int getMessagesCount(); void clearMessages(); diff --git a/Core/src/org/sleuthkit/autopsy/ingest/ScheduledTask.java b/Core/src/org/sleuthkit/autopsy/ingest/ScheduledTask.java index e9975cd66c..ea07093f1b 100644 --- a/Core/src/org/sleuthkit/autopsy/ingest/ScheduledTask.java +++ b/Core/src/org/sleuthkit/autopsy/ingest/ScheduledTask.java @@ -28,7 +28,7 @@ import org.sleuthkit.datamodel.Content; * * @param T type of Ingest Module / Pipeline (file or data source content) associated with this task */ -class ScheduledTask { +public class ScheduledTask { private Content input; private List modules; diff --git a/Core/src/org/sleuthkit/autopsy/report/FileReportModule.java b/Core/src/org/sleuthkit/autopsy/report/FileReportModule.java index e69f4c0ac8..f63acdc168 100755 --- a/Core/src/org/sleuthkit/autopsy/report/FileReportModule.java +++ b/Core/src/org/sleuthkit/autopsy/report/FileReportModule.java @@ -26,7 +26,7 @@ import org.sleuthkit.datamodel.AbstractFile; * * @author jwallace */ - interface FileReportModule extends ReportModule { + public interface FileReportModule extends ReportModule { /** * Initialize the report which will be stored at the given path. * @param path diff --git a/Core/src/org/sleuthkit/autopsy/report/FileReportText.java b/Core/src/org/sleuthkit/autopsy/report/FileReportText.java index 7b10b9ac8a..750d730b0c 100755 --- a/Core/src/org/sleuthkit/autopsy/report/FileReportText.java +++ b/Core/src/org/sleuthkit/autopsy/report/FileReportText.java @@ -35,7 +35,7 @@ import org.sleuthkit.datamodel.AbstractFile; * * @author jwallace */ - class FileReportText implements FileReportModule { + public class FileReportText implements FileReportModule { private static final Logger logger = Logger.getLogger(FileReportText.class.getName()); private String reportPath; private Writer out; diff --git a/Core/src/org/sleuthkit/autopsy/report/GeneralReportModule.java b/Core/src/org/sleuthkit/autopsy/report/GeneralReportModule.java index 8baa4e5050..4914757b24 100644 --- a/Core/src/org/sleuthkit/autopsy/report/GeneralReportModule.java +++ b/Core/src/org/sleuthkit/autopsy/report/GeneralReportModule.java @@ -20,7 +20,7 @@ package org.sleuthkit.autopsy.report; import javax.swing.JPanel; - interface GeneralReportModule extends ReportModule { + public interface GeneralReportModule extends ReportModule { /** * Called to generate the report. Method is responsible for saving the file at the diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportBodyFile.java b/Core/src/org/sleuthkit/autopsy/report/ReportBodyFile.java index d31af46908..859479b26c 100644 --- a/Core/src/org/sleuthkit/autopsy/report/ReportBodyFile.java +++ b/Core/src/org/sleuthkit/autopsy/report/ReportBodyFile.java @@ -40,7 +40,7 @@ import org.sleuthkit.datamodel.*; * ReportBodyFile generates a report in the body file format specified on * The Sleuth Kit wiki as MD5|name|inode|mode_as_string|UID|GID|size|atime|mtime|ctime|crtime. */ - class ReportBodyFile implements GeneralReportModule { + public class ReportBodyFile implements GeneralReportModule { private static final Logger logger = Logger.getLogger(ReportBodyFile.class.getName()); private static ReportBodyFile instance = null; diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportBranding.java b/Core/src/org/sleuthkit/autopsy/report/ReportBranding.java index 173821542b..bc5937c799 100644 --- a/Core/src/org/sleuthkit/autopsy/report/ReportBranding.java +++ b/Core/src/org/sleuthkit/autopsy/report/ReportBranding.java @@ -37,7 +37,7 @@ import org.sleuthkit.autopsy.coreutils.PlatformUtil; * * Uses module settings property files to store customizations. */ - final class ReportBranding implements ReportBrandingProviderI { + public final class ReportBranding implements ReportBrandingProviderI { //property names private static final String GENERATOR_LOGO_PATH_PROP = "GeneratorLogoPath"; diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportBrandingProviderI.java b/Core/src/org/sleuthkit/autopsy/report/ReportBrandingProviderI.java index 3bdb762dd7..af4d40110a 100644 --- a/Core/src/org/sleuthkit/autopsy/report/ReportBrandingProviderI.java +++ b/Core/src/org/sleuthkit/autopsy/report/ReportBrandingProviderI.java @@ -21,7 +21,7 @@ package org.sleuthkit.autopsy.report; /** * Interface to implement by reports to add on custom branding, logos, etc */ - interface ReportBrandingProviderI { + public interface ReportBrandingProviderI { /** * Get the generator logo path on the local disk (previously set or default), diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportExcel.java b/Core/src/org/sleuthkit/autopsy/report/ReportExcel.java index 2f03a820a5..cfb1fa0b00 100644 --- a/Core/src/org/sleuthkit/autopsy/report/ReportExcel.java +++ b/Core/src/org/sleuthkit/autopsy/report/ReportExcel.java @@ -29,7 +29,7 @@ import org.apache.poi.xssf.usermodel.XSSFWorkbook; import org.sleuthkit.autopsy.casemodule.Case; import org.sleuthkit.autopsy.coreutils.Logger; - class ReportExcel implements TableReportModule { + public class ReportExcel implements TableReportModule { private static final Logger logger = Logger.getLogger(ReportExcel.class.getName()); private static ReportExcel instance; diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportGenerator.java b/Core/src/org/sleuthkit/autopsy/report/ReportGenerator.java index 3a5e96f247..d43b344b13 100644 --- a/Core/src/org/sleuthkit/autopsy/report/ReportGenerator.java +++ b/Core/src/org/sleuthkit/autopsy/report/ReportGenerator.java @@ -71,7 +71,7 @@ import org.sleuthkit.datamodel.TskException; * can be called to show report generation progress using ReportProgressPanel * objects displayed using a dialog box. */ - class ReportGenerator { +public class ReportGenerator { private static final Logger logger = Logger.getLogger(ReportGenerator.class.getName()); private Case currentCase = Case.getCurrentCase(); diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportHTML.java b/Core/src/org/sleuthkit/autopsy/report/ReportHTML.java index 33ee24b9d7..6d23a2f89a 100644 --- a/Core/src/org/sleuthkit/autopsy/report/ReportHTML.java +++ b/Core/src/org/sleuthkit/autopsy/report/ReportHTML.java @@ -58,7 +58,7 @@ import org.sleuthkit.datamodel.Content; import org.sleuthkit.datamodel.ContentTag; import org.sleuthkit.datamodel.TskData.TSK_DB_FILES_TYPE_ENUM; - class ReportHTML implements TableReportModule { + public class ReportHTML implements TableReportModule { private static final Logger logger = Logger.getLogger(ReportHTML.class.getName()); private static final String THUMBS_REL_PATH = "thumbs" + File.separator; private static ReportHTML instance; diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportModule.java b/Core/src/org/sleuthkit/autopsy/report/ReportModule.java index 615770bd69..2a3a677b29 100644 --- a/Core/src/org/sleuthkit/autopsy/report/ReportModule.java +++ b/Core/src/org/sleuthkit/autopsy/report/ReportModule.java @@ -25,7 +25,7 @@ package org.sleuthkit.autopsy.report; /** * Interface got report modules that plug in to the reporting infrastructure. */ - interface ReportModule { +public interface ReportModule { /** * Get the name of the report this module generates. diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportProgressPanel.java b/Core/src/org/sleuthkit/autopsy/report/ReportProgressPanel.java index 3432cc8773..95bd9967c8 100644 --- a/Core/src/org/sleuthkit/autopsy/report/ReportProgressPanel.java +++ b/Core/src/org/sleuthkit/autopsy/report/ReportProgressPanel.java @@ -27,7 +27,7 @@ import java.awt.event.MouseListener; import java.io.File; import java.io.IOException; - class ReportProgressPanel extends javax.swing.JPanel { + public class ReportProgressPanel extends javax.swing.JPanel { private ReportStatus STATUS; // Enum to represent if a report is waiting, diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportVisualPanel1.java b/Core/src/org/sleuthkit/autopsy/report/ReportVisualPanel1.java index fed27ec749..7f66eb536b 100644 --- a/Core/src/org/sleuthkit/autopsy/report/ReportVisualPanel1.java +++ b/Core/src/org/sleuthkit/autopsy/report/ReportVisualPanel1.java @@ -36,7 +36,7 @@ import javax.swing.event.ListSelectionListener; import org.openide.util.Lookup; import org.sleuthkit.autopsy.coreutils.Logger; - final class ReportVisualPanel1 extends JPanel implements ListSelectionListener { + public final class ReportVisualPanel1 extends JPanel implements ListSelectionListener { private static final Logger logger = Logger.getLogger(ReportVisualPanel1.class.getName()); private ReportWizardPanel1 wizPanel; private List modules = new ArrayList<>(); diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportVisualPanel2.java b/Core/src/org/sleuthkit/autopsy/report/ReportVisualPanel2.java index 67a2eb67ae..9c5c6a0136 100644 --- a/Core/src/org/sleuthkit/autopsy/report/ReportVisualPanel2.java +++ b/Core/src/org/sleuthkit/autopsy/report/ReportVisualPanel2.java @@ -43,7 +43,7 @@ import org.sleuthkit.datamodel.BlackboardArtifact.ARTIFACT_TYPE; import org.sleuthkit.datamodel.TagName; import org.sleuthkit.datamodel.TskCoreException; - final class ReportVisualPanel2 extends JPanel { + public final class ReportVisualPanel2 extends JPanel { private ReportWizardPanel2 wizPanel; private Map tagStates = new LinkedHashMap<>(); diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportWizardFileOptionsPanel.java b/Core/src/org/sleuthkit/autopsy/report/ReportWizardFileOptionsPanel.java index ad56a8dcc8..2e2b73c160 100755 --- a/Core/src/org/sleuthkit/autopsy/report/ReportWizardFileOptionsPanel.java +++ b/Core/src/org/sleuthkit/autopsy/report/ReportWizardFileOptionsPanel.java @@ -30,7 +30,7 @@ import org.openide.util.HelpCtx; * * @author jwallace */ - class ReportWizardFileOptionsPanel implements WizardDescriptor.FinishablePanel{ + public class ReportWizardFileOptionsPanel implements WizardDescriptor.FinishablePanel{ private WizardDescriptor wiz; private ReportWizardFileOptionsVisualPanel component; private JButton finishButton; diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportWizardFileOptionsVisualPanel.java b/Core/src/org/sleuthkit/autopsy/report/ReportWizardFileOptionsVisualPanel.java index 150905f125..1afb83cc06 100755 --- a/Core/src/org/sleuthkit/autopsy/report/ReportWizardFileOptionsVisualPanel.java +++ b/Core/src/org/sleuthkit/autopsy/report/ReportWizardFileOptionsVisualPanel.java @@ -37,7 +37,7 @@ import javax.swing.event.ListDataListener; * * @author jwallace */ -class ReportWizardFileOptionsVisualPanel extends javax.swing.JPanel { +public class ReportWizardFileOptionsVisualPanel extends javax.swing.JPanel { private List options; private Map optionStates = new EnumMap<>(FileReportDataTypes.class); private ListModel model; diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportWizardIterator.java b/Core/src/org/sleuthkit/autopsy/report/ReportWizardIterator.java index cfec65ba81..f2709a1b65 100644 --- a/Core/src/org/sleuthkit/autopsy/report/ReportWizardIterator.java +++ b/Core/src/org/sleuthkit/autopsy/report/ReportWizardIterator.java @@ -27,7 +27,7 @@ import javax.swing.event.ChangeListener; import org.openide.WizardDescriptor; import org.openide.util.NbPreferences; - final class ReportWizardIterator implements WizardDescriptor.Iterator { + public final class ReportWizardIterator implements WizardDescriptor.Iterator { private int index; private ReportWizardPanel1 firstPanel; diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportWizardPanel1.java b/Core/src/org/sleuthkit/autopsy/report/ReportWizardPanel1.java index 576bfbdd7d..20b135adf7 100644 --- a/Core/src/org/sleuthkit/autopsy/report/ReportWizardPanel1.java +++ b/Core/src/org/sleuthkit/autopsy/report/ReportWizardPanel1.java @@ -29,7 +29,7 @@ import org.openide.WizardDescriptor; import org.openide.util.HelpCtx; import org.openide.util.NbPreferences; - class ReportWizardPanel1 implements WizardDescriptor.FinishablePanel { + public class ReportWizardPanel1 implements WizardDescriptor.FinishablePanel { private WizardDescriptor wiz; private ReportVisualPanel1 component; private JButton nextButton; diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportWizardPanel2.java b/Core/src/org/sleuthkit/autopsy/report/ReportWizardPanel2.java index fec8e3c5a2..60ec9a0924 100644 --- a/Core/src/org/sleuthkit/autopsy/report/ReportWizardPanel2.java +++ b/Core/src/org/sleuthkit/autopsy/report/ReportWizardPanel2.java @@ -26,7 +26,7 @@ import org.openide.WizardDescriptor; import org.openide.util.HelpCtx; import org.openide.util.NbPreferences; - class ReportWizardPanel2 implements WizardDescriptor.Panel { + public class ReportWizardPanel2 implements WizardDescriptor.Panel { private ReportVisualPanel2 component; private JButton finishButton; private JButton nextButton; diff --git a/Core/src/org/sleuthkit/autopsy/report/TableReportModule.java b/Core/src/org/sleuthkit/autopsy/report/TableReportModule.java index 61e715f644..4a7bc9ac50 100644 --- a/Core/src/org/sleuthkit/autopsy/report/TableReportModule.java +++ b/Core/src/org/sleuthkit/autopsy/report/TableReportModule.java @@ -29,7 +29,7 @@ import java.util.List; * The data sent consists of user-chosen fields such as Blackboard Artifacts * and File/Result Tags. */ - interface TableReportModule extends ReportModule { +public interface TableReportModule extends ReportModule { /** * Start the report. Open any output streams, initialize member variables, diff --git a/branding/core/core.jar/org/netbeans/core/startup/Bundle.properties b/branding/core/core.jar/org/netbeans/core/startup/Bundle.properties index 13353e71a6..6678229856 100644 --- a/branding/core/core.jar/org/netbeans/core/startup/Bundle.properties +++ b/branding/core/core.jar/org/netbeans/core/startup/Bundle.properties @@ -1,5 +1,5 @@ #Updated by build script -#Wed, 22 Jan 2014 11:01:41 -0500 +#Wed, 22 Jan 2014 16:24:54 -0500 LBL_splash_window_title=Starting Autopsy SPLASH_HEIGHT=288 SPLASH_WIDTH=538 diff --git a/branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties b/branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties index bbd90839ed..816a8ce0c9 100644 --- a/branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties +++ b/branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties @@ -1,5 +1,5 @@ #Updated by build script -#Wed, 22 Jan 2014 11:01:41 -0500 +#Wed, 22 Jan 2014 16:24:54 -0500 CTL_MainWindow_Title=Autopsy 3.0.8 CTL_MainWindow_Title_No_Project=Autopsy 3.0.8 From 1685a38a92193bca9056357a7c4ef43c8a8f4e5d Mon Sep 17 00:00:00 2001 From: shahit2 Date: Wed, 22 Jan 2014 16:45:46 -0500 Subject: [PATCH 14/38] reverting back --- .../autopsy/actions/AddTagAction.java | 2 +- .../actions/GetTagNameAndCommentDialog.java | 2 +- .../autopsy/actions/GetTagNameDialog.java | 2 +- .../sleuthkit/autopsy/actions/TagAction.java | 2 +- .../casemodule/AddImageErrorsDialog.java | 2 +- .../autopsy/casemodule/AddImageTask.java | 2 +- .../AddImageWizardAddingProgressPanel.java | 2 +- .../AddImageWizardAddingProgressVisual.java | 2 +- .../AddImageWizardChooseDataSourcePanel.java | 2 +- .../AddImageWizardChooseDataSourceVisual.java | 2 +- .../AddImageWizardIngestConfigPanel.java | 2 +- .../AddImageWizardIngestConfigVisual.java | 2 +- .../casemodule/AddImageWizardIterator.java | 2 +- .../autopsy/casemodule/AddLocalFilesTask.java | 2 +- .../autopsy/casemodule/ButtonColumn.java | 2 +- .../casemodule/CaseActionException.java | 2 +- .../autopsy/casemodule/CaseCloseAction.java | 2 +- .../casemodule/CaseConfigFileInterface.java | 2 +- .../autopsy/casemodule/CaseDeleteAction.java | 2 +- .../casemodule/CaseNewActionInterface.java | 2 +- .../casemodule/CasePropertiesAction.java | 2 +- .../casemodule/CasePropertiesForm.form | 2 +- .../casemodule/CasePropertiesForm.java | 2 +- .../autopsy/casemodule/CueBannerPanel.java | 2 +- .../autopsy/casemodule/GeneralFilter.java | 2 +- .../autopsy/casemodule/ImageFilePanel.java | 2 +- .../autopsy/casemodule/LocalDiskPanel.java | 2 +- .../autopsy/casemodule/LocalFilesPanel.java | 2 +- .../casemodule/MissingImageDialog.java | 2 +- .../casemodule/NewCaseVisualPanel1.java | 2 +- .../casemodule/NewCaseVisualPanel2.java | 2 +- .../casemodule/NewCaseWizardAction.java | 2 +- .../casemodule/NewCaseWizardPanel1.java | 2 +- .../casemodule/NewCaseWizardPanel2.java | 2 +- .../casemodule/OpenRecentCasePanel.java | 2 +- .../autopsy/casemodule/RecentCases.java | 2 +- .../autopsy/casemodule/RecentItems.java | 2 +- .../casemodule/StartupWindowInterface.java | 2 +- .../casemodule/StartupWindowProvider.java | 2 +- .../autopsy/casemodule/UpdateRecentCases.java | 2 +- .../autopsy/casemodule/XMLCaseManagement.java | 2 +- .../AbstractDataResultViewer.java | 2 +- .../corecomponents/CustomAboutAction.java | 2 +- .../corecomponents/DataResultViewerTable.java | 2 +- .../DataResultViewerThumbnail.java | 2 +- .../autopsy/corecomponents/FrameCapture.java | 2 +- .../autopsy/corecomponents/GeneralPanel.java | 2 +- .../corecomponents/MediaViewImagePanel.java | 2 +- .../corecomponents/MediaViewVideoPanel.java | 2 +- .../corecomponents/NoTabsTabDisplayerUI.java | 2 +- .../ProductInformationPanel.java | 2 +- .../corecomponents/TableFilterChildren.java | 2 +- .../corecomponents/ThumbnailViewChildren.java | 2 +- .../corecomponents/ThumbnailViewNode.java | 2 +- .../autopsy/corecomponents/VideoFrame.java | 2 +- .../sleuthkit/autopsy/coreutils/LnkEnums.java | 2 +- .../autopsy/coreutils/TestLogger.java | 2 +- .../coreutils/TimestampingFormatter.java | 2 +- .../datamodel/AbstractContentChildren.java | 2 +- .../datamodel/ArtifactTypeChildren.java | 2 +- .../autopsy/datamodel/AutopsyItemVisitor.java | 2 +- .../datamodel/AutopsyVisitableItem.java | 2 +- .../autopsy/datamodel/ContentChildren.java | 2 +- .../datamodel/ContentHierarchyVisitor.java | 2 +- .../datamodel/ContentIdHierarchyVisitor.java | 2 +- .../autopsy/datamodel/ContentNode.java | 2 +- .../autopsy/datamodel/ContentNodeVisitor.java | 2 +- .../autopsy/datamodel/ContentTagNode.java | 2 +- .../autopsy/datamodel/ExtractedContent.java | 2 +- .../datamodel/ExtractedContentChildren.java | 2 +- .../autopsy/datamodel/FileTypeChildren.java | 2 +- .../datamodel/FileTypeExtensionFilters.java | 2 +- .../autopsy/datamodel/FileTypeExtensions.java | 2 +- .../autopsy/datamodel/FileTypesChildren.java | 2 +- .../autopsy/datamodel/RecentFiles.java | 2 +- .../datamodel/RecentFilesChildren.java | 2 +- .../datamodel/RecentFilesFilterChildren.java | 2 +- .../autopsy/datamodel/TagsNodeKey.java | 2 +- .../directorytree/ChangeViewAction.java | 2 +- .../autopsy/directorytree/CollapseAction.java | 2 +- .../DataResultFilterChildren.java | 2 +- .../DirectoryTreeFilterChildren.java | 2 +- .../DirectoryTreeFilterNode.java | 2 +- .../directorytree/ExtractUnallocAction.java | 2 +- .../directorytree/FileSystemDetailsPanel.java | 2 +- .../directorytree/ImageDetailsPanel.form | 48 +++++++++---------- .../directorytree/ImageDetailsPanel.java | 2 +- .../directorytree/ResultDeleteAction.java | 2 +- .../ViewAssociatedContentAction.java | 2 +- .../directorytree/VolumeDetailsPanel.form | 2 +- .../directorytree/VolumeDetailsPanel.java | 2 +- .../SampleDataSourceIngestModule.java | 2 +- .../examples/SampleFileIngestModule.java | 2 +- .../ingest/GetFilesContentVisitor.java | 2 +- .../ingest/IngestDataSourceThread.java | 2 +- .../autopsy/ingest/IngestDialogPanel.java | 2 +- .../ingest/IngestMessageDetailsPanel.java | 2 +- .../ingest/IngestMessageMainPanel.java | 2 +- .../autopsy/ingest/IngestMessagePanel.java | 2 +- .../ingest/IngestMessageTopComponent.java | 2 +- .../autopsy/ingest/IngestMessagesAction.java | 2 +- .../autopsy/ingest/IngestMessagesToolbar.java | 2 +- .../autopsy/ingest/IngestModuleAbstract.java | 2 +- .../autopsy/ingest/IngestModuleLoader.java | 2 +- .../autopsy/ingest/IngestScheduler.java | 2 +- .../sleuthkit/autopsy/ingest/IngestUI.java | 2 +- .../autopsy/ingest/ScheduledTask.java | 2 +- .../autopsy/report/FileReportModule.java | 2 +- .../autopsy/report/FileReportText.java | 2 +- .../autopsy/report/GeneralReportModule.java | 2 +- .../autopsy/report/ReportBodyFile.java | 2 +- .../autopsy/report/ReportBranding.java | 2 +- .../report/ReportBrandingProviderI.java | 2 +- .../sleuthkit/autopsy/report/ReportExcel.java | 2 +- .../autopsy/report/ReportGenerator.java | 2 +- .../sleuthkit/autopsy/report/ReportHTML.java | 2 +- .../autopsy/report/ReportModule.java | 2 +- .../autopsy/report/ReportProgressPanel.java | 2 +- .../autopsy/report/ReportVisualPanel1.java | 2 +- .../autopsy/report/ReportVisualPanel2.java | 2 +- .../report/ReportWizardFileOptionsPanel.java | 2 +- .../ReportWizardFileOptionsVisualPanel.java | 2 +- .../autopsy/report/ReportWizardIterator.java | 2 +- .../autopsy/report/ReportWizardPanel1.java | 2 +- .../autopsy/report/ReportWizardPanel2.java | 2 +- .../autopsy/report/TableReportModule.java | 2 +- .../netbeans/core/startup/Bundle.properties | 2 +- .../core/windows/view/ui/Bundle.properties | 2 +- 128 files changed, 151 insertions(+), 151 deletions(-) diff --git a/Core/src/org/sleuthkit/autopsy/actions/AddTagAction.java b/Core/src/org/sleuthkit/autopsy/actions/AddTagAction.java index 0e44fd71b6..65f6a5e589 100755 --- a/Core/src/org/sleuthkit/autopsy/actions/AddTagAction.java +++ b/Core/src/org/sleuthkit/autopsy/actions/AddTagAction.java @@ -35,7 +35,7 @@ import org.sleuthkit.autopsy.coreutils.Logger; * An abstract base class for Actions that allow users to tag SleuthKit data * model objects. */ -public abstract class AddTagAction extends TagAction implements Presenter.Popup { +abstract class AddTagAction extends TagAction implements Presenter.Popup { private static final String NO_COMMENT = ""; AddTagAction(String menuText) { diff --git a/Core/src/org/sleuthkit/autopsy/actions/GetTagNameAndCommentDialog.java b/Core/src/org/sleuthkit/autopsy/actions/GetTagNameAndCommentDialog.java index 05a6338272..1260f920cd 100644 --- a/Core/src/org/sleuthkit/autopsy/actions/GetTagNameAndCommentDialog.java +++ b/Core/src/org/sleuthkit/autopsy/actions/GetTagNameAndCommentDialog.java @@ -37,7 +37,7 @@ import org.sleuthkit.autopsy.coreutils.Logger; import org.sleuthkit.datamodel.TagName; import org.sleuthkit.datamodel.TskCoreException; - public class GetTagNameAndCommentDialog extends JDialog { + class GetTagNameAndCommentDialog extends JDialog { private static final String NO_TAG_NAMES_MESSAGE = "No Tags"; private final HashMap tagNames = new HashMap<>(); private TagNameAndComment tagNameAndComment = null; diff --git a/Core/src/org/sleuthkit/autopsy/actions/GetTagNameDialog.java b/Core/src/org/sleuthkit/autopsy/actions/GetTagNameDialog.java index 222a5d320f..8e9d961b7e 100644 --- a/Core/src/org/sleuthkit/autopsy/actions/GetTagNameDialog.java +++ b/Core/src/org/sleuthkit/autopsy/actions/GetTagNameDialog.java @@ -41,7 +41,7 @@ import org.sleuthkit.autopsy.coreutils.Logger; import org.sleuthkit.datamodel.TagName; import org.sleuthkit.datamodel.TskCoreException; - public class GetTagNameDialog extends JDialog { + class GetTagNameDialog extends JDialog { private static final String TAG_ICON_PATH = "org/sleuthkit/autopsy/images/tag-folder-blue-icon-16.png"; private final HashMap tagNames = new HashMap<>(); private TagName tagName = null; diff --git a/Core/src/org/sleuthkit/autopsy/actions/TagAction.java b/Core/src/org/sleuthkit/autopsy/actions/TagAction.java index e85c418f17..376e52ce62 100755 --- a/Core/src/org/sleuthkit/autopsy/actions/TagAction.java +++ b/Core/src/org/sleuthkit/autopsy/actions/TagAction.java @@ -26,7 +26,7 @@ import org.sleuthkit.datamodel.BlackboardArtifact; /** * Abstract base class for Actions involving tags. */ - public abstract class TagAction extends AbstractAction { + abstract class TagAction extends AbstractAction { public TagAction(String menuText) { super(menuText); } diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/AddImageErrorsDialog.java b/Core/src/org/sleuthkit/autopsy/casemodule/AddImageErrorsDialog.java index d0f2d3fa65..e18bf56f14 100644 --- a/Core/src/org/sleuthkit/autopsy/casemodule/AddImageErrorsDialog.java +++ b/Core/src/org/sleuthkit/autopsy/casemodule/AddImageErrorsDialog.java @@ -21,7 +21,7 @@ package org.sleuthkit.autopsy.casemodule; /** * Dialog to show add image error messages */ - public class AddImageErrorsDialog extends javax.swing.JDialog { + class AddImageErrorsDialog extends javax.swing.JDialog { /** * Creates new form AddImageErrorsDialog diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/AddImageTask.java b/Core/src/org/sleuthkit/autopsy/casemodule/AddImageTask.java index 9171154ab4..7cc3348ca9 100644 --- a/Core/src/org/sleuthkit/autopsy/casemodule/AddImageTask.java +++ b/Core/src/org/sleuthkit/autopsy/casemodule/AddImageTask.java @@ -43,7 +43,7 @@ import org.sleuthkit.datamodel.TskException; * It updates the given ProgressMonitor as it works through adding the image, * and et the end, calls the specified Callback. */ -public class AddImageTask implements Runnable { + class AddImageTask implements Runnable { private Logger logger = Logger.getLogger(AddImageTask.class.getName()); diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/AddImageWizardAddingProgressPanel.java b/Core/src/org/sleuthkit/autopsy/casemodule/AddImageWizardAddingProgressPanel.java index ee9a700feb..476bbdd1df 100644 --- a/Core/src/org/sleuthkit/autopsy/casemodule/AddImageWizardAddingProgressPanel.java +++ b/Core/src/org/sleuthkit/autopsy/casemodule/AddImageWizardAddingProgressPanel.java @@ -39,7 +39,7 @@ import org.sleuthkit.autopsy.corecomponentinterfaces.DSPProgressMonitor; * {@link AddImageWizardIngestConfigPanel} (which is a bit weird if you ask m * -jm) */ -public class AddImageWizardAddingProgressPanel implements WizardDescriptor.FinishablePanel { +class AddImageWizardAddingProgressPanel implements WizardDescriptor.FinishablePanel { /** * flag to indicate that the image adding process is finished and this panel diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/AddImageWizardAddingProgressVisual.java b/Core/src/org/sleuthkit/autopsy/casemodule/AddImageWizardAddingProgressVisual.java index 3bd6a393fa..a7be36a1d7 100644 --- a/Core/src/org/sleuthkit/autopsy/casemodule/AddImageWizardAddingProgressVisual.java +++ b/Core/src/org/sleuthkit/autopsy/casemodule/AddImageWizardAddingProgressVisual.java @@ -28,7 +28,7 @@ import org.openide.WizardDescriptor; * visual component to display progress bar and status updates while adding an * image in the wizard */ - public class AddImageWizardAddingProgressVisual extends javax.swing.JPanel { + class AddImageWizardAddingProgressVisual extends javax.swing.JPanel { private static final String ADDING_DATA_SOURCE_COMPLETE = "Adding Data Source - Complete"; private String errorLog = ""; diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/AddImageWizardChooseDataSourcePanel.java b/Core/src/org/sleuthkit/autopsy/casemodule/AddImageWizardChooseDataSourcePanel.java index c78948f853..d662439f3b 100644 --- a/Core/src/org/sleuthkit/autopsy/casemodule/AddImageWizardChooseDataSourcePanel.java +++ b/Core/src/org/sleuthkit/autopsy/casemodule/AddImageWizardChooseDataSourcePanel.java @@ -37,7 +37,7 @@ import org.sleuthkit.autopsy.coreutils.ModuleSettings; * The "Add Image" wizard panel1 handling the logic of selecting image file(s) * to add to Case, and pick the time zone. */ -public class AddImageWizardChooseDataSourcePanel implements WizardDescriptor.Panel, PropertyChangeListener { +class AddImageWizardChooseDataSourcePanel implements WizardDescriptor.Panel, PropertyChangeListener { /** * The visual component that displays this panel. If you need to access the diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/AddImageWizardChooseDataSourceVisual.java b/Core/src/org/sleuthkit/autopsy/casemodule/AddImageWizardChooseDataSourceVisual.java index 0d6c640e22..885b5cced0 100644 --- a/Core/src/org/sleuthkit/autopsy/casemodule/AddImageWizardChooseDataSourceVisual.java +++ b/Core/src/org/sleuthkit/autopsy/casemodule/AddImageWizardChooseDataSourceVisual.java @@ -45,7 +45,7 @@ import org.sleuthkit.autopsy.corecomponentinterfaces.DataSourceProcessor; * Allows the user to choose the data source type and then select the data source * */ -public final class AddImageWizardChooseDataSourceVisual extends JPanel { +final class AddImageWizardChooseDataSourceVisual extends JPanel { static final Logger logger = Logger.getLogger(AddImageWizardChooseDataSourceVisual.class.getName()); diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/AddImageWizardIngestConfigPanel.java b/Core/src/org/sleuthkit/autopsy/casemodule/AddImageWizardIngestConfigPanel.java index 32cef4a095..a83d4549dc 100644 --- a/Core/src/org/sleuthkit/autopsy/casemodule/AddImageWizardIngestConfigPanel.java +++ b/Core/src/org/sleuthkit/autopsy/casemodule/AddImageWizardIngestConfigPanel.java @@ -43,7 +43,7 @@ import org.sleuthkit.autopsy.corecomponentinterfaces.DataSourceProcessor; * TODO: review this for dead code. think about moving logic of adding image to * 3rd panel( {@link AddImageWizardAddingProgressPanel}) separate class -jm */ -public class AddImageWizardIngestConfigPanel implements WizardDescriptor.Panel { +class AddImageWizardIngestConfigPanel implements WizardDescriptor.Panel { private static final Logger logger = Logger.getLogger(AddImageWizardIngestConfigPanel.class.getName()); private IngestConfigurator ingestConfig; diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/AddImageWizardIngestConfigVisual.java b/Core/src/org/sleuthkit/autopsy/casemodule/AddImageWizardIngestConfigVisual.java index 09eca94dc5..07aebf2484 100644 --- a/Core/src/org/sleuthkit/autopsy/casemodule/AddImageWizardIngestConfigVisual.java +++ b/Core/src/org/sleuthkit/autopsy/casemodule/AddImageWizardIngestConfigVisual.java @@ -27,7 +27,7 @@ import javax.swing.JPanel; * * */ - public class AddImageWizardIngestConfigVisual extends javax.swing.JPanel { + class AddImageWizardIngestConfigVisual extends javax.swing.JPanel { //could this be something more specific than JPanel? - jm private JPanel ingestPanel = null; diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/AddImageWizardIterator.java b/Core/src/org/sleuthkit/autopsy/casemodule/AddImageWizardIterator.java index 68e2738e2f..b786b5b171 100644 --- a/Core/src/org/sleuthkit/autopsy/casemodule/AddImageWizardIterator.java +++ b/Core/src/org/sleuthkit/autopsy/casemodule/AddImageWizardIterator.java @@ -31,7 +31,7 @@ import org.openide.WizardDescriptor; * The iterator class for the "Add Image" wizard panel. This class is used to * iterate on the sequence of panels of the "Add Image" wizard panel. */ -public class AddImageWizardIterator implements WizardDescriptor.Iterator { +class AddImageWizardIterator implements WizardDescriptor.Iterator { private int index = 0; private List> panels; diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/AddLocalFilesTask.java b/Core/src/org/sleuthkit/autopsy/casemodule/AddLocalFilesTask.java index c6b419fec2..0abf9bb75d 100644 --- a/Core/src/org/sleuthkit/autopsy/casemodule/AddLocalFilesTask.java +++ b/Core/src/org/sleuthkit/autopsy/casemodule/AddLocalFilesTask.java @@ -40,7 +40,7 @@ import org.sleuthkit.datamodel.TskCoreException; * manager methods acquire the locks for each transaction when adding * logical files. */ - public class AddLocalFilesTask implements Runnable { + class AddLocalFilesTask implements Runnable { private Logger logger = Logger.getLogger(AddLocalFilesTask.class.getName()); diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/ButtonColumn.java b/Core/src/org/sleuthkit/autopsy/casemodule/ButtonColumn.java index 80d2d101f1..8494bbd25f 100644 --- a/Core/src/org/sleuthkit/autopsy/casemodule/ButtonColumn.java +++ b/Core/src/org/sleuthkit/autopsy/casemodule/ButtonColumn.java @@ -44,7 +44,7 @@ import javax.swing.table.*; * the model row number of the button that was clicked. * */ -public class ButtonColumn extends AbstractCellEditor +class ButtonColumn extends AbstractCellEditor implements TableCellRenderer, TableCellEditor, ActionListener, MouseListener { private JTable table; diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/CaseActionException.java b/Core/src/org/sleuthkit/autopsy/casemodule/CaseActionException.java index 8412ba8e0d..4f7e2fa6d2 100644 --- a/Core/src/org/sleuthkit/autopsy/casemodule/CaseActionException.java +++ b/Core/src/org/sleuthkit/autopsy/casemodule/CaseActionException.java @@ -21,7 +21,7 @@ package org.sleuthkit.autopsy.casemodule; /** * Exception thrown when case action (such as open, close, create) resulted in an error */ - public class CaseActionException extends Exception { + class CaseActionException extends Exception { public CaseActionException(String message) { super(message); diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/CaseCloseAction.java b/Core/src/org/sleuthkit/autopsy/casemodule/CaseCloseAction.java index f23398614c..e99844ce66 100644 --- a/Core/src/org/sleuthkit/autopsy/casemodule/CaseCloseAction.java +++ b/Core/src/org/sleuthkit/autopsy/casemodule/CaseCloseAction.java @@ -45,7 +45,7 @@ import org.openide.util.actions.Presenter; * The action to close the current Case. This class should be disabled on * creation and it will be enabled on new case creation or case opened. */ - public final class CaseCloseAction extends CallableSystemAction implements Presenter.Toolbar{ + final class CaseCloseAction extends CallableSystemAction implements Presenter.Toolbar{ JButton toolbarButton = new JButton(); diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/CaseConfigFileInterface.java b/Core/src/org/sleuthkit/autopsy/casemodule/CaseConfigFileInterface.java index cdcd1c81f6..4a91bf9c1e 100644 --- a/Core/src/org/sleuthkit/autopsy/casemodule/CaseConfigFileInterface.java +++ b/Core/src/org/sleuthkit/autopsy/casemodule/CaseConfigFileInterface.java @@ -25,7 +25,7 @@ package org.sleuthkit.autopsy.casemodule; * The interface for the classes that edit the case configuration file */ //TODO: check that this can just be deleted. -public interface CaseConfigFileInterface { +interface CaseConfigFileInterface { public void open(String conFilePath) throws Exception; // opens the confiuation store (XML, DB...) public void writeFile() throws Exception; // writes out the configuration to store public void close() throws Exception; // close and clear the document handler diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/CaseDeleteAction.java b/Core/src/org/sleuthkit/autopsy/casemodule/CaseDeleteAction.java index 87a80fb2c2..72ed22351b 100644 --- a/Core/src/org/sleuthkit/autopsy/casemodule/CaseDeleteAction.java +++ b/Core/src/org/sleuthkit/autopsy/casemodule/CaseDeleteAction.java @@ -66,7 +66,7 @@ import org.openide.util.actions.CallableSystemAction; * The action to delete the current Case. This class should be disabled on * creation and it will be enabled on new case creation or case opened. */ - public final class CaseDeleteAction extends CallableSystemAction { + final class CaseDeleteAction extends CallableSystemAction { private JPanel caller; // for error handling diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/CaseNewActionInterface.java b/Core/src/org/sleuthkit/autopsy/casemodule/CaseNewActionInterface.java index 7f58026b68..1d84f6c61d 100644 --- a/Core/src/org/sleuthkit/autopsy/casemodule/CaseNewActionInterface.java +++ b/Core/src/org/sleuthkit/autopsy/casemodule/CaseNewActionInterface.java @@ -25,6 +25,6 @@ import java.awt.event.ActionListener; /** * */ - public interface CaseNewActionInterface extends ActionListener { + interface CaseNewActionInterface extends ActionListener { } diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/CasePropertiesAction.java b/Core/src/org/sleuthkit/autopsy/casemodule/CasePropertiesAction.java index f01c882070..76ff941278 100644 --- a/Core/src/org/sleuthkit/autopsy/casemodule/CasePropertiesAction.java +++ b/Core/src/org/sleuthkit/autopsy/casemodule/CasePropertiesAction.java @@ -40,7 +40,7 @@ import org.sleuthkit.autopsy.coreutils.Logger; * * @author jantonius */ - public final class CasePropertiesAction extends CallableSystemAction { + final class CasePropertiesAction extends CallableSystemAction { private static JDialog popUpWindow; diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/CasePropertiesForm.form b/Core/src/org/sleuthkit/autopsy/casemodule/CasePropertiesForm.form index 59b72df4dc..ddbcd7e243 100644 --- a/Core/src/org/sleuthkit/autopsy/casemodule/CasePropertiesForm.form +++ b/Core/src/org/sleuthkit/autopsy/casemodule/CasePropertiesForm.form @@ -1,4 +1,4 @@ - + diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/CasePropertiesForm.java b/Core/src/org/sleuthkit/autopsy/casemodule/CasePropertiesForm.java index b307212c0e..5ff08adcad 100644 --- a/Core/src/org/sleuthkit/autopsy/casemodule/CasePropertiesForm.java +++ b/Core/src/org/sleuthkit/autopsy/casemodule/CasePropertiesForm.java @@ -44,7 +44,7 @@ import org.openide.util.actions.CallableSystemAction; * * @author jantonius */ -public class CasePropertiesForm extends javax.swing.JPanel{ +class CasePropertiesForm extends javax.swing.JPanel{ Case current = null; private static JPanel caller; // panel for error diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/CueBannerPanel.java b/Core/src/org/sleuthkit/autopsy/casemodule/CueBannerPanel.java index 9f7fafb027..cd30342965 100644 --- a/Core/src/org/sleuthkit/autopsy/casemodule/CueBannerPanel.java +++ b/Core/src/org/sleuthkit/autopsy/casemodule/CueBannerPanel.java @@ -33,7 +33,7 @@ import org.openide.util.Lookup; /** * */ - public class CueBannerPanel extends javax.swing.JPanel { + class CueBannerPanel extends javax.swing.JPanel { final private static String title = "Open Recent Case"; final private static JFrame frame = new JFrame(title); diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/GeneralFilter.java b/Core/src/org/sleuthkit/autopsy/casemodule/GeneralFilter.java index 06da488f7d..d7a8e4df37 100644 --- a/Core/src/org/sleuthkit/autopsy/casemodule/GeneralFilter.java +++ b/Core/src/org/sleuthkit/autopsy/casemodule/GeneralFilter.java @@ -27,7 +27,7 @@ import javax.swing.filechooser.FileFilter; /** * FileFilter helper class. Matches files based on extension */ - public class GeneralFilter extends FileFilter{ + class GeneralFilter extends FileFilter{ // Extensions & Descriptions for commonly used filters diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/ImageFilePanel.java b/Core/src/org/sleuthkit/autopsy/casemodule/ImageFilePanel.java index a87d3d2f82..6a99067af7 100644 --- a/Core/src/org/sleuthkit/autopsy/casemodule/ImageFilePanel.java +++ b/Core/src/org/sleuthkit/autopsy/casemodule/ImageFilePanel.java @@ -39,7 +39,7 @@ import org.sleuthkit.autopsy.coreutils.ModuleSettings; /** * ImageTypePanel for adding an image file such as .img, .E0x, .00x, etc. */ - public class ImageFilePanel extends JPanel implements DocumentListener { + class ImageFilePanel extends JPanel implements DocumentListener { private final String PROP_LASTIMAGE_PATH = "LBL_LastImage_PATH"; diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/LocalDiskPanel.java b/Core/src/org/sleuthkit/autopsy/casemodule/LocalDiskPanel.java index 710dc28a9b..efe949ef7f 100644 --- a/Core/src/org/sleuthkit/autopsy/casemodule/LocalDiskPanel.java +++ b/Core/src/org/sleuthkit/autopsy/casemodule/LocalDiskPanel.java @@ -47,7 +47,7 @@ import org.sleuthkit.autopsy.coreutils.PlatformUtil; /** * ImageTypePanel for adding a local disk or partition such as PhysicalDrive0 or C:. */ - public class LocalDiskPanel extends JPanel { + class LocalDiskPanel extends JPanel { private static final Logger logger = Logger.getLogger(LocalDiskPanel.class.getName()); private static LocalDiskPanel instance; diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/LocalFilesPanel.java b/Core/src/org/sleuthkit/autopsy/casemodule/LocalFilesPanel.java index 73d76dc1bb..5966775be0 100644 --- a/Core/src/org/sleuthkit/autopsy/casemodule/LocalFilesPanel.java +++ b/Core/src/org/sleuthkit/autopsy/casemodule/LocalFilesPanel.java @@ -30,7 +30,7 @@ import org.sleuthkit.autopsy.corecomponentinterfaces.DataSourceProcessor; /** * Add input wizard subpanel for adding local files / dirs to the case */ - public class LocalFilesPanel extends JPanel { + class LocalFilesPanel extends JPanel { private PropertyChangeSupport pcs = null; private Set currentFiles = new TreeSet(); //keep currents in a set to disallow duplicates per add diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/MissingImageDialog.java b/Core/src/org/sleuthkit/autopsy/casemodule/MissingImageDialog.java index 5de2f07f19..d2d865aa0c 100644 --- a/Core/src/org/sleuthkit/autopsy/casemodule/MissingImageDialog.java +++ b/Core/src/org/sleuthkit/autopsy/casemodule/MissingImageDialog.java @@ -39,7 +39,7 @@ import org.sleuthkit.datamodel.TskCoreException; - public class MissingImageDialog extends javax.swing.JDialog { + class MissingImageDialog extends javax.swing.JDialog { private static final Logger logger = Logger.getLogger(MissingImageDialog.class.getName()); long obj_id; SleuthkitCase db; diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/NewCaseVisualPanel1.java b/Core/src/org/sleuthkit/autopsy/casemodule/NewCaseVisualPanel1.java index ab6ee87d95..3c4dd72bcf 100644 --- a/Core/src/org/sleuthkit/autopsy/casemodule/NewCaseVisualPanel1.java +++ b/Core/src/org/sleuthkit/autopsy/casemodule/NewCaseVisualPanel1.java @@ -32,7 +32,7 @@ import javax.swing.event.DocumentListener; * * @author jantonius */ -public final class NewCaseVisualPanel1 extends JPanel implements DocumentListener{ +final class NewCaseVisualPanel1 extends JPanel implements DocumentListener{ private JFileChooser fc = new JFileChooser(); private NewCaseWizardPanel1 wizPanel; diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/NewCaseVisualPanel2.java b/Core/src/org/sleuthkit/autopsy/casemodule/NewCaseVisualPanel2.java index 1f35f2370e..5232f17835 100644 --- a/Core/src/org/sleuthkit/autopsy/casemodule/NewCaseVisualPanel2.java +++ b/Core/src/org/sleuthkit/autopsy/casemodule/NewCaseVisualPanel2.java @@ -28,7 +28,7 @@ package org.sleuthkit.autopsy.casemodule; * * @author dfickling */ - public class NewCaseVisualPanel2 extends javax.swing.JPanel { + class NewCaseVisualPanel2 extends javax.swing.JPanel { /** Creates new form NewCaseVisualPanel2 */ public NewCaseVisualPanel2() { diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/NewCaseWizardAction.java b/Core/src/org/sleuthkit/autopsy/casemodule/NewCaseWizardAction.java index a2d0460363..63f4ad5c56 100644 --- a/Core/src/org/sleuthkit/autopsy/casemodule/NewCaseWizardAction.java +++ b/Core/src/org/sleuthkit/autopsy/casemodule/NewCaseWizardAction.java @@ -38,7 +38,7 @@ import org.sleuthkit.autopsy.coreutils.Logger; /** * Action to open the New Case wizard. */ - public final class NewCaseWizardAction extends CallableSystemAction { + final class NewCaseWizardAction extends CallableSystemAction { private WizardDescriptor.Panel[] panels; diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/NewCaseWizardPanel1.java b/Core/src/org/sleuthkit/autopsy/casemodule/NewCaseWizardPanel1.java index 062aa7f804..52be7a1a7d 100644 --- a/Core/src/org/sleuthkit/autopsy/casemodule/NewCaseWizardPanel1.java +++ b/Core/src/org/sleuthkit/autopsy/casemodule/NewCaseWizardPanel1.java @@ -40,7 +40,7 @@ import org.sleuthkit.autopsy.coreutils.ModuleSettings; * data of wizard step. It defers creation and initialization of UI component of * wizard panel into getComponent() method. */ -public class NewCaseWizardPanel1 implements WizardDescriptor.ValidatingPanel { +class NewCaseWizardPanel1 implements WizardDescriptor.ValidatingPanel { /** * The visual component that displays this panel. If you need to access the diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/NewCaseWizardPanel2.java b/Core/src/org/sleuthkit/autopsy/casemodule/NewCaseWizardPanel2.java index 8821a896f5..7efdc4c8d5 100644 --- a/Core/src/org/sleuthkit/autopsy/casemodule/NewCaseWizardPanel2.java +++ b/Core/src/org/sleuthkit/autopsy/casemodule/NewCaseWizardPanel2.java @@ -37,7 +37,7 @@ import org.openide.util.HelpCtx; * * @author jantonius */ -public class NewCaseWizardPanel2 implements WizardDescriptor.ValidatingPanel { +class NewCaseWizardPanel2 implements WizardDescriptor.ValidatingPanel { /** * The visual component that displays this panel. If you need to access the diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/OpenRecentCasePanel.java b/Core/src/org/sleuthkit/autopsy/casemodule/OpenRecentCasePanel.java index bbb8de86e6..e7d5fc2b11 100644 --- a/Core/src/org/sleuthkit/autopsy/casemodule/OpenRecentCasePanel.java +++ b/Core/src/org/sleuthkit/autopsy/casemodule/OpenRecentCasePanel.java @@ -34,7 +34,7 @@ import org.sleuthkit.autopsy.coreutils.Logger; * Panel show from the splash dialog that shows recent cases and allows them to * be opened. */ -public class OpenRecentCasePanel extends javax.swing.JPanel { +class OpenRecentCasePanel extends javax.swing.JPanel { static String[] caseNames; static String[] casePaths; diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/RecentCases.java b/Core/src/org/sleuthkit/autopsy/casemodule/RecentCases.java index c12b2e22b9..670b83144e 100644 --- a/Core/src/org/sleuthkit/autopsy/casemodule/RecentCases.java +++ b/Core/src/org/sleuthkit/autopsy/casemodule/RecentCases.java @@ -43,7 +43,7 @@ import org.sleuthkit.autopsy.coreutils.Logger; * The constructor is called when the autopsy is running. * All the method to create and modify the properties file are within this class */ - public final class RecentCases extends CallableSystemAction implements Presenter.Menu { + final class RecentCases extends CallableSystemAction implements Presenter.Menu { static final int LENGTH = 5; static final String NAME_PROP_KEY = "LBL_RecentCase_Name"; diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/RecentItems.java b/Core/src/org/sleuthkit/autopsy/casemodule/RecentItems.java index 5aba63d600..d8f5fcaca7 100644 --- a/Core/src/org/sleuthkit/autopsy/casemodule/RecentItems.java +++ b/Core/src/org/sleuthkit/autopsy/casemodule/RecentItems.java @@ -32,7 +32,7 @@ import org.sleuthkit.autopsy.coreutils.Logger; * This class is used to add the action to the recent case menu item. When the * the recent case menu is pressed, it should open that selected case. */ -public class RecentItems implements ActionListener { +class RecentItems implements ActionListener { String caseName; String casePath; diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/StartupWindowInterface.java b/Core/src/org/sleuthkit/autopsy/casemodule/StartupWindowInterface.java index f5890fa409..1c7e40f386 100644 --- a/Core/src/org/sleuthkit/autopsy/casemodule/StartupWindowInterface.java +++ b/Core/src/org/sleuthkit/autopsy/casemodule/StartupWindowInterface.java @@ -21,7 +21,7 @@ package org.sleuthkit.autopsy.casemodule; /** * Interface for startup window implementations */ - public interface StartupWindowInterface { + interface StartupWindowInterface { /** * Shows and makes active the startup window diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/StartupWindowProvider.java b/Core/src/org/sleuthkit/autopsy/casemodule/StartupWindowProvider.java index 7828765055..79b12a125e 100644 --- a/Core/src/org/sleuthkit/autopsy/casemodule/StartupWindowProvider.java +++ b/Core/src/org/sleuthkit/autopsy/casemodule/StartupWindowProvider.java @@ -32,7 +32,7 @@ import org.sleuthkit.autopsy.coreutils.Logger; * is to implement StartupWindowInterface and register it with lookup as a ServiceProvider. * The custom startup window is automatically chosen over the default one, given it is the only external module custom startup window. */ - public class StartupWindowProvider implements StartupWindowInterface { + class StartupWindowProvider implements StartupWindowInterface { private static volatile StartupWindowProvider instance; private static final Logger logger = Logger.getLogger(StartupWindowProvider.class.getName()); diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/UpdateRecentCases.java b/Core/src/org/sleuthkit/autopsy/casemodule/UpdateRecentCases.java index a6712d0534..9667768397 100644 --- a/Core/src/org/sleuthkit/autopsy/casemodule/UpdateRecentCases.java +++ b/Core/src/org/sleuthkit/autopsy/casemodule/UpdateRecentCases.java @@ -28,7 +28,7 @@ import org.openide.util.actions.SystemAction; /** * This class is used to change / update the list of recent cases dynamically. */ - public class UpdateRecentCases extends JMenuItem implements DynamicMenuContent { + class UpdateRecentCases extends JMenuItem implements DynamicMenuContent { int length; static boolean hasRecentCase = false; diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/XMLCaseManagement.java b/Core/src/org/sleuthkit/autopsy/casemodule/XMLCaseManagement.java index a9076bfa1f..45d8ac4784 100644 --- a/Core/src/org/sleuthkit/autopsy/casemodule/XMLCaseManagement.java +++ b/Core/src/org/sleuthkit/autopsy/casemodule/XMLCaseManagement.java @@ -45,7 +45,7 @@ import org.xml.sax.SAXException; * * @author jantonius */ - public class XMLCaseManagement implements CaseConfigFileInterface { + class XMLCaseManagement implements CaseConfigFileInterface { final static String XSDFILE = "CaseSchema.xsd"; final static String TOP_ROOT_NAME = "AutopsyCase"; diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/AbstractDataResultViewer.java b/Core/src/org/sleuthkit/autopsy/corecomponents/AbstractDataResultViewer.java index 74fe6af266..ece4ce5565 100644 --- a/Core/src/org/sleuthkit/autopsy/corecomponents/AbstractDataResultViewer.java +++ b/Core/src/org/sleuthkit/autopsy/corecomponents/AbstractDataResultViewer.java @@ -36,7 +36,7 @@ import org.sleuthkit.autopsy.coreutils.Logger; * Additionally, the ExplorerManager.Provider interface is implemented to * supply an ExplorerManager to derived classes and their child components. */ - public abstract class AbstractDataResultViewer extends JPanel implements DataResultViewer, Provider { + abstract class AbstractDataResultViewer extends JPanel implements DataResultViewer, Provider { private static final Logger logger = Logger.getLogger(AbstractDataResultViewer.class.getName()); protected transient ExplorerManager em; diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/CustomAboutAction.java b/Core/src/org/sleuthkit/autopsy/corecomponents/CustomAboutAction.java index c69feb15b7..37d21e2748 100644 --- a/Core/src/org/sleuthkit/autopsy/corecomponents/CustomAboutAction.java +++ b/Core/src/org/sleuthkit/autopsy/corecomponents/CustomAboutAction.java @@ -28,7 +28,7 @@ import org.sleuthkit.autopsy.coreutils.Logger; /** * Action to open custom implementation of the "About" window from the Help menu. */ -public class CustomAboutAction extends AboutAction { + class CustomAboutAction extends AboutAction { @Override public void performAction() { diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/DataResultViewerTable.java b/Core/src/org/sleuthkit/autopsy/corecomponents/DataResultViewerTable.java index 6cde1ad2a2..5723151e53 100644 --- a/Core/src/org/sleuthkit/autopsy/corecomponents/DataResultViewerTable.java +++ b/Core/src/org/sleuthkit/autopsy/corecomponents/DataResultViewerTable.java @@ -55,7 +55,7 @@ import org.sleuthkit.autopsy.corecomponentinterfaces.DataResultViewer; // service provider when DataResultViewers can be made compatible with node // multiple selection actions. //@ServiceProvider(service = DataResultViewer.class) - public class DataResultViewerTable extends AbstractDataResultViewer { + class DataResultViewerTable extends AbstractDataResultViewer { private String firstColumnLabel = "Name"; private Set propertiesAcc = new LinkedHashSet<>(); diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/DataResultViewerThumbnail.java b/Core/src/org/sleuthkit/autopsy/corecomponents/DataResultViewerThumbnail.java index 90b640e3ba..bdbe02a4f1 100644 --- a/Core/src/org/sleuthkit/autopsy/corecomponents/DataResultViewerThumbnail.java +++ b/Core/src/org/sleuthkit/autopsy/corecomponents/DataResultViewerThumbnail.java @@ -57,7 +57,7 @@ import org.sleuthkit.datamodel.TskCoreException; // service provider when DataResultViewers can be made compatible with node // multi-selection actions. //@ServiceProvider(service = DataResultViewer.class) - public final class DataResultViewerThumbnail extends AbstractDataResultViewer { + final class DataResultViewerThumbnail extends AbstractDataResultViewer { private static final Logger logger = Logger.getLogger(DataResultViewerThumbnail.class.getName()); //flag to keep track if images are being loaded diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/FrameCapture.java b/Core/src/org/sleuthkit/autopsy/corecomponents/FrameCapture.java index 0e817dc694..f416403114 100644 --- a/Core/src/org/sleuthkit/autopsy/corecomponents/FrameCapture.java +++ b/Core/src/org/sleuthkit/autopsy/corecomponents/FrameCapture.java @@ -6,7 +6,7 @@ import java.util.List; /** * Interface used to capture frames from a video file. */ - public interface FrameCapture { + interface FrameCapture { /** * @param file the video file to use diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/GeneralPanel.java b/Core/src/org/sleuthkit/autopsy/corecomponents/GeneralPanel.java index d223a58c40..2b702bef4b 100644 --- a/Core/src/org/sleuthkit/autopsy/corecomponents/GeneralPanel.java +++ b/Core/src/org/sleuthkit/autopsy/corecomponents/GeneralPanel.java @@ -21,7 +21,7 @@ package org.sleuthkit.autopsy.corecomponents; import java.util.prefs.Preferences; import org.openide.util.NbPreferences; -public final class GeneralPanel extends javax.swing.JPanel { +final class GeneralPanel extends javax.swing.JPanel { private final GeneralOptionsPanelController controller; private static final String KEEP_PREFERRED_VIEWER = "keepPreferredViewer"; diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/MediaViewImagePanel.java b/Core/src/org/sleuthkit/autopsy/corecomponents/MediaViewImagePanel.java index e5acab4cb7..596cf66657 100644 --- a/Core/src/org/sleuthkit/autopsy/corecomponents/MediaViewImagePanel.java +++ b/Core/src/org/sleuthkit/autopsy/corecomponents/MediaViewImagePanel.java @@ -44,7 +44,7 @@ import org.sleuthkit.datamodel.ReadContentInputStream; * Container for the image viewer part of media view, on a layered pane. To be * used with JavaFx image viewer only. */ - public class MediaViewImagePanel extends javax.swing.JPanel { + class MediaViewImagePanel extends javax.swing.JPanel { private JFXPanel fxPanel; private ImageView fxImageView; diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/MediaViewVideoPanel.java b/Core/src/org/sleuthkit/autopsy/corecomponents/MediaViewVideoPanel.java index 7251777665..343b7fa672 100644 --- a/Core/src/org/sleuthkit/autopsy/corecomponents/MediaViewVideoPanel.java +++ b/Core/src/org/sleuthkit/autopsy/corecomponents/MediaViewVideoPanel.java @@ -29,7 +29,7 @@ import org.sleuthkit.datamodel.AbstractFile; * Video viewer part of the Media View layered pane. * Uses different engines depending on platform. */ - public abstract class MediaViewVideoPanel extends JPanel implements FrameCapture { +public abstract class MediaViewVideoPanel extends JPanel implements FrameCapture { private static final Logger logger = Logger.getLogger(MediaViewVideoPanel.class.getName()); diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/NoTabsTabDisplayerUI.java b/Core/src/org/sleuthkit/autopsy/corecomponents/NoTabsTabDisplayerUI.java index 5171b6a46d..67d114ecc6 100644 --- a/Core/src/org/sleuthkit/autopsy/corecomponents/NoTabsTabDisplayerUI.java +++ b/Core/src/org/sleuthkit/autopsy/corecomponents/NoTabsTabDisplayerUI.java @@ -33,7 +33,7 @@ import org.netbeans.swing.tabcontrol.TabDisplayerUI; * * @author dfickling */ - public class NoTabsTabDisplayerUI extends TabDisplayerUI { + class NoTabsTabDisplayerUI extends TabDisplayerUI { /** Creates a new instance of NoTabsTabDisplayerUI */ public NoTabsTabDisplayerUI(TabDisplayer displayer) { diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/ProductInformationPanel.java b/Core/src/org/sleuthkit/autopsy/corecomponents/ProductInformationPanel.java index d4d37c6396..e42bc9d65a 100644 --- a/Core/src/org/sleuthkit/autopsy/corecomponents/ProductInformationPanel.java +++ b/Core/src/org/sleuthkit/autopsy/corecomponents/ProductInformationPanel.java @@ -43,7 +43,7 @@ import org.sleuthkit.datamodel.SleuthkitJNI; /** * Custom "About" window panel. */ - public class ProductInformationPanel extends JPanel implements HyperlinkListener { + class ProductInformationPanel extends JPanel implements HyperlinkListener { private URL url = null; private Icon about; diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/TableFilterChildren.java b/Core/src/org/sleuthkit/autopsy/corecomponents/TableFilterChildren.java index d14ec5fd0a..dcc3a78846 100644 --- a/Core/src/org/sleuthkit/autopsy/corecomponents/TableFilterChildren.java +++ b/Core/src/org/sleuthkit/autopsy/corecomponents/TableFilterChildren.java @@ -25,7 +25,7 @@ import org.openide.nodes.Node; /** * Complementary class to TableFilterNode. */ -public class TableFilterChildren extends FilterNode.Children { +class TableFilterChildren extends FilterNode.Children { /** the constructor */ TableFilterChildren(Node arg) { diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/ThumbnailViewChildren.java b/Core/src/org/sleuthkit/autopsy/corecomponents/ThumbnailViewChildren.java index 8730126791..d8131ccbc6 100644 --- a/Core/src/org/sleuthkit/autopsy/corecomponents/ThumbnailViewChildren.java +++ b/Core/src/org/sleuthkit/autopsy/corecomponents/ThumbnailViewChildren.java @@ -39,7 +39,7 @@ import org.sleuthkit.datamodel.Content; * Filter-node like class, but adds additional hierarchy (pages) as parents of * the filtered nodes. */ -public class ThumbnailViewChildren extends Children.Keys { +class ThumbnailViewChildren extends Children.Keys { static final int IMAGES_PER_PAGE = 200; private Node parent; diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/ThumbnailViewNode.java b/Core/src/org/sleuthkit/autopsy/corecomponents/ThumbnailViewNode.java index 6b6bd003a2..4cdc1f128a 100644 --- a/Core/src/org/sleuthkit/autopsy/corecomponents/ThumbnailViewNode.java +++ b/Core/src/org/sleuthkit/autopsy/corecomponents/ThumbnailViewNode.java @@ -29,7 +29,7 @@ import org.sleuthkit.datamodel.Content; * Node that wraps around original node and adds the bitmap icon representing * the picture */ -public class ThumbnailViewNode extends FilterNode { +class ThumbnailViewNode extends FilterNode { private SoftReference iconCache = null; private int iconSize = ImageUtils.ICON_SIZE_MEDIUM; diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/VideoFrame.java b/Core/src/org/sleuthkit/autopsy/corecomponents/VideoFrame.java index abc4fd7507..ce4080fb2c 100644 --- a/Core/src/org/sleuthkit/autopsy/corecomponents/VideoFrame.java +++ b/Core/src/org/sleuthkit/autopsy/corecomponents/VideoFrame.java @@ -5,7 +5,7 @@ import java.awt.Image; /** * */ - public class VideoFrame { + class VideoFrame { private Image frame; private long timeMillis; diff --git a/Core/src/org/sleuthkit/autopsy/coreutils/LnkEnums.java b/Core/src/org/sleuthkit/autopsy/coreutils/LnkEnums.java index 8c074f4fdd..5b35043057 100644 --- a/Core/src/org/sleuthkit/autopsy/coreutils/LnkEnums.java +++ b/Core/src/org/sleuthkit/autopsy/coreutils/LnkEnums.java @@ -22,7 +22,7 @@ package org.sleuthkit.autopsy.coreutils; * * @author dick */ - public class LnkEnums { + class LnkEnums { private static final byte[] CDRIVES = new byte[] { (byte)0xe0, 0x4f, (byte)0xd0, 0x20, (byte)0xea, 0x3a, 0x69, 0x10, (byte)0xa2, (byte)0xd8, 0x08, 0x00, 0x2b, 0x30, 0x30, (byte)0x9d }; diff --git a/Core/src/org/sleuthkit/autopsy/coreutils/TestLogger.java b/Core/src/org/sleuthkit/autopsy/coreutils/TestLogger.java index 08942f3221..e03ff9d05a 100644 --- a/Core/src/org/sleuthkit/autopsy/coreutils/TestLogger.java +++ b/Core/src/org/sleuthkit/autopsy/coreutils/TestLogger.java @@ -28,7 +28,7 @@ import java.util.logging.Level; /* * Toolbar button for testing logging. Not a normal part of application. */ -public final class TestLogger implements ActionListener { + final class TestLogger implements ActionListener { static final Logger logger = Logger.getLogger(TestLogger.class.getName()); Formatter fmt; diff --git a/Core/src/org/sleuthkit/autopsy/coreutils/TimestampingFormatter.java b/Core/src/org/sleuthkit/autopsy/coreutils/TimestampingFormatter.java index 54fe199106..77d2c269cd 100644 --- a/Core/src/org/sleuthkit/autopsy/coreutils/TimestampingFormatter.java +++ b/Core/src/org/sleuthkit/autopsy/coreutils/TimestampingFormatter.java @@ -30,7 +30,7 @@ import java.util.logging.LogRecord; * Formatter to wrap another formatter and prepend a timestampe to each formatted string * Not currently used. */ - public class TimestampingFormatter extends Formatter { + class TimestampingFormatter extends Formatter { Formatter original; DateFormat timestampFormat = DateFormat.getDateTimeInstance(DateFormat.LONG, DateFormat.LONG, Locale.US); diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/AbstractContentChildren.java b/Core/src/org/sleuthkit/autopsy/datamodel/AbstractContentChildren.java index 18ec09974a..87494f2e1f 100644 --- a/Core/src/org/sleuthkit/autopsy/datamodel/AbstractContentChildren.java +++ b/Core/src/org/sleuthkit/autopsy/datamodel/AbstractContentChildren.java @@ -38,7 +38,7 @@ import org.sleuthkit.datamodel.Volume; * Abstract subclass for ContentChildren and RootContentChildren implementations * that handles creating Nodes from Content objects. */ -public abstract class AbstractContentChildren extends Keys { +abstract class AbstractContentChildren extends Keys { private final CreateSleuthkitNodeVisitor createSleuthkitNodeVisitor = new CreateSleuthkitNodeVisitor(); private final CreateAutopsyNodeVisitor createAutopsyNodeVisitor = new CreateAutopsyNodeVisitor(); diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/ArtifactTypeChildren.java b/Core/src/org/sleuthkit/autopsy/datamodel/ArtifactTypeChildren.java index 5084df3506..e5f81d1844 100644 --- a/Core/src/org/sleuthkit/autopsy/datamodel/ArtifactTypeChildren.java +++ b/Core/src/org/sleuthkit/autopsy/datamodel/ArtifactTypeChildren.java @@ -31,7 +31,7 @@ import org.sleuthkit.datamodel.TskException; * * @author dfickling */ -public class ArtifactTypeChildren extends ChildFactory{ +class ArtifactTypeChildren extends ChildFactory{ private SleuthkitCase skCase; private BlackboardArtifact.ARTIFACT_TYPE type; diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/AutopsyItemVisitor.java b/Core/src/org/sleuthkit/autopsy/datamodel/AutopsyItemVisitor.java index ad88c8a486..3a53552739 100644 --- a/Core/src/org/sleuthkit/autopsy/datamodel/AutopsyItemVisitor.java +++ b/Core/src/org/sleuthkit/autopsy/datamodel/AutopsyItemVisitor.java @@ -22,7 +22,7 @@ package org.sleuthkit.autopsy.datamodel; * * @author dfickling */ - public interface AutopsyItemVisitor { + interface AutopsyItemVisitor { T visit(ExtractedContent ec); diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/AutopsyVisitableItem.java b/Core/src/org/sleuthkit/autopsy/datamodel/AutopsyVisitableItem.java index c2428f57c6..90d35b307c 100644 --- a/Core/src/org/sleuthkit/autopsy/datamodel/AutopsyVisitableItem.java +++ b/Core/src/org/sleuthkit/autopsy/datamodel/AutopsyVisitableItem.java @@ -21,7 +21,7 @@ package org.sleuthkit.autopsy.datamodel; /** * Abstraction for certain top level items displayed in the GUI */ - public interface AutopsyVisitableItem { + interface AutopsyVisitableItem { /** * visitor pattern support diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/ContentChildren.java b/Core/src/org/sleuthkit/autopsy/datamodel/ContentChildren.java index 55b74259a1..bfcd35ad5c 100644 --- a/Core/src/org/sleuthkit/autopsy/datamodel/ContentChildren.java +++ b/Core/src/org/sleuthkit/autopsy/datamodel/ContentChildren.java @@ -28,7 +28,7 @@ import org.sleuthkit.datamodel.Content; * Class for Children of all ContentNodes. Handles creating child ContentNodes. * TODO consider a ContentChildren child factory */ -public class ContentChildren extends AbstractContentChildren { +class ContentChildren extends AbstractContentChildren { private static final Logger logger = Logger.getLogger(ContentChildren.class.getName()); //private static final int MAX_CHILD_COUNT = 1000000; diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/ContentHierarchyVisitor.java b/Core/src/org/sleuthkit/autopsy/datamodel/ContentHierarchyVisitor.java index 0225a51864..f6ebcc78c9 100644 --- a/Core/src/org/sleuthkit/autopsy/datamodel/ContentHierarchyVisitor.java +++ b/Core/src/org/sleuthkit/autopsy/datamodel/ContentHierarchyVisitor.java @@ -38,7 +38,7 @@ import org.sleuthkit.datamodel.VolumeSystem; * past subclasses that aren't part of the exposed hierarchy (VolumeSystem, * FileSystem, and root Directories) */ - public class ContentHierarchyVisitor extends ContentVisitor.Default> { + class ContentHierarchyVisitor extends ContentVisitor.Default> { private static final Logger logger = Logger.getLogger(ContentHierarchyVisitor.class.getName()); private static final ContentHierarchyVisitor INSTANCE = new ContentHierarchyVisitor(); diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/ContentIdHierarchyVisitor.java b/Core/src/org/sleuthkit/autopsy/datamodel/ContentIdHierarchyVisitor.java index 72ded24b36..dbce27c925 100644 --- a/Core/src/org/sleuthkit/autopsy/datamodel/ContentIdHierarchyVisitor.java +++ b/Core/src/org/sleuthkit/autopsy/datamodel/ContentIdHierarchyVisitor.java @@ -38,7 +38,7 @@ import org.sleuthkit.datamodel.VolumeSystem; * past subclasses that aren't part of the exposed hierarchy (VolumeSystem, * FileSystem, and root Directories) */ -public class ContentIdHierarchyVisitor extends ContentVisitor.Default> { + class ContentIdHierarchyVisitor extends ContentVisitor.Default> { private static final Logger logger = Logger.getLogger(ContentHierarchyVisitor.class.getName()); private static final ContentIdHierarchyVisitor INSTANCE = new ContentIdHierarchyVisitor(); diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/ContentNode.java b/Core/src/org/sleuthkit/autopsy/datamodel/ContentNode.java index 8a1b8ad77f..89b7876015 100644 --- a/Core/src/org/sleuthkit/autopsy/datamodel/ContentNode.java +++ b/Core/src/org/sleuthkit/autopsy/datamodel/ContentNode.java @@ -26,7 +26,7 @@ import org.openide.util.Lookup; * Provides basic information such as ID, parent ID, etc. */ - public abstract class ContentNode extends DisplayableItemNode{ + abstract class ContentNode extends DisplayableItemNode{ public ContentNode(Children children) { super(children); diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/ContentNodeVisitor.java b/Core/src/org/sleuthkit/autopsy/datamodel/ContentNodeVisitor.java index 7685f0cdc5..4fd9d12c54 100644 --- a/Core/src/org/sleuthkit/autopsy/datamodel/ContentNodeVisitor.java +++ b/Core/src/org/sleuthkit/autopsy/datamodel/ContentNodeVisitor.java @@ -22,7 +22,7 @@ package org.sleuthkit.autopsy.datamodel; * Interface for visitor pattern on ContentNodes * @param visit method return type */ -public interface ContentNodeVisitor { + interface ContentNodeVisitor { T visit(DirectoryNode dn); diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/ContentTagNode.java b/Core/src/org/sleuthkit/autopsy/datamodel/ContentTagNode.java index 4023c703e7..5749b53aa3 100755 --- a/Core/src/org/sleuthkit/autopsy/datamodel/ContentTagNode.java +++ b/Core/src/org/sleuthkit/autopsy/datamodel/ContentTagNode.java @@ -36,7 +36,7 @@ import org.sleuthkit.datamodel.TskCoreException; * consisting of content and blackboard artifact tags, grouped first by tag * type, then by tag name. */ - public class ContentTagNode extends DisplayableItemNode { + class ContentTagNode extends DisplayableItemNode { private static final String ICON_PATH = "org/sleuthkit/autopsy/images/blue-tag-icon-16.png"; private final ContentTag tag; diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/ExtractedContent.java b/Core/src/org/sleuthkit/autopsy/datamodel/ExtractedContent.java index 81bc791adf..394eb2228e 100644 --- a/Core/src/org/sleuthkit/autopsy/datamodel/ExtractedContent.java +++ b/Core/src/org/sleuthkit/autopsy/datamodel/ExtractedContent.java @@ -24,7 +24,7 @@ import org.sleuthkit.datamodel.SleuthkitCase; * Parent of the "extracted content" artifacts to be displayed in the tree. Other * artifacts are displayed under other more specific parents. */ -public class ExtractedContent implements AutopsyVisitableItem{ + class ExtractedContent implements AutopsyVisitableItem{ SleuthkitCase skCase; diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/ExtractedContentChildren.java b/Core/src/org/sleuthkit/autopsy/datamodel/ExtractedContentChildren.java index 41ae98a2d0..d5d92183b2 100644 --- a/Core/src/org/sleuthkit/autopsy/datamodel/ExtractedContentChildren.java +++ b/Core/src/org/sleuthkit/autopsy/datamodel/ExtractedContentChildren.java @@ -37,7 +37,7 @@ import org.sleuthkit.datamodel.TskCoreException; * has all of the blackboard artifacts that are not displayed in a more specific form elsewhere * in the tree. */ -public class ExtractedContentChildren extends ChildFactory { +class ExtractedContentChildren extends ChildFactory { private SleuthkitCase skCase; private final ArrayList doNotShow; diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/FileTypeChildren.java b/Core/src/org/sleuthkit/autopsy/datamodel/FileTypeChildren.java index 2c3b0d4731..3376e9f0d9 100644 --- a/Core/src/org/sleuthkit/autopsy/datamodel/FileTypeChildren.java +++ b/Core/src/org/sleuthkit/autopsy/datamodel/FileTypeChildren.java @@ -40,7 +40,7 @@ import org.sleuthkit.datamodel.TskData; /** * Children factory for a specific file type - does the database query. */ -public class FileTypeChildren extends ChildFactory { +class FileTypeChildren extends ChildFactory { private SleuthkitCase skCase; private FileTypeExtensionFilters.SearchFilterInterface filter; diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/FileTypeExtensionFilters.java b/Core/src/org/sleuthkit/autopsy/datamodel/FileTypeExtensionFilters.java index c5373ce415..b90a257419 100644 --- a/Core/src/org/sleuthkit/autopsy/datamodel/FileTypeExtensionFilters.java +++ b/Core/src/org/sleuthkit/autopsy/datamodel/FileTypeExtensionFilters.java @@ -25,7 +25,7 @@ import org.sleuthkit.datamodel.SleuthkitCase; /** * Filters database results by file extension. */ - public class FileTypeExtensionFilters implements AutopsyVisitableItem { + class FileTypeExtensionFilters implements AutopsyVisitableItem { private SleuthkitCase skCase; diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/FileTypeExtensions.java b/Core/src/org/sleuthkit/autopsy/datamodel/FileTypeExtensions.java index 0b067a4678..f24272ef01 100644 --- a/Core/src/org/sleuthkit/autopsy/datamodel/FileTypeExtensions.java +++ b/Core/src/org/sleuthkit/autopsy/datamodel/FileTypeExtensions.java @@ -25,7 +25,7 @@ import java.util.List; * Contains Lists of commonly known and used file type extensions * and 'getters' to obtain them. */ -public class FileTypeExtensions { + class FileTypeExtensions { private final static List IMAGE_EXTENSIONS = Arrays.asList(".jpg", ".jpeg", ".png", ".psd", ".nef", ".tiff", ".bmp"); private final static List VIDEO_EXTENSIONS = Arrays.asList(".aaf", ".3gp", ".asf", ".avi", ".m1v", ".m2v", ".m4v", ".mp4", ".mov", ".mpeg", ".mpg", ".mpe", ".mp4", ".rm", ".wmv", ".mpv", ".flv", ".swf"); diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/FileTypesChildren.java b/Core/src/org/sleuthkit/autopsy/datamodel/FileTypesChildren.java index 6cef6c94a5..e55124bebc 100644 --- a/Core/src/org/sleuthkit/autopsy/datamodel/FileTypesChildren.java +++ b/Core/src/org/sleuthkit/autopsy/datamodel/FileTypesChildren.java @@ -28,7 +28,7 @@ import org.sleuthkit.datamodel.SleuthkitCase; /** * */ -public class FileTypesChildren extends ChildFactory { +class FileTypesChildren extends ChildFactory { private SleuthkitCase skCase; private FileTypeExtensionFilters.RootFilter filter; diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/RecentFiles.java b/Core/src/org/sleuthkit/autopsy/datamodel/RecentFiles.java index 258e20925b..2745951574 100644 --- a/Core/src/org/sleuthkit/autopsy/datamodel/RecentFiles.java +++ b/Core/src/org/sleuthkit/autopsy/datamodel/RecentFiles.java @@ -23,7 +23,7 @@ import org.sleuthkit.datamodel.SleuthkitCase; /** * Recent files node support */ - public class RecentFiles implements AutopsyVisitableItem { + class RecentFiles implements AutopsyVisitableItem { SleuthkitCase skCase; diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/RecentFilesChildren.java b/Core/src/org/sleuthkit/autopsy/datamodel/RecentFilesChildren.java index f5aa7eef77..b2247873df 100644 --- a/Core/src/org/sleuthkit/autopsy/datamodel/RecentFilesChildren.java +++ b/Core/src/org/sleuthkit/autopsy/datamodel/RecentFilesChildren.java @@ -34,7 +34,7 @@ import org.sleuthkit.datamodel.SleuthkitCase; * * @author dfickling */ - public class RecentFilesChildren extends ChildFactory { + class RecentFilesChildren extends ChildFactory { private SleuthkitCase skCase; private Calendar lastDay; diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/RecentFilesFilterChildren.java b/Core/src/org/sleuthkit/autopsy/datamodel/RecentFilesFilterChildren.java index f284a00bd7..374fe54db2 100644 --- a/Core/src/org/sleuthkit/autopsy/datamodel/RecentFilesFilterChildren.java +++ b/Core/src/org/sleuthkit/autopsy/datamodel/RecentFilesFilterChildren.java @@ -42,7 +42,7 @@ import org.sleuthkit.datamodel.TskData; * * @author dfickling */ - public class RecentFilesFilterChildren extends ChildFactory { + class RecentFilesFilterChildren extends ChildFactory { private SleuthkitCase skCase; private RecentFilesFilter filter; diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/TagsNodeKey.java b/Core/src/org/sleuthkit/autopsy/datamodel/TagsNodeKey.java index e037798e4f..dad36cfa34 100755 --- a/Core/src/org/sleuthkit/autopsy/datamodel/TagsNodeKey.java +++ b/Core/src/org/sleuthkit/autopsy/datamodel/TagsNodeKey.java @@ -23,7 +23,7 @@ package org.sleuthkit.autopsy.datamodel; * RootContentChildren class. RootContentChildren is a NetBeans child node * factory built on top of the NetBeans Children.Keys class. */ - public class TagsNodeKey implements AutopsyVisitableItem { + class TagsNodeKey implements AutopsyVisitableItem { // Creation of a TagsNode object corresponding to a TagsNodeKey object is done // by a CreateAutopsyNodeVisitor dispatched from the AbstractContentChildren // override of Children.Keys.createNodes(). diff --git a/Core/src/org/sleuthkit/autopsy/directorytree/ChangeViewAction.java b/Core/src/org/sleuthkit/autopsy/directorytree/ChangeViewAction.java index 6bf3075f19..1c6c42ce58 100644 --- a/Core/src/org/sleuthkit/autopsy/directorytree/ChangeViewAction.java +++ b/Core/src/org/sleuthkit/autopsy/directorytree/ChangeViewAction.java @@ -34,7 +34,7 @@ import org.sleuthkit.autopsy.coreutils.Logger; * * @author jantonius */ - public class ChangeViewAction extends AbstractAction implements Presenter.Popup { + class ChangeViewAction extends AbstractAction implements Presenter.Popup { private int type; // type 1 = hex view, 2 = string view private Node node; diff --git a/Core/src/org/sleuthkit/autopsy/directorytree/CollapseAction.java b/Core/src/org/sleuthkit/autopsy/directorytree/CollapseAction.java index 719939e741..9d27a8a20d 100644 --- a/Core/src/org/sleuthkit/autopsy/directorytree/CollapseAction.java +++ b/Core/src/org/sleuthkit/autopsy/directorytree/CollapseAction.java @@ -30,7 +30,7 @@ import org.sleuthkit.autopsy.coreutils.Logger; * * @author jantonius */ -public class CollapseAction extends AbstractAction { +class CollapseAction extends AbstractAction { CollapseAction(String title) { super(title); diff --git a/Core/src/org/sleuthkit/autopsy/directorytree/DataResultFilterChildren.java b/Core/src/org/sleuthkit/autopsy/directorytree/DataResultFilterChildren.java index cd148c9e9f..2dfa1380dc 100644 --- a/Core/src/org/sleuthkit/autopsy/directorytree/DataResultFilterChildren.java +++ b/Core/src/org/sleuthkit/autopsy/directorytree/DataResultFilterChildren.java @@ -27,7 +27,7 @@ import org.openide.nodes.Node; * DataResultFilterNode that created in the DataResultFilterNode.java. * */ - public class DataResultFilterChildren extends FilterNode.Children { + class DataResultFilterChildren extends FilterNode.Children { ExplorerManager sourceEm; diff --git a/Core/src/org/sleuthkit/autopsy/directorytree/DirectoryTreeFilterChildren.java b/Core/src/org/sleuthkit/autopsy/directorytree/DirectoryTreeFilterChildren.java index 1ae930f121..753ae4a691 100644 --- a/Core/src/org/sleuthkit/autopsy/directorytree/DirectoryTreeFilterChildren.java +++ b/Core/src/org/sleuthkit/autopsy/directorytree/DirectoryTreeFilterChildren.java @@ -47,7 +47,7 @@ import org.sleuthkit.datamodel.Volume; * hides files, '..', and other children that should not be displayed. facility * to customize nodes view in dir tree: hide them or set no children */ -public class DirectoryTreeFilterChildren extends FilterNode.Children { +class DirectoryTreeFilterChildren extends FilterNode.Children { private final ShowItemVisitor showItemV = new ShowItemVisitor(); private final IsLeafItemVisitor isLeafItemV = new IsLeafItemVisitor(); diff --git a/Core/src/org/sleuthkit/autopsy/directorytree/DirectoryTreeFilterNode.java b/Core/src/org/sleuthkit/autopsy/directorytree/DirectoryTreeFilterNode.java index c952f01489..cd3322fd81 100755 --- a/Core/src/org/sleuthkit/autopsy/directorytree/DirectoryTreeFilterNode.java +++ b/Core/src/org/sleuthkit/autopsy/directorytree/DirectoryTreeFilterNode.java @@ -44,7 +44,7 @@ import org.sleuthkit.datamodel.TskCoreException; * the children filter so that files and such are hidden from the tree. * */ -public class DirectoryTreeFilterNode extends FilterNode { +class DirectoryTreeFilterNode extends FilterNode { private static final Action collapseAll = new CollapseAction("Collapse All"); private static final Logger logger = Logger.getLogger(DirectoryTreeFilterNode.class.getName()); diff --git a/Core/src/org/sleuthkit/autopsy/directorytree/ExtractUnallocAction.java b/Core/src/org/sleuthkit/autopsy/directorytree/ExtractUnallocAction.java index 22d18eb03d..5469db6581 100644 --- a/Core/src/org/sleuthkit/autopsy/directorytree/ExtractUnallocAction.java +++ b/Core/src/org/sleuthkit/autopsy/directorytree/ExtractUnallocAction.java @@ -55,7 +55,7 @@ import org.sleuthkit.datamodel.VolumeSystem; /** * Extracts all the unallocated space as a single file */ - public final class ExtractUnallocAction extends AbstractAction { + final class ExtractUnallocAction extends AbstractAction { private final List LstUnallocs = new ArrayList(); private static final List lockedVols = new ArrayList(); diff --git a/Core/src/org/sleuthkit/autopsy/directorytree/FileSystemDetailsPanel.java b/Core/src/org/sleuthkit/autopsy/directorytree/FileSystemDetailsPanel.java index f5d4edc9ef..9363d7f7b5 100644 --- a/Core/src/org/sleuthkit/autopsy/directorytree/FileSystemDetailsPanel.java +++ b/Core/src/org/sleuthkit/autopsy/directorytree/FileSystemDetailsPanel.java @@ -25,7 +25,7 @@ import java.awt.event.ActionListener; * * @author jantonius */ -public class FileSystemDetailsPanel extends javax.swing.JPanel { + class FileSystemDetailsPanel extends javax.swing.JPanel { /** Creates new form FileSystemDetailsPanel */ FileSystemDetailsPanel() { diff --git a/Core/src/org/sleuthkit/autopsy/directorytree/ImageDetailsPanel.form b/Core/src/org/sleuthkit/autopsy/directorytree/ImageDetailsPanel.form index a007c9b657..a9508bc56e 100644 --- a/Core/src/org/sleuthkit/autopsy/directorytree/ImageDetailsPanel.form +++ b/Core/src/org/sleuthkit/autopsy/directorytree/ImageDetailsPanel.form @@ -21,32 +21,29 @@ - + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + @@ -76,7 +73,10 @@ - + + + + diff --git a/Core/src/org/sleuthkit/autopsy/directorytree/ImageDetailsPanel.java b/Core/src/org/sleuthkit/autopsy/directorytree/ImageDetailsPanel.java index 93361fa4bf..07241253e6 100644 --- a/Core/src/org/sleuthkit/autopsy/directorytree/ImageDetailsPanel.java +++ b/Core/src/org/sleuthkit/autopsy/directorytree/ImageDetailsPanel.java @@ -31,7 +31,7 @@ import java.awt.event.ActionListener; * * @author jantonius */ -public class ImageDetailsPanel extends javax.swing.JPanel { +class ImageDetailsPanel extends javax.swing.JPanel { /** Creates new form ImageDetailsPanel */ ImageDetailsPanel() { diff --git a/Core/src/org/sleuthkit/autopsy/directorytree/ResultDeleteAction.java b/Core/src/org/sleuthkit/autopsy/directorytree/ResultDeleteAction.java index 4fdbbff34f..05ff64d947 100644 --- a/Core/src/org/sleuthkit/autopsy/directorytree/ResultDeleteAction.java +++ b/Core/src/org/sleuthkit/autopsy/directorytree/ResultDeleteAction.java @@ -36,7 +36,7 @@ import org.sleuthkit.datamodel.SleuthkitCase; * @deprecated do not use, it is here in case we ever pick up on this work */ @Deprecated - public class ResultDeleteAction extends AbstractAction { + class ResultDeleteAction extends AbstractAction { private enum ActionType { diff --git a/Core/src/org/sleuthkit/autopsy/directorytree/ViewAssociatedContentAction.java b/Core/src/org/sleuthkit/autopsy/directorytree/ViewAssociatedContentAction.java index 0db3672d27..aefde11f20 100644 --- a/Core/src/org/sleuthkit/autopsy/directorytree/ViewAssociatedContentAction.java +++ b/Core/src/org/sleuthkit/autopsy/directorytree/ViewAssociatedContentAction.java @@ -28,7 +28,7 @@ import org.sleuthkit.datamodel.Content; /** * View the content associated with the given BlackboardArtifactNode */ -public class ViewAssociatedContentAction extends AbstractAction { +class ViewAssociatedContentAction extends AbstractAction { private Content content; diff --git a/Core/src/org/sleuthkit/autopsy/directorytree/VolumeDetailsPanel.form b/Core/src/org/sleuthkit/autopsy/directorytree/VolumeDetailsPanel.form index b6ce798205..5c73074beb 100644 --- a/Core/src/org/sleuthkit/autopsy/directorytree/VolumeDetailsPanel.form +++ b/Core/src/org/sleuthkit/autopsy/directorytree/VolumeDetailsPanel.form @@ -1,4 +1,4 @@ - + diff --git a/Core/src/org/sleuthkit/autopsy/directorytree/VolumeDetailsPanel.java b/Core/src/org/sleuthkit/autopsy/directorytree/VolumeDetailsPanel.java index 69f741b584..3a4aa9660f 100644 --- a/Core/src/org/sleuthkit/autopsy/directorytree/VolumeDetailsPanel.java +++ b/Core/src/org/sleuthkit/autopsy/directorytree/VolumeDetailsPanel.java @@ -25,7 +25,7 @@ import java.awt.event.ActionListener; /** * This is the form / panel to show the Volume Details. */ -public class VolumeDetailsPanel extends javax.swing.JPanel { +class VolumeDetailsPanel extends javax.swing.JPanel { /** Creates new form VolumeDetailPanel */ VolumeDetailsPanel() { diff --git a/Core/src/org/sleuthkit/autopsy/examples/SampleDataSourceIngestModule.java b/Core/src/org/sleuthkit/autopsy/examples/SampleDataSourceIngestModule.java index df2a6489dd..da4a7b99b7 100755 --- a/Core/src/org/sleuthkit/autopsy/examples/SampleDataSourceIngestModule.java +++ b/Core/src/org/sleuthkit/autopsy/examples/SampleDataSourceIngestModule.java @@ -50,7 +50,7 @@ import org.sleuthkit.datamodel.TskCoreException; * Sample DataSource-level ingest module that doesn't do much at all. * Just exists to show basic idea of these modules */ - public class SampleDataSourceIngestModule extends org.sleuthkit.autopsy.ingest.IngestModuleDataSource { + class SampleDataSourceIngestModule extends org.sleuthkit.autopsy.ingest.IngestModuleDataSource { /* Data Source modules operate on a disk or set of logical files. They * are passed in teh data source refernce and query it for things they want. diff --git a/Core/src/org/sleuthkit/autopsy/examples/SampleFileIngestModule.java b/Core/src/org/sleuthkit/autopsy/examples/SampleFileIngestModule.java index 4b65ee05a4..464c79888c 100755 --- a/Core/src/org/sleuthkit/autopsy/examples/SampleFileIngestModule.java +++ b/Core/src/org/sleuthkit/autopsy/examples/SampleFileIngestModule.java @@ -53,7 +53,7 @@ import org.sleuthkit.datamodel.TskData; * IngestModuleLoader will not load things from the org.sleuthkit.autopsy.examples package. * Either change the package or the loading code to make this module actually run. */ - public class SampleFileIngestModule extends org.sleuthkit.autopsy.ingest.IngestModuleAbstractFile { + class SampleFileIngestModule extends org.sleuthkit.autopsy.ingest.IngestModuleAbstractFile { private int attrId = -1; private static SampleFileIngestModule defaultInstance = null; diff --git a/Core/src/org/sleuthkit/autopsy/ingest/GetFilesContentVisitor.java b/Core/src/org/sleuthkit/autopsy/ingest/GetFilesContentVisitor.java index 004e3db640..65290a5b3c 100644 --- a/Core/src/org/sleuthkit/autopsy/ingest/GetFilesContentVisitor.java +++ b/Core/src/org/sleuthkit/autopsy/ingest/GetFilesContentVisitor.java @@ -39,7 +39,7 @@ import org.sleuthkit.datamodel.LayoutFile; * Abstract visitor for getting all the files from content * TODO should be moved to utility module (needs resolve cyclic deps) */ - public abstract class GetFilesContentVisitor implements ContentVisitor> { + abstract class GetFilesContentVisitor implements ContentVisitor> { private static final Logger logger = Logger.getLogger(GetFilesContentVisitor.class.getName()); diff --git a/Core/src/org/sleuthkit/autopsy/ingest/IngestDataSourceThread.java b/Core/src/org/sleuthkit/autopsy/ingest/IngestDataSourceThread.java index 3e3092249c..85f62f8785 100644 --- a/Core/src/org/sleuthkit/autopsy/ingest/IngestDataSourceThread.java +++ b/Core/src/org/sleuthkit/autopsy/ingest/IngestDataSourceThread.java @@ -37,7 +37,7 @@ import org.sleuthkit.datamodel.Content; * Worker thread that runs a data source-level ingest module (image, file set virt dir, etc). * Used to process only a single data-source and single module. */ - public class IngestDataSourceThread extends SwingWorker { + class IngestDataSourceThread extends SwingWorker { private final Logger logger = Logger.getLogger(IngestDataSourceThread.class.getName()); private ProgressHandle progress; diff --git a/Core/src/org/sleuthkit/autopsy/ingest/IngestDialogPanel.java b/Core/src/org/sleuthkit/autopsy/ingest/IngestDialogPanel.java index a35fa8e76c..ff6ef874e9 100644 --- a/Core/src/org/sleuthkit/autopsy/ingest/IngestDialogPanel.java +++ b/Core/src/org/sleuthkit/autopsy/ingest/IngestDialogPanel.java @@ -40,7 +40,7 @@ import org.sleuthkit.autopsy.coreutils.ModuleSettings; /** * main configuration panel for all ingest modules, reusable JPanel component */ - public class IngestDialogPanel extends javax.swing.JPanel { + class IngestDialogPanel extends javax.swing.JPanel { private IngestModuleAbstract currentModule; private ModulesTableModel tableModel; diff --git a/Core/src/org/sleuthkit/autopsy/ingest/IngestMessageDetailsPanel.java b/Core/src/org/sleuthkit/autopsy/ingest/IngestMessageDetailsPanel.java index 997a450005..37a97ae2d1 100644 --- a/Core/src/org/sleuthkit/autopsy/ingest/IngestMessageDetailsPanel.java +++ b/Core/src/org/sleuthkit/autopsy/ingest/IngestMessageDetailsPanel.java @@ -38,7 +38,7 @@ import org.sleuthkit.datamodel.TskException; /** * Details panel within IngestMessagePanel */ -public class IngestMessageDetailsPanel extends javax.swing.JPanel { +class IngestMessageDetailsPanel extends javax.swing.JPanel { private IngestMessageMainPanel mainPanel; diff --git a/Core/src/org/sleuthkit/autopsy/ingest/IngestMessageMainPanel.java b/Core/src/org/sleuthkit/autopsy/ingest/IngestMessageMainPanel.java index f950c9f807..5e0bf81fec 100644 --- a/Core/src/org/sleuthkit/autopsy/ingest/IngestMessageMainPanel.java +++ b/Core/src/org/sleuthkit/autopsy/ingest/IngestMessageMainPanel.java @@ -25,7 +25,7 @@ import org.sleuthkit.autopsy.coreutils.Logger; * the main layered pane container for messages table (IngestMessagePanel) and * details view (IngestMessageDetailsPanel) */ -public class IngestMessageMainPanel extends javax.swing.JPanel { + class IngestMessageMainPanel extends javax.swing.JPanel { private IngestMessagePanel messagePanel; private IngestMessageDetailsPanel detailsPanel; diff --git a/Core/src/org/sleuthkit/autopsy/ingest/IngestMessagePanel.java b/Core/src/org/sleuthkit/autopsy/ingest/IngestMessagePanel.java index 3af6f77b59..6d8cf6f1bc 100644 --- a/Core/src/org/sleuthkit/autopsy/ingest/IngestMessagePanel.java +++ b/Core/src/org/sleuthkit/autopsy/ingest/IngestMessagePanel.java @@ -56,7 +56,7 @@ import org.sleuthkit.datamodel.BlackboardArtifact; * Notification window showing messages from modules to user * */ -public class IngestMessagePanel extends JPanel implements TableModelListener { +class IngestMessagePanel extends JPanel implements TableModelListener { private MessageTableModel tableModel; private MessageTableRenderer renderer; diff --git a/Core/src/org/sleuthkit/autopsy/ingest/IngestMessageTopComponent.java b/Core/src/org/sleuthkit/autopsy/ingest/IngestMessageTopComponent.java index f45987a96d..d4a9ab9cce 100644 --- a/Core/src/org/sleuthkit/autopsy/ingest/IngestMessageTopComponent.java +++ b/Core/src/org/sleuthkit/autopsy/ingest/IngestMessageTopComponent.java @@ -44,7 +44,7 @@ import org.sleuthkit.datamodel.Content; /** * Top component which displays something. */ -public final class IngestMessageTopComponent extends TopComponent implements IngestUI { + final class IngestMessageTopComponent extends TopComponent implements IngestUI { private static IngestMessageTopComponent instance; private static final Logger logger = Logger.getLogger(IngestMessageTopComponent.class.getName()); diff --git a/Core/src/org/sleuthkit/autopsy/ingest/IngestMessagesAction.java b/Core/src/org/sleuthkit/autopsy/ingest/IngestMessagesAction.java index 6625187030..11ed44cf7f 100644 --- a/Core/src/org/sleuthkit/autopsy/ingest/IngestMessagesAction.java +++ b/Core/src/org/sleuthkit/autopsy/ingest/IngestMessagesAction.java @@ -31,7 +31,7 @@ import org.openide.util.actions.Presenter; // @ActionReference(path = "Toolbars/File", position = 575) //}) //@Messages("CTL_IngestMessagesAction=Messages") - public final class IngestMessagesAction extends AbstractAction implements Presenter.Toolbar { + final class IngestMessagesAction extends AbstractAction implements Presenter.Toolbar { @Override public void actionPerformed(ActionEvent e) { diff --git a/Core/src/org/sleuthkit/autopsy/ingest/IngestMessagesToolbar.java b/Core/src/org/sleuthkit/autopsy/ingest/IngestMessagesToolbar.java index 5d691f0360..f817383595 100644 --- a/Core/src/org/sleuthkit/autopsy/ingest/IngestMessagesToolbar.java +++ b/Core/src/org/sleuthkit/autopsy/ingest/IngestMessagesToolbar.java @@ -34,7 +34,7 @@ import org.sleuthkit.autopsy.casemodule.Case; * Toolbar for Ingest * */ - public class IngestMessagesToolbar extends javax.swing.JPanel { + class IngestMessagesToolbar extends javax.swing.JPanel { private IngestMessagesButton ingestMessagesButton = new IngestMessagesButton(); private static volatile IngestMessagesToolbar instance; diff --git a/Core/src/org/sleuthkit/autopsy/ingest/IngestModuleAbstract.java b/Core/src/org/sleuthkit/autopsy/ingest/IngestModuleAbstract.java index c77c19bc29..6bf6b36f57 100644 --- a/Core/src/org/sleuthkit/autopsy/ingest/IngestModuleAbstract.java +++ b/Core/src/org/sleuthkit/autopsy/ingest/IngestModuleAbstract.java @@ -23,7 +23,7 @@ package org.sleuthkit.autopsy.ingest; /** * Base interface for ingest modules */ - public abstract class IngestModuleAbstract { + abstract class IngestModuleAbstract { private String args; diff --git a/Core/src/org/sleuthkit/autopsy/ingest/IngestModuleLoader.java b/Core/src/org/sleuthkit/autopsy/ingest/IngestModuleLoader.java index 7816325ef5..b1cee5482e 100644 --- a/Core/src/org/sleuthkit/autopsy/ingest/IngestModuleLoader.java +++ b/Core/src/org/sleuthkit/autopsy/ingest/IngestModuleLoader.java @@ -90,7 +90,7 @@ import org.w3c.dom.NodeList; * NOTE: this will be part of future IngestPipelineManager with IngestManager * code refactored */ - public final class IngestModuleLoader { + final class IngestModuleLoader { private static final String PIPELINE_CONFIG_XML = "pipeline_config.xml"; private static final String XSDFILE = "PipelineConfigSchema.xsd"; diff --git a/Core/src/org/sleuthkit/autopsy/ingest/IngestScheduler.java b/Core/src/org/sleuthkit/autopsy/ingest/IngestScheduler.java index 7e51f1c882..9b88c24047 100644 --- a/Core/src/org/sleuthkit/autopsy/ingest/IngestScheduler.java +++ b/Core/src/org/sleuthkit/autopsy/ingest/IngestScheduler.java @@ -59,7 +59,7 @@ import org.sleuthkit.datamodel.TskData.TSK_FS_META_TYPE_ENUM; * pipelines. * */ -public class IngestScheduler { +class IngestScheduler { private static IngestScheduler instance; private static final Logger logger = Logger.getLogger(IngestScheduler.class.getName()); private final DataSourceScheduler dataSourceScheduler = new DataSourceScheduler(); diff --git a/Core/src/org/sleuthkit/autopsy/ingest/IngestUI.java b/Core/src/org/sleuthkit/autopsy/ingest/IngestUI.java index 9ac57e2d0e..e4984bf38e 100644 --- a/Core/src/org/sleuthkit/autopsy/ingest/IngestUI.java +++ b/Core/src/org/sleuthkit/autopsy/ingest/IngestUI.java @@ -24,7 +24,7 @@ import org.sleuthkit.datamodel.Content; /** * UI support for ingest */ - public interface IngestUI { + interface IngestUI { void displayMessage(final IngestMessage message); int getMessagesCount(); void clearMessages(); diff --git a/Core/src/org/sleuthkit/autopsy/ingest/ScheduledTask.java b/Core/src/org/sleuthkit/autopsy/ingest/ScheduledTask.java index ea07093f1b..e9975cd66c 100644 --- a/Core/src/org/sleuthkit/autopsy/ingest/ScheduledTask.java +++ b/Core/src/org/sleuthkit/autopsy/ingest/ScheduledTask.java @@ -28,7 +28,7 @@ import org.sleuthkit.datamodel.Content; * * @param T type of Ingest Module / Pipeline (file or data source content) associated with this task */ -public class ScheduledTask { +class ScheduledTask { private Content input; private List modules; diff --git a/Core/src/org/sleuthkit/autopsy/report/FileReportModule.java b/Core/src/org/sleuthkit/autopsy/report/FileReportModule.java index f63acdc168..e69f4c0ac8 100755 --- a/Core/src/org/sleuthkit/autopsy/report/FileReportModule.java +++ b/Core/src/org/sleuthkit/autopsy/report/FileReportModule.java @@ -26,7 +26,7 @@ import org.sleuthkit.datamodel.AbstractFile; * * @author jwallace */ - public interface FileReportModule extends ReportModule { + interface FileReportModule extends ReportModule { /** * Initialize the report which will be stored at the given path. * @param path diff --git a/Core/src/org/sleuthkit/autopsy/report/FileReportText.java b/Core/src/org/sleuthkit/autopsy/report/FileReportText.java index 750d730b0c..7b10b9ac8a 100755 --- a/Core/src/org/sleuthkit/autopsy/report/FileReportText.java +++ b/Core/src/org/sleuthkit/autopsy/report/FileReportText.java @@ -35,7 +35,7 @@ import org.sleuthkit.datamodel.AbstractFile; * * @author jwallace */ - public class FileReportText implements FileReportModule { + class FileReportText implements FileReportModule { private static final Logger logger = Logger.getLogger(FileReportText.class.getName()); private String reportPath; private Writer out; diff --git a/Core/src/org/sleuthkit/autopsy/report/GeneralReportModule.java b/Core/src/org/sleuthkit/autopsy/report/GeneralReportModule.java index 4914757b24..8baa4e5050 100644 --- a/Core/src/org/sleuthkit/autopsy/report/GeneralReportModule.java +++ b/Core/src/org/sleuthkit/autopsy/report/GeneralReportModule.java @@ -20,7 +20,7 @@ package org.sleuthkit.autopsy.report; import javax.swing.JPanel; - public interface GeneralReportModule extends ReportModule { + interface GeneralReportModule extends ReportModule { /** * Called to generate the report. Method is responsible for saving the file at the diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportBodyFile.java b/Core/src/org/sleuthkit/autopsy/report/ReportBodyFile.java index 859479b26c..d31af46908 100644 --- a/Core/src/org/sleuthkit/autopsy/report/ReportBodyFile.java +++ b/Core/src/org/sleuthkit/autopsy/report/ReportBodyFile.java @@ -40,7 +40,7 @@ import org.sleuthkit.datamodel.*; * ReportBodyFile generates a report in the body file format specified on * The Sleuth Kit wiki as MD5|name|inode|mode_as_string|UID|GID|size|atime|mtime|ctime|crtime. */ - public class ReportBodyFile implements GeneralReportModule { + class ReportBodyFile implements GeneralReportModule { private static final Logger logger = Logger.getLogger(ReportBodyFile.class.getName()); private static ReportBodyFile instance = null; diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportBranding.java b/Core/src/org/sleuthkit/autopsy/report/ReportBranding.java index bc5937c799..173821542b 100644 --- a/Core/src/org/sleuthkit/autopsy/report/ReportBranding.java +++ b/Core/src/org/sleuthkit/autopsy/report/ReportBranding.java @@ -37,7 +37,7 @@ import org.sleuthkit.autopsy.coreutils.PlatformUtil; * * Uses module settings property files to store customizations. */ - public final class ReportBranding implements ReportBrandingProviderI { + final class ReportBranding implements ReportBrandingProviderI { //property names private static final String GENERATOR_LOGO_PATH_PROP = "GeneratorLogoPath"; diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportBrandingProviderI.java b/Core/src/org/sleuthkit/autopsy/report/ReportBrandingProviderI.java index af4d40110a..3bdb762dd7 100644 --- a/Core/src/org/sleuthkit/autopsy/report/ReportBrandingProviderI.java +++ b/Core/src/org/sleuthkit/autopsy/report/ReportBrandingProviderI.java @@ -21,7 +21,7 @@ package org.sleuthkit.autopsy.report; /** * Interface to implement by reports to add on custom branding, logos, etc */ - public interface ReportBrandingProviderI { + interface ReportBrandingProviderI { /** * Get the generator logo path on the local disk (previously set or default), diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportExcel.java b/Core/src/org/sleuthkit/autopsy/report/ReportExcel.java index cfb1fa0b00..2f03a820a5 100644 --- a/Core/src/org/sleuthkit/autopsy/report/ReportExcel.java +++ b/Core/src/org/sleuthkit/autopsy/report/ReportExcel.java @@ -29,7 +29,7 @@ import org.apache.poi.xssf.usermodel.XSSFWorkbook; import org.sleuthkit.autopsy.casemodule.Case; import org.sleuthkit.autopsy.coreutils.Logger; - public class ReportExcel implements TableReportModule { + class ReportExcel implements TableReportModule { private static final Logger logger = Logger.getLogger(ReportExcel.class.getName()); private static ReportExcel instance; diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportGenerator.java b/Core/src/org/sleuthkit/autopsy/report/ReportGenerator.java index d43b344b13..3a5e96f247 100644 --- a/Core/src/org/sleuthkit/autopsy/report/ReportGenerator.java +++ b/Core/src/org/sleuthkit/autopsy/report/ReportGenerator.java @@ -71,7 +71,7 @@ import org.sleuthkit.datamodel.TskException; * can be called to show report generation progress using ReportProgressPanel * objects displayed using a dialog box. */ -public class ReportGenerator { + class ReportGenerator { private static final Logger logger = Logger.getLogger(ReportGenerator.class.getName()); private Case currentCase = Case.getCurrentCase(); diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportHTML.java b/Core/src/org/sleuthkit/autopsy/report/ReportHTML.java index 6d23a2f89a..33ee24b9d7 100644 --- a/Core/src/org/sleuthkit/autopsy/report/ReportHTML.java +++ b/Core/src/org/sleuthkit/autopsy/report/ReportHTML.java @@ -58,7 +58,7 @@ import org.sleuthkit.datamodel.Content; import org.sleuthkit.datamodel.ContentTag; import org.sleuthkit.datamodel.TskData.TSK_DB_FILES_TYPE_ENUM; - public class ReportHTML implements TableReportModule { + class ReportHTML implements TableReportModule { private static final Logger logger = Logger.getLogger(ReportHTML.class.getName()); private static final String THUMBS_REL_PATH = "thumbs" + File.separator; private static ReportHTML instance; diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportModule.java b/Core/src/org/sleuthkit/autopsy/report/ReportModule.java index 2a3a677b29..615770bd69 100644 --- a/Core/src/org/sleuthkit/autopsy/report/ReportModule.java +++ b/Core/src/org/sleuthkit/autopsy/report/ReportModule.java @@ -25,7 +25,7 @@ package org.sleuthkit.autopsy.report; /** * Interface got report modules that plug in to the reporting infrastructure. */ -public interface ReportModule { + interface ReportModule { /** * Get the name of the report this module generates. diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportProgressPanel.java b/Core/src/org/sleuthkit/autopsy/report/ReportProgressPanel.java index 95bd9967c8..3432cc8773 100644 --- a/Core/src/org/sleuthkit/autopsy/report/ReportProgressPanel.java +++ b/Core/src/org/sleuthkit/autopsy/report/ReportProgressPanel.java @@ -27,7 +27,7 @@ import java.awt.event.MouseListener; import java.io.File; import java.io.IOException; - public class ReportProgressPanel extends javax.swing.JPanel { + class ReportProgressPanel extends javax.swing.JPanel { private ReportStatus STATUS; // Enum to represent if a report is waiting, diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportVisualPanel1.java b/Core/src/org/sleuthkit/autopsy/report/ReportVisualPanel1.java index 7f66eb536b..fed27ec749 100644 --- a/Core/src/org/sleuthkit/autopsy/report/ReportVisualPanel1.java +++ b/Core/src/org/sleuthkit/autopsy/report/ReportVisualPanel1.java @@ -36,7 +36,7 @@ import javax.swing.event.ListSelectionListener; import org.openide.util.Lookup; import org.sleuthkit.autopsy.coreutils.Logger; - public final class ReportVisualPanel1 extends JPanel implements ListSelectionListener { + final class ReportVisualPanel1 extends JPanel implements ListSelectionListener { private static final Logger logger = Logger.getLogger(ReportVisualPanel1.class.getName()); private ReportWizardPanel1 wizPanel; private List modules = new ArrayList<>(); diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportVisualPanel2.java b/Core/src/org/sleuthkit/autopsy/report/ReportVisualPanel2.java index 9c5c6a0136..67a2eb67ae 100644 --- a/Core/src/org/sleuthkit/autopsy/report/ReportVisualPanel2.java +++ b/Core/src/org/sleuthkit/autopsy/report/ReportVisualPanel2.java @@ -43,7 +43,7 @@ import org.sleuthkit.datamodel.BlackboardArtifact.ARTIFACT_TYPE; import org.sleuthkit.datamodel.TagName; import org.sleuthkit.datamodel.TskCoreException; - public final class ReportVisualPanel2 extends JPanel { + final class ReportVisualPanel2 extends JPanel { private ReportWizardPanel2 wizPanel; private Map tagStates = new LinkedHashMap<>(); diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportWizardFileOptionsPanel.java b/Core/src/org/sleuthkit/autopsy/report/ReportWizardFileOptionsPanel.java index 2e2b73c160..ad56a8dcc8 100755 --- a/Core/src/org/sleuthkit/autopsy/report/ReportWizardFileOptionsPanel.java +++ b/Core/src/org/sleuthkit/autopsy/report/ReportWizardFileOptionsPanel.java @@ -30,7 +30,7 @@ import org.openide.util.HelpCtx; * * @author jwallace */ - public class ReportWizardFileOptionsPanel implements WizardDescriptor.FinishablePanel{ + class ReportWizardFileOptionsPanel implements WizardDescriptor.FinishablePanel{ private WizardDescriptor wiz; private ReportWizardFileOptionsVisualPanel component; private JButton finishButton; diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportWizardFileOptionsVisualPanel.java b/Core/src/org/sleuthkit/autopsy/report/ReportWizardFileOptionsVisualPanel.java index 1afb83cc06..150905f125 100755 --- a/Core/src/org/sleuthkit/autopsy/report/ReportWizardFileOptionsVisualPanel.java +++ b/Core/src/org/sleuthkit/autopsy/report/ReportWizardFileOptionsVisualPanel.java @@ -37,7 +37,7 @@ import javax.swing.event.ListDataListener; * * @author jwallace */ -public class ReportWizardFileOptionsVisualPanel extends javax.swing.JPanel { +class ReportWizardFileOptionsVisualPanel extends javax.swing.JPanel { private List options; private Map optionStates = new EnumMap<>(FileReportDataTypes.class); private ListModel model; diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportWizardIterator.java b/Core/src/org/sleuthkit/autopsy/report/ReportWizardIterator.java index f2709a1b65..cfec65ba81 100644 --- a/Core/src/org/sleuthkit/autopsy/report/ReportWizardIterator.java +++ b/Core/src/org/sleuthkit/autopsy/report/ReportWizardIterator.java @@ -27,7 +27,7 @@ import javax.swing.event.ChangeListener; import org.openide.WizardDescriptor; import org.openide.util.NbPreferences; - public final class ReportWizardIterator implements WizardDescriptor.Iterator { + final class ReportWizardIterator implements WizardDescriptor.Iterator { private int index; private ReportWizardPanel1 firstPanel; diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportWizardPanel1.java b/Core/src/org/sleuthkit/autopsy/report/ReportWizardPanel1.java index 20b135adf7..576bfbdd7d 100644 --- a/Core/src/org/sleuthkit/autopsy/report/ReportWizardPanel1.java +++ b/Core/src/org/sleuthkit/autopsy/report/ReportWizardPanel1.java @@ -29,7 +29,7 @@ import org.openide.WizardDescriptor; import org.openide.util.HelpCtx; import org.openide.util.NbPreferences; - public class ReportWizardPanel1 implements WizardDescriptor.FinishablePanel { + class ReportWizardPanel1 implements WizardDescriptor.FinishablePanel { private WizardDescriptor wiz; private ReportVisualPanel1 component; private JButton nextButton; diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportWizardPanel2.java b/Core/src/org/sleuthkit/autopsy/report/ReportWizardPanel2.java index 60ec9a0924..fec8e3c5a2 100644 --- a/Core/src/org/sleuthkit/autopsy/report/ReportWizardPanel2.java +++ b/Core/src/org/sleuthkit/autopsy/report/ReportWizardPanel2.java @@ -26,7 +26,7 @@ import org.openide.WizardDescriptor; import org.openide.util.HelpCtx; import org.openide.util.NbPreferences; - public class ReportWizardPanel2 implements WizardDescriptor.Panel { + class ReportWizardPanel2 implements WizardDescriptor.Panel { private ReportVisualPanel2 component; private JButton finishButton; private JButton nextButton; diff --git a/Core/src/org/sleuthkit/autopsy/report/TableReportModule.java b/Core/src/org/sleuthkit/autopsy/report/TableReportModule.java index 4a7bc9ac50..61e715f644 100644 --- a/Core/src/org/sleuthkit/autopsy/report/TableReportModule.java +++ b/Core/src/org/sleuthkit/autopsy/report/TableReportModule.java @@ -29,7 +29,7 @@ import java.util.List; * The data sent consists of user-chosen fields such as Blackboard Artifacts * and File/Result Tags. */ -public interface TableReportModule extends ReportModule { + interface TableReportModule extends ReportModule { /** * Start the report. Open any output streams, initialize member variables, diff --git a/branding/core/core.jar/org/netbeans/core/startup/Bundle.properties b/branding/core/core.jar/org/netbeans/core/startup/Bundle.properties index 6678229856..e4da187938 100644 --- a/branding/core/core.jar/org/netbeans/core/startup/Bundle.properties +++ b/branding/core/core.jar/org/netbeans/core/startup/Bundle.properties @@ -1,5 +1,5 @@ #Updated by build script -#Wed, 22 Jan 2014 16:24:54 -0500 +#Wed, 22 Jan 2014 16:40:57 -0500 LBL_splash_window_title=Starting Autopsy SPLASH_HEIGHT=288 SPLASH_WIDTH=538 diff --git a/branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties b/branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties index 816a8ce0c9..6aa65808b0 100644 --- a/branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties +++ b/branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties @@ -1,5 +1,5 @@ #Updated by build script -#Wed, 22 Jan 2014 16:24:54 -0500 +#Wed, 22 Jan 2014 16:40:57 -0500 CTL_MainWindow_Title=Autopsy 3.0.8 CTL_MainWindow_Title_No_Project=Autopsy 3.0.8 From 7c53b0e56ff29ad70f355cff7bac7065987de8d8 Mon Sep 17 00:00:00 2001 From: Richard Cordovano Date: Thu, 23 Jan 2014 11:26:22 -0500 Subject: [PATCH 15/38] Fixed bundle.properties for file ext mismatch module --- .../src/org/sleuthkit/autopsy/fileextmismatch/Bundle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/Bundle.properties b/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/Bundle.properties index c31389a1dd..6b00d4a0ca 100644 --- a/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/Bundle.properties +++ b/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/Bundle.properties @@ -16,4 +16,4 @@ FileExtMismatchConfigPanel.mimeRemoveErrLabel.text=\ FileExtMismatchConfigPanel.extRemoveErrLabel.text=\ FileExtMismatchConfigPanel.saveMsgLabel.text=\ FileExtMismatchSimpleConfigPanel.skipNoExtCheckBox.text=Skip Files Without Extensions -FileExtMismatchSimpleConfigPanel.SkipTextPlain.text=Skip text/plain MIME type +FileExtMismatchSimpleConfigPanel.skipTextPlain.text=Skip text/plain MIME type From e2dca5f4dac569ad411718f031329e61f4a70ddc Mon Sep 17 00:00:00 2001 From: shahit2 Date: Thu, 23 Jan 2014 12:25:47 -0500 Subject: [PATCH 16/38] committing files that could be changed to non-pub --- .../autopsy/fileextmismatch/AddFileExtensionAction.java | 2 +- .../autopsy/fileextmismatch/FileExtMismatchIngestModule.java | 2 +- .../fileextmismatch/FileExtMismatchSimpleConfigPanel.java | 2 +- .../sleuthkit/autopsy/fileextmismatch/FileExtMismatchXML.java | 2 +- .../org/sleuthkit/autopsy/hashdatabase/HashDbIngestModule.java | 2 +- .../autopsy/keywordsearch/KeywordSearchIngestModule.java | 2 +- .../autopsy/keywordsearch/KeywordSearchIngestSimplePanel.java | 2 +- .../sleuthkit/autopsy/recentactivity/RAImageIngestModule.java | 2 +- .../org/sleuthkit/autopsy/sevenzip/SevenZipIngestModule.java | 2 +- .../core/core.jar/org/netbeans/core/startup/Bundle.properties | 2 +- .../org/netbeans/core/windows/view/ui/Bundle.properties | 2 +- .../thunderbirdparser/ThunderbirdMboxFileIngestModule.java | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/AddFileExtensionAction.java b/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/AddFileExtensionAction.java index dd79826361..a2a9f12747 100644 --- a/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/AddFileExtensionAction.java +++ b/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/AddFileExtensionAction.java @@ -31,7 +31,7 @@ import javax.swing.JOptionPane; * Do the context menu action for adding a new filename extension to * the mismatch list for the MIME type of the selected node. */ - class AddFileExtensionAction extends AbstractAction { +class AddFileExtensionAction extends AbstractAction { private String extStr; private String mimeTypeStr; diff --git a/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/FileExtMismatchIngestModule.java b/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/FileExtMismatchIngestModule.java index 5945f29b74..9037b9756c 100644 --- a/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/FileExtMismatchIngestModule.java +++ b/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/FileExtMismatchIngestModule.java @@ -47,7 +47,7 @@ import org.sleuthkit.datamodel.TskException; /** * Flags mismatched filename extensions based on file signature. */ - class FileExtMismatchIngestModule extends org.sleuthkit.autopsy.ingest.IngestModuleAbstractFile { +public class FileExtMismatchIngestModule extends org.sleuthkit.autopsy.ingest.IngestModuleAbstractFile { private static FileExtMismatchIngestModule defaultInstance = null; private static final Logger logger = Logger.getLogger(FileExtMismatchIngestModule.class.getName()); public static final String MODULE_NAME = "File Extension Mismatch Detection"; diff --git a/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/FileExtMismatchSimpleConfigPanel.java b/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/FileExtMismatchSimpleConfigPanel.java index 0d01ffde3f..ab6eb35687 100644 --- a/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/FileExtMismatchSimpleConfigPanel.java +++ b/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/FileExtMismatchSimpleConfigPanel.java @@ -22,7 +22,7 @@ package org.sleuthkit.autopsy.fileextmismatch; /** * Instances of this class provide a simplified UI for managing the hash sets configuration. */ - class FileExtMismatchSimpleConfigPanel extends javax.swing.JPanel { +class FileExtMismatchSimpleConfigPanel extends javax.swing.JPanel { public FileExtMismatchSimpleConfigPanel() { initComponents(); diff --git a/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/FileExtMismatchXML.java b/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/FileExtMismatchXML.java index 19f2d96f95..9d462963e0 100644 --- a/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/FileExtMismatchXML.java +++ b/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/FileExtMismatchXML.java @@ -42,7 +42,7 @@ import org.w3c.dom.NodeList; * Storage of file extension mismatch configuration, which maps mimetypes to * allowable filename extensions. */ - class FileExtMismatchXML { +class FileExtMismatchXML { private static final Logger logger = Logger.getLogger(FileExtMismatchXML.class.getName()); private static FileExtMismatchXML defaultInstance = null; diff --git a/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashDbIngestModule.java b/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashDbIngestModule.java index baa3ee9ea2..91ecb5de88 100644 --- a/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashDbIngestModule.java +++ b/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashDbIngestModule.java @@ -45,7 +45,7 @@ import org.sleuthkit.datamodel.TskException; import org.sleuthkit.autopsy.hashdatabase.HashDbManager.HashDb; import org.sleuthkit.datamodel.HashInfo; -class HashDbIngestModule extends IngestModuleAbstractFile { +public class HashDbIngestModule extends IngestModuleAbstractFile { private static HashDbIngestModule instance = null; public final static String MODULE_NAME = "Hash Lookup"; public final static String MODULE_DESCRIPTION = "Identifies known and notables files using supplied hash databases, such as a standard NSRL database."; diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchIngestModule.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchIngestModule.java index de51b5ac97..4942c41a14 100644 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchIngestModule.java +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchIngestModule.java @@ -76,7 +76,7 @@ import org.sleuthkit.datamodel.TskData.FileKnown; * * Registered as a module in layer.xml */ -final class KeywordSearchIngestModule extends IngestModuleAbstractFile { +public final class KeywordSearchIngestModule extends IngestModuleAbstractFile { enum UpdateFrequency { diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchIngestSimplePanel.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchIngestSimplePanel.java index b488548e55..7c6b8090d6 100644 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchIngestSimplePanel.java +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchIngestSimplePanel.java @@ -32,7 +32,7 @@ import org.sleuthkit.autopsy.coreutils.StringExtract.StringExtractUnicodeTable.S /** * Simple ingest config panel */ -class KeywordSearchIngestSimplePanel extends javax.swing.JPanel { +public class KeywordSearchIngestSimplePanel extends javax.swing.JPanel { private final static Logger logger = Logger.getLogger(KeywordSearchIngestSimplePanel.class.getName()); public static final String PROP_OPTIONS = "Keyword Search_Options"; diff --git a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/RAImageIngestModule.java b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/RAImageIngestModule.java index 3f0cbb830c..c5565bc3c8 100644 --- a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/RAImageIngestModule.java +++ b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/RAImageIngestModule.java @@ -42,7 +42,7 @@ import org.sleuthkit.datamodel.Content; * Recent activity image ingest module * */ -final class RAImageIngestModule extends IngestModuleDataSource { +public final class RAImageIngestModule extends IngestModuleDataSource { private static final Logger logger = Logger.getLogger(RAImageIngestModule.class.getName()); private static RAImageIngestModule defaultInstance = null; diff --git a/SevenZip/src/org/sleuthkit/autopsy/sevenzip/SevenZipIngestModule.java b/SevenZip/src/org/sleuthkit/autopsy/sevenzip/SevenZipIngestModule.java index c6b9d9ebde..4f79973dcd 100644 --- a/SevenZip/src/org/sleuthkit/autopsy/sevenzip/SevenZipIngestModule.java +++ b/SevenZip/src/org/sleuthkit/autopsy/sevenzip/SevenZipIngestModule.java @@ -66,7 +66,7 @@ import org.sleuthkit.datamodel.TskData; * * Updates datamodel / directory tree with new files. */ -final class SevenZipIngestModule extends IngestModuleAbstractFile { +public final class SevenZipIngestModule extends IngestModuleAbstractFile { private static final Logger logger = Logger.getLogger(SevenZipIngestModule.class.getName()); public static final String MODULE_NAME = "Archive Extractor"; diff --git a/branding/core/core.jar/org/netbeans/core/startup/Bundle.properties b/branding/core/core.jar/org/netbeans/core/startup/Bundle.properties index e4da187938..f07fd8af64 100644 --- a/branding/core/core.jar/org/netbeans/core/startup/Bundle.properties +++ b/branding/core/core.jar/org/netbeans/core/startup/Bundle.properties @@ -1,5 +1,5 @@ #Updated by build script -#Wed, 22 Jan 2014 16:40:57 -0500 +#Thu, 23 Jan 2014 11:33:02 -0500 LBL_splash_window_title=Starting Autopsy SPLASH_HEIGHT=288 SPLASH_WIDTH=538 diff --git a/branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties b/branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties index 6aa65808b0..e96de6ed81 100644 --- a/branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties +++ b/branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties @@ -1,5 +1,5 @@ #Updated by build script -#Wed, 22 Jan 2014 16:40:57 -0500 +#Thu, 23 Jan 2014 11:33:02 -0500 CTL_MainWindow_Title=Autopsy 3.0.8 CTL_MainWindow_Title_No_Project=Autopsy 3.0.8 diff --git a/thunderbirdparser/src/org/sleuthkit/autopsy/thunderbirdparser/ThunderbirdMboxFileIngestModule.java b/thunderbirdparser/src/org/sleuthkit/autopsy/thunderbirdparser/ThunderbirdMboxFileIngestModule.java index 4216eec00c..4527cf737b 100644 --- a/thunderbirdparser/src/org/sleuthkit/autopsy/thunderbirdparser/ThunderbirdMboxFileIngestModule.java +++ b/thunderbirdparser/src/org/sleuthkit/autopsy/thunderbirdparser/ThunderbirdMboxFileIngestModule.java @@ -48,7 +48,7 @@ import org.sleuthkit.datamodel.TskException; * File-level ingest module that detects MBOX files based on signature. * Understands Thunderbird folder layout to provide additional structure and metadata. */ -class ThunderbirdMboxFileIngestModule extends IngestModuleAbstractFile { +public class ThunderbirdMboxFileIngestModule extends IngestModuleAbstractFile { private static final Logger logger = Logger.getLogger(ThunderbirdMboxFileIngestModule.class.getName()); private static ThunderbirdMboxFileIngestModule instance = null; From 2f6ee5d29e2a8a9e2cc9be23b0a62b1832efea1a Mon Sep 17 00:00:00 2001 From: alexjacks92 Date: Thu, 23 Jan 2014 12:43:46 -0500 Subject: [PATCH 17/38] Changing pull back to main repos instead of mine. --- test/script/srcupdater.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/script/srcupdater.py b/test/script/srcupdater.py index 1a19ea9568..c444be2346 100755 --- a/test/script/srcupdater.py +++ b/test/script/srcupdater.py @@ -81,7 +81,7 @@ def gitPull(TskOrAutopsy, branch): print("Checking out " + branch) call = ["git", "checkout", branch] subprocess.call(call, stdout=sys.stdout, cwd=ccwd) - toPull = "https://www.github.com/alexjacks92/" + TskOrAutopsy + toPull = "https://www.github.com/sleuthkit/" + TskOrAutopsy call = ["git", "pull", toPull, branch] if TskOrAutopsy == "sleuthkit": ccwd = os.path.join("..", "..", "..", "sleuthkit") From da6cac634cb5e40eaa6eb6d2cc49cc3ba26de690 Mon Sep 17 00:00:00 2001 From: alexjacks92 Date: Thu, 23 Jan 2014 12:51:18 -0500 Subject: [PATCH 18/38] Rogue parenthesis deleted. --- test/script/regression.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/script/regression.py b/test/script/regression.py index 0d09f72a22..2344073213 100755 --- a/test/script/regression.py +++ b/test/script/regression.py @@ -743,7 +743,7 @@ class TestResultsDiffer(object): gold_bb_dump = test_data.get_sorted_data_path(DBType.GOLD) gold_dump = test_data.get_db_dump_path(DBType.GOLD) test_data.db_diff_passed = all(TskDbDiff(output_db, gold_db, output_dir=output_dir, gold_bb_dump=gold_bb_dump, - gold_dump=gold_dump).run_diff()) + gold_dump=gold_dump.run_diff()) # Compare Exceptions # replace is a fucntion that replaces strings of digits with 'd' From 2fe7e16df459be241af951bff231444851f4c071 Mon Sep 17 00:00:00 2001 From: shahit2 Date: Thu, 23 Jan 2014 13:10:17 -0500 Subject: [PATCH 19/38] committing changed files --- .../sleuthkit/autopsy/corecomponents/MediaViewImagePanel.java | 2 +- .../core/core.jar/org/netbeans/core/startup/Bundle.properties | 2 +- .../org/netbeans/core/windows/view/ui/Bundle.properties | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/MediaViewImagePanel.java b/Core/src/org/sleuthkit/autopsy/corecomponents/MediaViewImagePanel.java index 596cf66657..e5acab4cb7 100644 --- a/Core/src/org/sleuthkit/autopsy/corecomponents/MediaViewImagePanel.java +++ b/Core/src/org/sleuthkit/autopsy/corecomponents/MediaViewImagePanel.java @@ -44,7 +44,7 @@ import org.sleuthkit.datamodel.ReadContentInputStream; * Container for the image viewer part of media view, on a layered pane. To be * used with JavaFx image viewer only. */ - class MediaViewImagePanel extends javax.swing.JPanel { + public class MediaViewImagePanel extends javax.swing.JPanel { private JFXPanel fxPanel; private ImageView fxImageView; diff --git a/branding/core/core.jar/org/netbeans/core/startup/Bundle.properties b/branding/core/core.jar/org/netbeans/core/startup/Bundle.properties index f07fd8af64..a51330723b 100644 --- a/branding/core/core.jar/org/netbeans/core/startup/Bundle.properties +++ b/branding/core/core.jar/org/netbeans/core/startup/Bundle.properties @@ -1,5 +1,5 @@ #Updated by build script -#Thu, 23 Jan 2014 11:33:02 -0500 +#Thu, 23 Jan 2014 13:04:11 -0500 LBL_splash_window_title=Starting Autopsy SPLASH_HEIGHT=288 SPLASH_WIDTH=538 diff --git a/branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties b/branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties index e96de6ed81..2bfb0a17ea 100644 --- a/branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties +++ b/branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties @@ -1,5 +1,5 @@ #Updated by build script -#Thu, 23 Jan 2014 11:33:02 -0500 +#Thu, 23 Jan 2014 13:04:11 -0500 CTL_MainWindow_Title=Autopsy 3.0.8 CTL_MainWindow_Title_No_Project=Autopsy 3.0.8 From 17011d3031d8c31a0a731bb040a1cc217f5c252c Mon Sep 17 00:00:00 2001 From: Brian Carrier Date: Thu, 23 Jan 2014 13:29:28 -0500 Subject: [PATCH 22/38] fixed reporting bugs, detect thumbnail images by blackboard --- .../autopsy/coreutils/ImageUtils.java | 47 +++++-- .../autopsy/report/ReportGenerator.java | 124 ++++++++++++------ .../sleuthkit/autopsy/report/ReportHTML.java | 57 +++----- 3 files changed, 142 insertions(+), 86 deletions(-) diff --git a/Core/src/org/sleuthkit/autopsy/coreutils/ImageUtils.java b/Core/src/org/sleuthkit/autopsy/coreutils/ImageUtils.java index ea50eebda7..f53834c3b0 100755 --- a/Core/src/org/sleuthkit/autopsy/coreutils/ImageUtils.java +++ b/Core/src/org/sleuthkit/autopsy/coreutils/ImageUtils.java @@ -27,15 +27,19 @@ import java.awt.image.BufferedImage; import java.io.File; import java.io.IOException; import java.io.InputStream; +import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.logging.Level; import javax.imageio.ImageIO; import javax.swing.ImageIcon; +import org.openide.util.Exceptions; import org.sleuthkit.autopsy.casemodule.Case; -import org.sleuthkit.autopsy.contentviewers.Utilities; import org.sleuthkit.autopsy.corelibs.ScalrWrapper; import org.sleuthkit.datamodel.AbstractFile; +import org.sleuthkit.datamodel.BlackboardArtifact; +import org.sleuthkit.datamodel.BlackboardAttribute; +import org.sleuthkit.datamodel.BlackboardAttribute.ATTRIBUTE_TYPE; import org.sleuthkit.datamodel.Content; import org.sleuthkit.datamodel.ReadContentInputStream; import org.sleuthkit.datamodel.TskCoreException; @@ -51,7 +55,7 @@ public class ImageUtils { private static final Logger logger = Logger.getLogger(ImageUtils.class.getName()); private static final Image DEFAULT_ICON = new ImageIcon("/org/sleuthkit/autopsy/images/file-icon.png").getImage(); private static final List SUPP_EXTENSIONS = Arrays.asList(ImageIO.getReaderFileSuffixes()); - + private static final List SUPP_MIME_TYPES = Arrays.asList(ImageIO.getReaderMIMETypes()); /** * Get the default Icon, which is the icon for a file. * @return @@ -72,18 +76,41 @@ public class ImageUtils { } AbstractFile f = (AbstractFile) content; - final String fName = f.getName(); - final int dotIdx = fName.lastIndexOf('.'); - if (dotIdx == -1 || dotIdx == (fName.length() - 1)) { - return isJpegFileHeader(f); + if (f.getSize() == 0) { + return false; } - final String ext = fName.substring(dotIdx + 1).toLowerCase(); + // check the blackboard for a file type attribute + try { + ArrayList attributes = f.getGenInfoAttributes(ATTRIBUTE_TYPE.TSK_FILE_TYPE_SIG); + for (BlackboardAttribute attribute : attributes) { + if (SUPP_MIME_TYPES.contains(attribute.getValueString())) { + return true; + } + } + } + catch (TskCoreException ex) { + logger.log(Level.WARNING, "Error while getting file signature from blackboard.", ex); + } + + final String fName = f.getName(); + final int dotIdx = fName.lastIndexOf('.'); + + // if we have an extension, check it + if ((dotIdx != -1) && (dotIdx != (fName.length() - 1))) { + + final String ext = fName.substring(dotIdx + 1).toLowerCase(); - // Note: thumbnail generator only supports JPG, GIF, and PNG for now - return (f.getSize() > 0 - && SUPP_EXTENSIONS.contains(ext)); + // Note: thumbnail generator only supports JPG, GIF, and PNG for now + if (SUPP_EXTENSIONS.contains(ext)) { + return true; + } + } + + // if no extension or one that is not for an image, then read the content + return isJpegFileHeader(f); } + /** * Get an icon of a specified size. diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportGenerator.java b/Core/src/org/sleuthkit/autopsy/report/ReportGenerator.java index d43b344b13..6bcb210bfc 100644 --- a/Core/src/org/sleuthkit/autopsy/report/ReportGenerator.java +++ b/Core/src/org/sleuthkit/autopsy/report/ReportGenerator.java @@ -383,12 +383,19 @@ public class ReportGenerator { progress.setMaximumProgress(ARTIFACT_TYPE.values().length + 2); // +2 for content and blackboard artifact tags } } - + + + // report on the blackboard results makeBlackboardArtifactTables(); + + // report on the tagged files and artifacts makeContentTagsTables(); makeBlackboardArtifactTagsTables(); + + // report on the tagged images makeThumbnailTable(); + // finish progress, wrap up for (TableReportModule module : tableModules) { tableProgress.get(module).complete(); module.endReport(); @@ -397,11 +404,14 @@ public class ReportGenerator { return 0; } + /** + * Generate the tables for the selected blackboard artifacts + */ private void makeBlackboardArtifactTables() { // Make a comment string describing the tag names filter in effect. StringBuilder comment = new StringBuilder(); if (!tagNamesFilter.isEmpty()) { - comment.append("This report only includes results tagged with: "); + comment.append("Contains results that were tagged with one of the following: "); comment.append(makeCommaSeparatedList(tagNamesFilter)); } @@ -483,6 +493,9 @@ public class ReportGenerator { } } + /** + * Make table for tagged files + */ private void makeContentTagsTables() { // Check for cancellaton. removeCancelledTableReportModules(); @@ -508,7 +521,7 @@ public class ReportGenerator { ArrayList columnHeaders = new ArrayList<>(Arrays.asList("File", "Tag", "Comment")); StringBuilder comment = new StringBuilder(); if (!tagNamesFilter.isEmpty()) { - comment.append("This report only includes file tagged with: "); + comment.append("Contains files that were tagged with one of the following: "); comment.append(makeCommaSeparatedList(tagNamesFilter)); } if (module instanceof ReportHTML) { @@ -524,20 +537,25 @@ public class ReportGenerator { // Give the modules the rows for the content tags. for (ContentTag tag : tags) { - if (passesTagNamesFilter(tag.getName().getDisplayName())) { - checkIfTagHasImage(tag); - ArrayList rowData = new ArrayList<>(Arrays.asList(tag.getContent().getName(), tag.getName().getDisplayName(), tag.getComment())); - for (TableReportModule module : tableModules) { - // @@@ This casting is a tricky little workaround to allow the HTML report module to slip in a content hyperlink. - if (module instanceof ReportHTML) { - ReportHTML htmlReportModule = (ReportHTML)module; - htmlReportModule.addRowWithTaggedContentHyperlink(rowData, tag); - } - else { - module.addRow(rowData); - } - } + // skip tags that we are not reporting on + if (passesTagNamesFilter(tag.getName().getDisplayName()) == false) { + continue; } + + ArrayList rowData = new ArrayList<>(Arrays.asList(tag.getContent().getName(), tag.getName().getDisplayName(), tag.getComment())); + for (TableReportModule module : tableModules) { + // @@@ This casting is a tricky little workaround to allow the HTML report module to slip in a content hyperlink. + if (module instanceof ReportHTML) { + ReportHTML htmlReportModule = (ReportHTML)module; + htmlReportModule.addRowWithTaggedContentHyperlink(rowData, tag); + } + else { + module.addRow(rowData); + } + } + + // see if it is for an image so that we later report on it + checkIfTagHasImage(tag); } // The the modules content tags reporting is ended. @@ -548,6 +566,9 @@ public class ReportGenerator { } } + /** + * Generate the tables for the tagged artifacts + */ private void makeBlackboardArtifactTagsTables() { // Check for cancellaton. removeCancelledTableReportModules(); @@ -579,14 +600,18 @@ public class ReportGenerator { // Give the modules the rows for the content tags. for (BlackboardArtifactTag tag : tags) { - if (passesTagNamesFilter(tag.getName().getDisplayName())) { - checkIfTagHasImage(tag); - List row; - for (TableReportModule module : tableModules) { - row = new ArrayList<>(Arrays.asList(tag.getArtifact().getArtifactTypeName(), tag.getName().getDisplayName(), tag.getComment(), tag.getContent().getName())); - module.addRow(row); - } + if (passesTagNamesFilter(tag.getName().getDisplayName()) == false) { + continue; } + + List row; + for (TableReportModule module : tableModules) { + row = new ArrayList<>(Arrays.asList(tag.getArtifact().getArtifactTypeName(), tag.getName().getDisplayName(), tag.getComment(), tag.getContent().getName())); + module.addRow(row); + } + + // check if the tag is an image that we should later make a thumbnail for + checkIfTagHasImage(tag); } // The the modules blackboard artifact tags reporting is ended. @@ -597,7 +622,12 @@ public class ReportGenerator { } } - boolean passesTagNamesFilter(String tagName) { + /** + * Test if the user requested that this tag be reported on + * @param tagName + * @return true if it should be reported on + */ + private boolean passesTagNamesFilter(String tagName) { return tagNamesFilter.isEmpty() || tagNamesFilter.contains(tagName); } @@ -611,25 +641,36 @@ public class ReportGenerator { } } + /** + * Make a report for the files that were previously found to + * be images. + */ private void makeThumbnailTable() { for (TableReportModule module : tableModules) { - tableProgress.get(module).updateStatusLabel("Now processing Tagged Images..."); + tableProgress.get(module).updateStatusLabel("Creating thumbnails..."); if (module instanceof ReportHTML) { ReportHTML htmlModule = (ReportHTML) module; - htmlModule.startDataType("Tagged Images", "Tagged Results and Contents that contain images."); + htmlModule.startDataType("Thumbnails", "Contains thumbnails of images that are associated with tagged files and results."); List emptyHeaders = new ArrayList<>(); for (int i = 0; i < ReportHTML.THUMBNAIL_COLUMNS; i++) { emptyHeaders.add(""); } htmlModule.startTable(emptyHeaders); + htmlModule.addThumbnailRows(images); + htmlModule.endTable(); htmlModule.endDataType(); } } } + /** + * Analyze artifact associated with tag and add to internal list if it is associated + * with an image. + * @param artifactTag + */ private void checkIfTagHasImage(BlackboardArtifactTag artifactTag) { AbstractFile file; try { @@ -638,34 +679,37 @@ public class ReportGenerator { logger.log(Level.WARNING, "Error while getting content from a blackboard artifact to report on.", ex); return; } - - if (file.isDir() || - file.getType() == TskData.TSK_DB_FILES_TYPE_ENUM.UNALLOC_BLOCKS || - file.getType() == TskData.TSK_DB_FILES_TYPE_ENUM.UNUSED_BLOCKS) { - return; - } - - // Only include content for images - if (ImageUtils.thumbnailSupported(file)) { - images.add(file); - } + checkIfFileIsImage(file); } + /** + * Analyze file that tag is associated with and determine if + * it is an image and should have a thumbnail reported for it. + * Images are added to internal list. + * @param contentTag + */ private void checkIfTagHasImage(ContentTag contentTag) { Content c = contentTag.getContent(); if (c instanceof AbstractFile == false) { return; } - AbstractFile file = (AbstractFile) c; + checkIfFileIsImage((AbstractFile) c); + } + /** + * If file is an image file, add it to the internal 'images' list. + * @param file + */ + private void checkIfFileIsImage(AbstractFile file) { + if (file.isDir() || file.getType() == TskData.TSK_DB_FILES_TYPE_ENUM.UNALLOC_BLOCKS || file.getType() == TskData.TSK_DB_FILES_TYPE_ENUM.UNUSED_BLOCKS) { return; } - if (ImageUtils.thumbnailSupported(c)) { - images.add(c); + if (ImageUtils.thumbnailSupported(file)) { + images.add(file); } } } diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportHTML.java b/Core/src/org/sleuthkit/autopsy/report/ReportHTML.java index 5eef5996dd..318da83853 100644 --- a/Core/src/org/sleuthkit/autopsy/report/ReportHTML.java +++ b/Core/src/org/sleuthkit/autopsy/report/ReportHTML.java @@ -533,42 +533,13 @@ public class ReportHTML implements TableReportModule { return; } - // Make a folder for the local file with the same tagName as the tag. - StringBuilder localFilePath = new StringBuilder(); - localFilePath.append(path); - localFilePath.append(contentTag.getName().getDisplayName()); - File localFileFolder = new File(localFilePath.toString()); - if (!localFileFolder.exists()) { - localFileFolder.mkdirs(); - } - - // Construct a file tagName for the local file that incorporates the file id to ensure uniqueness. - String fileName = file.getName(); - String objectIdSuffix = "_" + file.getId(); - int lastDotIndex = fileName.lastIndexOf("."); - if (lastDotIndex != -1 && lastDotIndex != 0) { - // The file tagName has a conventional extension. Insert the object id before the '.' of the extension. - fileName = fileName.substring(0, lastDotIndex) + objectIdSuffix + fileName.substring(lastDotIndex, fileName.length()); - } - else { - // The file has no extension or the only '.' in the file is an initial '.', as in a hidden file. - // Add the object id to the end of the file tagName. - fileName += objectIdSuffix; - } - localFilePath.append(File.separator); - localFilePath.append(fileName); - - // If the local file doesn't already exist, create it now. - // The existence check is necessary because it is possible to apply multiple tags with the same tagName to a file. - File localFile = new File(localFilePath.toString()); - if (!localFile.exists()) { - ExtractFscContentVisitor.extract(file, localFile, null, null); - } + // save it in a folder based on the tag name + String localFilePath = saveContent(file, contentTag.getName().getDisplayName()); // Add the hyperlink to the row. A column header for it was created in startTable(). StringBuilder localFileLink = new StringBuilder(); localFileLink.append("View File"); row.add(localFileLink.toString()); @@ -628,17 +599,21 @@ public class ReportHTML implements TableReportModule { AbstractFile file = (AbstractFile) content; - String contentPath = saveContent(file); + // save copies of the orginal image and thumbnail image String thumbnailPath = prepareThumbnail(file); if (thumbnailPath == null) { continue; } + String contentPath = saveContent(file, "thumbs_fullsize"); + StringBuilder linkToThumbnail = new StringBuilder(); linkToThumbnail.append(""); linkToThumbnail.append(""); - linkToThumbnail.append(""); + linkToThumbnail.append("
"); + linkToThumbnail.append(file.getName()).append("
"); + // @@@ Add tags here currentRow.add(linkToThumbnail.toString()); totalCount++; @@ -670,11 +645,21 @@ public class ReportHTML implements TableReportModule { return false; } - public String saveContent(AbstractFile file) { + /** + * Save a local copy of the given file in the reports folder. + * @param file File to save + * @param dirName Custom top-level folder to use to store the files in (tag name, etc.) + * @return Path to where file was stored + */ + public String saveContent(AbstractFile file, String dirName) { + // clean up the dir name passed in + String dirName2 = dirName.replace("/", "_"); + dirName2 = dirName2.replace("\\", "_"); + // Make a folder for the local file with the same tagName as the tag. StringBuilder localFilePath = new StringBuilder(); localFilePath.append(path); - localFilePath.append("tagged_images"); + localFilePath.append(dirName2); File localFileFolder = new File(localFilePath.toString()); if (!localFileFolder.exists()) { localFileFolder.mkdirs(); From 8ebc996044f710cb16a0a3c198c257f09ce0c410 Mon Sep 17 00:00:00 2001 From: Brian Carrier Date: Thu, 23 Jan 2014 13:54:10 -0500 Subject: [PATCH 23/38] updated descriptions of modules, sort order, and layout of wizard --- .../sleuthkit/autopsy/report/FileReportText.java | 2 +- .../sleuthkit/autopsy/report/ReportExcel.java | 2 +- .../org/sleuthkit/autopsy/report/ReportHTML.java | 2 +- .../autopsy/report/ReportVisualPanel1.form | 6 +++--- .../autopsy/report/ReportVisualPanel1.java | 16 +++++++++++++--- 5 files changed, 19 insertions(+), 9 deletions(-) diff --git a/Core/src/org/sleuthkit/autopsy/report/FileReportText.java b/Core/src/org/sleuthkit/autopsy/report/FileReportText.java index 45ef9d736c..ecfc85a49c 100755 --- a/Core/src/org/sleuthkit/autopsy/report/FileReportText.java +++ b/Core/src/org/sleuthkit/autopsy/report/FileReportText.java @@ -123,7 +123,7 @@ public class FileReportText implements FileReportModule { @Override public String getDescription() { - return "A tab delimited text file containing information about files in the case."; + return "A tab delimited text file containing information about individual files in the case."; } @Override diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportExcel.java b/Core/src/org/sleuthkit/autopsy/report/ReportExcel.java index 5a221e6ef6..aa8eb8fa15 100644 --- a/Core/src/org/sleuthkit/autopsy/report/ReportExcel.java +++ b/Core/src/org/sleuthkit/autopsy/report/ReportExcel.java @@ -282,7 +282,7 @@ public class ReportExcel implements TableReportModule { @Override public String getDescription() { - return "An XLS formatted report which is meant to be viewed in Excel."; + return "A report about results and tagged items in Excel (XLS) format."; } @Override diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportHTML.java b/Core/src/org/sleuthkit/autopsy/report/ReportHTML.java index 318da83853..faa9c0612c 100644 --- a/Core/src/org/sleuthkit/autopsy/report/ReportHTML.java +++ b/Core/src/org/sleuthkit/autopsy/report/ReportHTML.java @@ -715,7 +715,7 @@ public class ReportHTML implements TableReportModule { @Override public String getDescription() { - return "An HTML formatted report, designed to be viewed in a modern browser."; + return "A report about results and tagged items in HTML format."; } diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportVisualPanel1.form b/Core/src/org/sleuthkit/autopsy/report/ReportVisualPanel1.form index 3ada6ba5e7..aa4e559ef5 100644 --- a/Core/src/org/sleuthkit/autopsy/report/ReportVisualPanel1.form +++ b/Core/src/org/sleuthkit/autopsy/report/ReportVisualPanel1.form @@ -44,11 +44,11 @@ - - + + - + diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportVisualPanel1.java b/Core/src/org/sleuthkit/autopsy/report/ReportVisualPanel1.java index a9da09980a..fd76c6f45e 100644 --- a/Core/src/org/sleuthkit/autopsy/report/ReportVisualPanel1.java +++ b/Core/src/org/sleuthkit/autopsy/report/ReportVisualPanel1.java @@ -76,6 +76,16 @@ public final class ReportVisualPanel1 extends JPanel implements ListSelectionLis Collections.sort(modules, new Comparator() { @Override public int compare(ReportModule rm1, ReportModule rm2) { + // our theory is that the report table modules are more common, so they go on top + boolean rm1isTable = (rm1 instanceof TableReportModule); + boolean rm2isTable = (rm2 instanceof TableReportModule); + if (rm1isTable && !rm2isTable) { + return -1; + } + if (!rm1isTable && rm2isTable) { + return 1; + } + return rm1.getName().compareTo(rm2.getName()); } }); @@ -207,10 +217,10 @@ public final class ReportVisualPanel1 extends JPanel implements ListSelectionLis .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(layout.createSequentialGroup() - .addComponent(configurationPanel, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .addComponent(descriptionScrollPane, javax.swing.GroupLayout.PREFERRED_SIZE, 32, javax.swing.GroupLayout.PREFERRED_SIZE) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(descriptionScrollPane, javax.swing.GroupLayout.PREFERRED_SIZE, 32, javax.swing.GroupLayout.PREFERRED_SIZE)) - .addComponent(modulesScrollPane)) + .addComponent(configurationPanel, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) + .addComponent(modulesScrollPane, javax.swing.GroupLayout.DEFAULT_SIZE, 208, Short.MAX_VALUE)) .addContainerGap()) ); }// //GEN-END:initComponents From cfa50f4345a4db4bfb2ee4d8b4c276e014f79c9d Mon Sep 17 00:00:00 2001 From: Brian Carrier Date: Thu, 23 Jan 2014 16:07:19 -0500 Subject: [PATCH 24/38] reporting uses new extension code, displays full path and tag names, can be moved around (relative paths) --- .../autopsy/coreutils/ImageUtils.java | 10 ++--- .../autopsy/report/ReportGenerator.java | 12 ++++- .../sleuthkit/autopsy/report/ReportHTML.java | 45 +++++++++++++++---- 3 files changed, 50 insertions(+), 17 deletions(-) diff --git a/Core/src/org/sleuthkit/autopsy/coreutils/ImageUtils.java b/Core/src/org/sleuthkit/autopsy/coreutils/ImageUtils.java index f53834c3b0..f1fa3714ee 100755 --- a/Core/src/org/sleuthkit/autopsy/coreutils/ImageUtils.java +++ b/Core/src/org/sleuthkit/autopsy/coreutils/ImageUtils.java @@ -93,16 +93,12 @@ public class ImageUtils { logger.log(Level.WARNING, "Error while getting file signature from blackboard.", ex); } - final String fName = f.getName(); - final int dotIdx = fName.lastIndexOf('.'); + final String extension = f.getNameExtension(); // if we have an extension, check it - if ((dotIdx != -1) && (dotIdx != (fName.length() - 1))) { - - final String ext = fName.substring(dotIdx + 1).toLowerCase(); - + if (extension.equals("") == false) { // Note: thumbnail generator only supports JPG, GIF, and PNG for now - if (SUPP_EXTENSIONS.contains(ext)) { + if (SUPP_EXTENSIONS.contains(extension)) { return true; } } diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportGenerator.java b/Core/src/org/sleuthkit/autopsy/report/ReportGenerator.java index 6bcb210bfc..63a0fd2747 100644 --- a/Core/src/org/sleuthkit/autopsy/report/ReportGenerator.java +++ b/Core/src/org/sleuthkit/autopsy/report/ReportGenerator.java @@ -46,6 +46,7 @@ import javax.swing.JDialog; import javax.swing.JFrame; import javax.swing.SwingWorker; import org.openide.filesystems.FileUtil; +import org.openide.util.Exceptions; import org.sleuthkit.autopsy.casemodule.Case; import org.sleuthkit.autopsy.coreutils.EscapeUtil; import org.sleuthkit.autopsy.coreutils.ImageUtils; @@ -87,7 +88,7 @@ public class ReportGenerator { static final String REPORTS_DIR = "Reports"; ReportGenerator(Map tableModuleStates, Map generalModuleStates, Map fileListModuleStates) { - // Create the root reports directory path of the form: /Reports/ / + // Create the root reports directory path of the form: /Reports/ / DateFormat dateFormat = new SimpleDateFormat("MM-dd-yyyy-HH-mm-ss"); Date date = new Date(); String dateNoTime = dateFormat.format(date); @@ -542,7 +543,14 @@ public class ReportGenerator { continue; } - ArrayList rowData = new ArrayList<>(Arrays.asList(tag.getContent().getName(), tag.getName().getDisplayName(), tag.getComment())); + String fileName; + try { + fileName = tag.getContent().getUniquePath(); + } catch (TskCoreException ex) { + fileName = tag.getContent().getName(); + } + + ArrayList rowData = new ArrayList<>(Arrays.asList(fileName, tag.getName().getDisplayName(), tag.getComment())); for (TableReportModule module : tableModules) { // @@@ This casting is a tricky little workaround to allow the HTML report module to slip in a content hyperlink. if (module instanceof ReportHTML) { diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportHTML.java b/Core/src/org/sleuthkit/autopsy/report/ReportHTML.java index faa9c0612c..2cccef4c35 100644 --- a/Core/src/org/sleuthkit/autopsy/report/ReportHTML.java +++ b/Core/src/org/sleuthkit/autopsy/report/ReportHTML.java @@ -44,6 +44,8 @@ import org.openide.filesystems.FileObject; import org.openide.util.Exceptions; import org.sleuthkit.autopsy.casemodule.Case; import org.openide.filesystems.FileUtil; +import org.sleuthkit.autopsy.casemodule.services.Services; +import org.sleuthkit.autopsy.casemodule.services.TagsManager; import org.sleuthkit.autopsy.coreutils.ImageUtils; import org.sleuthkit.autopsy.coreutils.Logger; import org.sleuthkit.autopsy.datamodel.ContentUtils.ExtractFscContentVisitor; @@ -538,7 +540,7 @@ public class ReportHTML implements TableReportModule { // Add the hyperlink to the row. A column header for it was created in startTable(). StringBuilder localFileLink = new StringBuilder(); - localFileLink.append("View File"); row.add(localFileLink.toString()); @@ -605,15 +607,39 @@ public class ReportHTML implements TableReportModule { continue; } String contentPath = saveContent(file, "thumbs_fullsize"); + String nameInImage; + try { + nameInImage = file.getUniquePath(); + } catch (TskCoreException ex) { + nameInImage = file.getName(); + } StringBuilder linkToThumbnail = new StringBuilder(); - linkToThumbnail.append(""); - linkToThumbnail.append(""); + linkToThumbnail.append(""); linkToThumbnail.append("
"); linkToThumbnail.append(file.getName()).append("
"); - // @@@ Add tags here + + Services services = currentCase.getServices(); + TagsManager tagsManager = services.getTagsManager(); + try { + List tags = tagsManager.getContentTagsByContent(content); + if (tags.size() > 0) { + linkToThumbnail.append("Tags: " ); + } + for (int i = 0; i < tags.size(); i++) { + ContentTag tag = tags.get(i); + linkToThumbnail.append(tag.getName().getDisplayName()); + if (i != tags.size() - 1) { + linkToThumbnail.append(", "); + } + } + } catch (TskCoreException ex) { + logger.log(Level.WARNING, "Could not find get tags for file.", ex); + } + currentRow.add(linkToThumbnail.toString()); totalCount++; @@ -649,7 +675,7 @@ public class ReportHTML implements TableReportModule { * Save a local copy of the given file in the reports folder. * @param file File to save * @param dirName Custom top-level folder to use to store the files in (tag name, etc.) - * @return Path to where file was stored + * @return Path to where file was stored (relative to root of HTML folder) */ public String saveContent(AbstractFile file, String dirName) { // clean up the dir name passed in @@ -657,8 +683,9 @@ public class ReportHTML implements TableReportModule { dirName2 = dirName2.replace("\\", "_"); // Make a folder for the local file with the same tagName as the tag. - StringBuilder localFilePath = new StringBuilder(); - localFilePath.append(path); + StringBuilder localFilePath = new StringBuilder(); // full path + + localFilePath.append(path); localFilePath.append(dirName2); File localFileFolder = new File(localFilePath.toString()); if (!localFileFolder.exists()) { @@ -687,7 +714,9 @@ public class ReportHTML implements TableReportModule { if (!localFile.exists()) { ExtractFscContentVisitor.extract(file, localFile, null, null); } - return localFilePath.toString(); + + // get the relative path + return localFilePath.toString().substring(path.length()); } /** From f6ccd898e607d5994f4fe27abd2415e465ab2ee6 Mon Sep 17 00:00:00 2001 From: Brian Carrier Date: Thu, 23 Jan 2014 17:16:12 -0500 Subject: [PATCH 25/38] renamed execute method in IngestManager to scheduleDataSource --- .../ingest/GeneralIngestConfigurator.java | 2 +- .../sleuthkit/autopsy/ingest/IngestManager.java | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Core/src/org/sleuthkit/autopsy/ingest/GeneralIngestConfigurator.java b/Core/src/org/sleuthkit/autopsy/ingest/GeneralIngestConfigurator.java index a9769a5b5b..203e98cbe8 100644 --- a/Core/src/org/sleuthkit/autopsy/ingest/GeneralIngestConfigurator.java +++ b/Core/src/org/sleuthkit/autopsy/ingest/GeneralIngestConfigurator.java @@ -197,7 +197,7 @@ public class GeneralIngestConfigurator implements IngestConfigurator { if (!modulesToStart.isEmpty() && contentToIngest != null) { // Queue the ingest process. - manager.execute(modulesToStart, contentToIngest); + manager.scheduleDataSource(modulesToStart, contentToIngest); } } diff --git a/Core/src/org/sleuthkit/autopsy/ingest/IngestManager.java b/Core/src/org/sleuthkit/autopsy/ingest/IngestManager.java index 671325412d..2c30a8f32e 100644 --- a/Core/src/org/sleuthkit/autopsy/ingest/IngestManager.java +++ b/Core/src/org/sleuthkit/autopsy/ingest/IngestManager.java @@ -277,13 +277,13 @@ public class IngestManager { } /** - * Multiple data-sources version of execute() method. Enqueues multiple sources inputs (Content objects) + * Multiple data-sources version of scheduleDataSource() method. Enqueues multiple sources inputs (Content objects) * and associated modules at once * - * @param modules modules to execute on every data source - * @param inputs input data sources to enqueue and execute the ingest modules on + * @param modules modules to scheduleDataSource on every data source + * @param inputs input data sources to enqueue and scheduleDataSource the ingest modules on */ - public void execute(final List modules, final List inputs) { + public void scheduleDataSource(final List modules, final List inputs) { logger.log(Level.INFO, "Will enqueue number of inputs: " + inputs.size() + " to " + modules.size() + " modules."); @@ -310,14 +310,14 @@ public class IngestManager { * not block and can be called multiple times to enqueue more work to * already running background ingest process. * - * @param modules modules to execute on the data source input - * @param input input data source Content objects to execute the ingest modules on + * @param modules modules to scheduleDataSource on the data source input + * @param input input data source Content objects to scheduleDataSource the ingest modules on */ - public void execute(final List modules, final Content input) { + public void scheduleDataSource(final List modules, final Content input) { List inputs = new ArrayList(); inputs.add(input); logger.log(Level.INFO, "Will enqueue input: " + input.getName()); - execute(modules, inputs); + scheduleDataSource(modules, inputs); } /** From a23ee1317a123eebe211f4dc5f73b3134f4542de Mon Sep 17 00:00:00 2001 From: alexjacks92 Date: Fri, 24 Jan 2014 10:03:05 -0500 Subject: [PATCH 26/38] Fixed a parenthesis matching issue. --- test/script/regression.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/script/regression.py b/test/script/regression.py index 2344073213..0d09f72a22 100755 --- a/test/script/regression.py +++ b/test/script/regression.py @@ -743,7 +743,7 @@ class TestResultsDiffer(object): gold_bb_dump = test_data.get_sorted_data_path(DBType.GOLD) gold_dump = test_data.get_db_dump_path(DBType.GOLD) test_data.db_diff_passed = all(TskDbDiff(output_db, gold_db, output_dir=output_dir, gold_bb_dump=gold_bb_dump, - gold_dump=gold_dump.run_diff()) + gold_dump=gold_dump).run_diff()) # Compare Exceptions # replace is a fucntion that replaces strings of digits with 'd' From 7287ada1dca97234aa41e6e4aa002d6572857a4f Mon Sep 17 00:00:00 2001 From: shahit2 Date: Fri, 24 Jan 2014 10:41:37 -0500 Subject: [PATCH 27/38] restore state of platform.properties --- nbproject/platform.properties | 111 +++++++++++++++++++++++++++++++++- 1 file changed, 110 insertions(+), 1 deletion(-) diff --git a/nbproject/platform.properties b/nbproject/platform.properties index 785d1b0ed1..a9fa87f749 100644 --- a/nbproject/platform.properties +++ b/nbproject/platform.properties @@ -6,6 +6,115 @@ harness.dir=${nbplatform.active.dir}/harness bootstrap.url=http://deadlock.netbeans.org/hudson/job/nbms-and-javadoc/lastStableBuild/artifact/nbbuild/netbeans/harness/tasks.jar autoupdate.catalog.url=http://dlc.sun.com.edgesuite.net/netbeans/updates/${netbeans-plat-version}/uc/final/distribution/catalog.xml.gz cluster.path=\ + ${nbplatform.active.dir}/harness:\ + ${nbplatform.active.dir}/java:\ ${nbplatform.active.dir}/platform -disabled.modules= +disabled.modules=\ + org.apache.tools.ant.module,\ + org.netbeans.api.debugger.jpda,\ + org.netbeans.api.java,\ + org.netbeans.lib.nbjavac,\ + org.netbeans.libs.cglib,\ + org.netbeans.libs.javacapi,\ + org.netbeans.libs.javacimpl,\ + org.netbeans.libs.springframework,\ + org.netbeans.modules.ant.browsetask,\ + org.netbeans.modules.ant.debugger,\ + org.netbeans.modules.ant.freeform,\ + org.netbeans.modules.ant.grammar,\ + org.netbeans.modules.ant.kit,\ + org.netbeans.modules.beans,\ + org.netbeans.modules.classfile,\ + org.netbeans.modules.dbschema,\ + org.netbeans.modules.debugger.jpda,\ + org.netbeans.modules.debugger.jpda.ant,\ + org.netbeans.modules.debugger.jpda.kit,\ + org.netbeans.modules.debugger.jpda.projects,\ + org.netbeans.modules.debugger.jpda.ui,\ + org.netbeans.modules.debugger.jpda.visual,\ + org.netbeans.modules.findbugs.installer,\ + org.netbeans.modules.form,\ + org.netbeans.modules.form.binding,\ + org.netbeans.modules.form.j2ee,\ + org.netbeans.modules.form.kit,\ + org.netbeans.modules.form.nb,\ + org.netbeans.modules.form.refactoring,\ + org.netbeans.modules.hibernate,\ + org.netbeans.modules.hibernatelib,\ + org.netbeans.modules.hudson.ant,\ + org.netbeans.modules.hudson.maven,\ + org.netbeans.modules.i18n,\ + org.netbeans.modules.i18n.form,\ + org.netbeans.modules.j2ee.core.utilities,\ + org.netbeans.modules.j2ee.eclipselink,\ + org.netbeans.modules.j2ee.eclipselinkmodelgen,\ + org.netbeans.modules.j2ee.jpa.refactoring,\ + org.netbeans.modules.j2ee.jpa.verification,\ + org.netbeans.modules.j2ee.metadata,\ + org.netbeans.modules.j2ee.metadata.model.support,\ + org.netbeans.modules.j2ee.persistence,\ + org.netbeans.modules.j2ee.persistence.kit,\ + org.netbeans.modules.j2ee.persistenceapi,\ + org.netbeans.modules.java.api.common,\ + org.netbeans.modules.java.debug,\ + org.netbeans.modules.java.editor,\ + org.netbeans.modules.java.editor.lib,\ + org.netbeans.modules.java.examples,\ + org.netbeans.modules.java.freeform,\ + org.netbeans.modules.java.guards,\ + org.netbeans.modules.java.helpset,\ + org.netbeans.modules.java.hints,\ + org.netbeans.modules.java.hints.declarative,\ + org.netbeans.modules.java.hints.declarative.test,\ + org.netbeans.modules.java.hints.legacy.spi,\ + org.netbeans.modules.java.hints.test,\ + org.netbeans.modules.java.hints.ui,\ + org.netbeans.modules.java.j2seplatform,\ + org.netbeans.modules.java.j2seproject,\ + org.netbeans.modules.java.kit,\ + org.netbeans.modules.java.lexer,\ + org.netbeans.modules.java.navigation,\ + org.netbeans.modules.java.platform,\ + org.netbeans.modules.java.preprocessorbridge,\ + org.netbeans.modules.java.project,\ + org.netbeans.modules.java.source,\ + org.netbeans.modules.java.source.ant,\ + org.netbeans.modules.java.source.queries,\ + org.netbeans.modules.java.source.queriesimpl,\ + org.netbeans.modules.java.sourceui,\ + org.netbeans.modules.java.testrunner,\ + org.netbeans.modules.javadoc,\ + org.netbeans.modules.javawebstart,\ + org.netbeans.modules.junit,\ + org.netbeans.modules.maven,\ + org.netbeans.modules.maven.checkstyle,\ + org.netbeans.modules.maven.coverage,\ + org.netbeans.modules.maven.embedder,\ + org.netbeans.modules.maven.grammar,\ + org.netbeans.modules.maven.graph,\ + org.netbeans.modules.maven.hints,\ + org.netbeans.modules.maven.indexer,\ + org.netbeans.modules.maven.junit,\ + org.netbeans.modules.maven.kit,\ + org.netbeans.modules.maven.model,\ + org.netbeans.modules.maven.osgi,\ + org.netbeans.modules.maven.persistence,\ + org.netbeans.modules.maven.refactoring,\ + org.netbeans.modules.maven.repository,\ + org.netbeans.modules.maven.search,\ + org.netbeans.modules.maven.spring,\ + org.netbeans.modules.projectimport.eclipse.core,\ + org.netbeans.modules.projectimport.eclipse.j2se,\ + org.netbeans.modules.refactoring.java,\ + org.netbeans.modules.spellchecker.bindings.java,\ + org.netbeans.modules.spring.beans,\ + org.netbeans.modules.testng,\ + org.netbeans.modules.testng.ant,\ + org.netbeans.modules.testng.maven,\ + org.netbeans.modules.websvc.jaxws21,\ + org.netbeans.modules.websvc.jaxws21api,\ + org.netbeans.modules.websvc.saas.codegen.java,\ + org.netbeans.modules.xml.jaxb,\ + org.netbeans.modules.xml.tools.java,\ + org.netbeans.spi.java.hints From 2e0b2fc1bb2599cc4598c49214f028907f030349 Mon Sep 17 00:00:00 2001 From: shahit2 Date: Fri, 24 Jan 2014 11:20:26 -0500 Subject: [PATCH 28/38] reverting unneeded changes to form files and bundles --- .../org/sleuthkit/autopsy/casemodule/NewCaseVisualPanel2.form | 2 +- .../corecomponents/AdvancedConfigurationCleanDialog.form | 1 - .../autopsy/corecomponents/AdvancedConfigurationDialog.form | 1 - .../autopsy/directorytree/FileSystemDetailsPanel.form | 2 +- .../src/org/sleuthkit/autopsy/filesearch/FileSearchDialog.form | 1 - .../org/sleuthkit/autopsy/ingest/IngestMessageMainPanel.form | 3 +-- .../core/core.jar/org/netbeans/core/startup/Bundle.properties | 2 +- .../org/netbeans/core/windows/view/ui/Bundle.properties | 2 +- 8 files changed, 5 insertions(+), 9 deletions(-) diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/NewCaseVisualPanel2.form b/Core/src/org/sleuthkit/autopsy/casemodule/NewCaseVisualPanel2.form index ed1c2946b7..dccd11860d 100644 --- a/Core/src/org/sleuthkit/autopsy/casemodule/NewCaseVisualPanel2.form +++ b/Core/src/org/sleuthkit/autopsy/casemodule/NewCaseVisualPanel2.form @@ -1,4 +1,4 @@ - + diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/AdvancedConfigurationCleanDialog.form b/Core/src/org/sleuthkit/autopsy/corecomponents/AdvancedConfigurationCleanDialog.form index e4fe6c1770..8c0236cde0 100644 --- a/Core/src/org/sleuthkit/autopsy/corecomponents/AdvancedConfigurationCleanDialog.form +++ b/Core/src/org/sleuthkit/autopsy/corecomponents/AdvancedConfigurationCleanDialog.form @@ -6,7 +6,6 @@ - diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/AdvancedConfigurationDialog.form b/Core/src/org/sleuthkit/autopsy/corecomponents/AdvancedConfigurationDialog.form index 6ea96c271f..c43b3f6718 100644 --- a/Core/src/org/sleuthkit/autopsy/corecomponents/AdvancedConfigurationDialog.form +++ b/Core/src/org/sleuthkit/autopsy/corecomponents/AdvancedConfigurationDialog.form @@ -6,7 +6,6 @@ - diff --git a/Core/src/org/sleuthkit/autopsy/directorytree/FileSystemDetailsPanel.form b/Core/src/org/sleuthkit/autopsy/directorytree/FileSystemDetailsPanel.form index d4e1afe874..6892af7264 100644 --- a/Core/src/org/sleuthkit/autopsy/directorytree/FileSystemDetailsPanel.form +++ b/Core/src/org/sleuthkit/autopsy/directorytree/FileSystemDetailsPanel.form @@ -1,4 +1,4 @@ - + diff --git a/Core/src/org/sleuthkit/autopsy/filesearch/FileSearchDialog.form b/Core/src/org/sleuthkit/autopsy/filesearch/FileSearchDialog.form index 5bf5b4bdcd..d7cde123fa 100644 --- a/Core/src/org/sleuthkit/autopsy/filesearch/FileSearchDialog.form +++ b/Core/src/org/sleuthkit/autopsy/filesearch/FileSearchDialog.form @@ -6,7 +6,6 @@ - diff --git a/Core/src/org/sleuthkit/autopsy/ingest/IngestMessageMainPanel.form b/Core/src/org/sleuthkit/autopsy/ingest/IngestMessageMainPanel.form index 0c3054593b..b435917e0c 100644 --- a/Core/src/org/sleuthkit/autopsy/ingest/IngestMessageMainPanel.form +++ b/Core/src/org/sleuthkit/autopsy/ingest/IngestMessageMainPanel.form @@ -1,6 +1,6 @@ - + @@ -11,7 +11,6 @@ - diff --git a/branding/core/core.jar/org/netbeans/core/startup/Bundle.properties b/branding/core/core.jar/org/netbeans/core/startup/Bundle.properties index a51330723b..9fc095c4a7 100644 --- a/branding/core/core.jar/org/netbeans/core/startup/Bundle.properties +++ b/branding/core/core.jar/org/netbeans/core/startup/Bundle.properties @@ -1,5 +1,5 @@ #Updated by build script -#Thu, 23 Jan 2014 13:04:11 -0500 +#Wed, 15 Jan 2014 15:11:33 -0500 LBL_splash_window_title=Starting Autopsy SPLASH_HEIGHT=288 SPLASH_WIDTH=538 diff --git a/branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties b/branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties index 2bfb0a17ea..eaa57124f0 100644 --- a/branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties +++ b/branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties @@ -1,5 +1,5 @@ #Updated by build script -#Thu, 23 Jan 2014 13:04:11 -0500 +#Wed, 15 Jan 2014 15:11:33 -0500 CTL_MainWindow_Title=Autopsy 3.0.8 CTL_MainWindow_Title_No_Project=Autopsy 3.0.8 From 30beb1024d8fb7776145c035fc49cbe0539453dd Mon Sep 17 00:00:00 2001 From: Nick Davis Date: Fri, 24 Jan 2014 18:48:59 -0500 Subject: [PATCH 29/38] Initial extraction of keyword search messages into properties file. --- .gitignore | 1 - .../AbstractKeywordSearchPerformer.java | 38 ++++---- .../autopsy/keywordsearch/Bundle.properties | 91 +++++++++++++++++++ .../keywordsearch/ExtractedContentPanel.java | 4 +- .../keywordsearch/ExtractedContentViewer.java | 14 +-- .../HighlightedMatchesSource.java | 13 ++- .../autopsy/keywordsearch/Installer.java | 25 ++--- .../KeywordSearchConfigurationPanel.java | 12 ++- .../KeywordSearchConfigurationPanel1.java | 19 ++-- .../KeywordSearchEditListPanel.java | 38 ++++---- .../KeywordSearchFilterNode.java | 7 +- .../KeywordSearchIngestModule.java | 55 ++++++----- .../KeywordSearchListsManagementPanel.java | 34 +++---- .../KeywordSearchListsViewerPanel.java | 26 +++--- .../KeywordSearchQueryManager.java | 4 +- 15 files changed, 247 insertions(+), 134 deletions(-) diff --git a/.gitignore b/.gitignore index 24fd05a53f..feb9e958e7 100644 --- a/.gitignore +++ b/.gitignore @@ -36,7 +36,6 @@ !/Ingest/nbproject/project.properties /branding_spear /installer_spear -Bundle_*.properties */genfiles.properties genfiles.properties /branding/core/core.jar/org/netbeans/core/startup/Bundle.properties diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/AbstractKeywordSearchPerformer.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/AbstractKeywordSearchPerformer.java index 436c069698..7e9441c945 100644 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/AbstractKeywordSearchPerformer.java +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/AbstractKeywordSearchPerformer.java @@ -21,9 +21,11 @@ package org.sleuthkit.autopsy.keywordsearch; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.util.List; + import org.sleuthkit.autopsy.ingest.IngestManager; import org.sleuthkit.autopsy.keywordsearch.KeywordSearch.QueryType; import org.sleuthkit.autopsy.keywordsearch.KeywordSearchQueryManager.Presentation; +import org.openide.util.NbBundle; /** * Common functionality among keyword search performers / widgets. @@ -31,6 +33,7 @@ import org.sleuthkit.autopsy.keywordsearch.KeywordSearchQueryManager.Presentatio */ abstract class AbstractKeywordSearchPerformer extends javax.swing.JPanel implements KeywordSearchPerformerInterface { + private final String keywordSearchErrorDialogHeader = org.openide.util.NbBundle.getMessage(this.getClass(), "AbstractKeywordSearchPerformer.search.dialogErrorHeader"); protected int filesIndexed; AbstractKeywordSearchPerformer() { @@ -58,7 +61,7 @@ abstract class AbstractKeywordSearchPerformer extends javax.swing.JPanel impleme * Hook to run after indexed files number changed */ protected abstract void postFilesIndexedChange(); - + @Override public abstract boolean isMultiwordQuery(); @@ -79,25 +82,23 @@ abstract class AbstractKeywordSearchPerformer extends javax.swing.JPanel impleme @Override public void search() { boolean isRunning = IngestManager.getDefault().isModuleRunning(KeywordSearchIngestModule.getDefault()); - + if (filesIndexed == 0) { if (isRunning) { - KeywordSearchUtil.displayDialog("Keyword Search Error", "No files are in index yet.
" - + "Try again later. Index is updated every " + KeywordSearchSettings.getUpdateFrequency().getTime() + " minutes.", KeywordSearchUtil.DIALOG_MESSAGE_TYPE.ERROR); - } - else { - KeywordSearchUtil.displayDialog("Keyword Search Error", "No files were indexed.
" - + "Re-ingest the image with the Keyword Search Module enabled. ", KeywordSearchUtil.DIALOG_MESSAGE_TYPE.ERROR); + KeywordSearchUtil.displayDialog(keywordSearchErrorDialogHeader, NbBundle.getMessage(this.getClass(), + "AbstractKeywordSearchPerformer.search.noFilesInIdxMsg", + KeywordSearchSettings.getUpdateFrequency().getTime()), KeywordSearchUtil.DIALOG_MESSAGE_TYPE.ERROR); + } else { + KeywordSearchUtil.displayDialog(keywordSearchErrorDialogHeader, NbBundle.getMessage(this.getClass(), + "AbstractKeywordSearchPerformer.search.noFilesIdxdMsg"), KeywordSearchUtil.DIALOG_MESSAGE_TYPE.ERROR); } return; } //check if keyword search module ingest is running (indexing, etc) if (isRunning) { - if (KeywordSearchUtil.displayConfirmDialog("Keyword Search Ingest in Progress", - "Keyword Search Ingest is currently running.
" - + "Not all files have been indexed and this search might yield incomplete results.
" - + "Do you want to proceed with this search anyway?", KeywordSearchUtil.DIALOG_MESSAGE_TYPE.WARN) == false) { + if (KeywordSearchUtil.displayConfirmDialog(org.openide.util.NbBundle.getMessage(this.getClass(), "AbstractKeywordSearchPerformer.search.searchIngestInProgressTitle"), + NbBundle.getMessage(this.getClass(), "AbstractKeywordSearchPerformer.search.ingestInProgressBody"), KeywordSearchUtil.DIALOG_MESSAGE_TYPE.WARN) == false) { return; } } @@ -106,12 +107,13 @@ abstract class AbstractKeywordSearchPerformer extends javax.swing.JPanel impleme if (isMultiwordQuery()) { final List keywords = getQueryList(); if (keywords.isEmpty()) { - KeywordSearchUtil.displayDialog("Keyword Search Error", "Keyword list is empty, please add at least one keyword to the list", KeywordSearchUtil.DIALOG_MESSAGE_TYPE.ERROR); + KeywordSearchUtil.displayDialog(keywordSearchErrorDialogHeader, NbBundle.getMessage(this.getClass(), + "AbstractKeywordSearchPerformer.search.emptyKeywordErrorBody"), + KeywordSearchUtil.DIALOG_MESSAGE_TYPE.ERROR); return; } man = new KeywordSearchQueryManager(keywords, Presentation.FLAT); - } - else { + } else { QueryType queryType = null; if (isLuceneQuerySelected()) { queryType = QueryType.WORD; @@ -120,7 +122,8 @@ abstract class AbstractKeywordSearchPerformer extends javax.swing.JPanel impleme } final String queryText = getQueryText(); if (queryText == null || queryText.trim().equals("")) { - KeywordSearchUtil.displayDialog("Keyword Search Error", "Please enter a keyword to search for", KeywordSearchUtil.DIALOG_MESSAGE_TYPE.ERROR); + KeywordSearchUtil.displayDialog(keywordSearchErrorDialogHeader, NbBundle.getMessage(this.getClass(), + "AbstractKeywordSearchPerformer.search.pleaseEnterKeywordBody"), KeywordSearchUtil.DIALOG_MESSAGE_TYPE.ERROR); return; } man = new KeywordSearchQueryManager(getQueryText(), queryType, Presentation.FLAT); @@ -129,7 +132,8 @@ abstract class AbstractKeywordSearchPerformer extends javax.swing.JPanel impleme if (man.validate()) { man.execute(); } else { - KeywordSearchUtil.displayDialog("Keyword Search Error", "Invalid query syntax.", KeywordSearchUtil.DIALOG_MESSAGE_TYPE.ERROR); + KeywordSearchUtil.displayDialog(keywordSearchErrorDialogHeader, NbBundle.getMessage(this.getClass(), + "AbstractKeywordSearchPerformer.search.invalidSyntaxHeader"), KeywordSearchUtil.DIALOG_MESSAGE_TYPE.ERROR); } } } diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Bundle.properties b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Bundle.properties index 7b728c5005..a1e52e41a5 100644 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Bundle.properties +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Bundle.properties @@ -88,3 +88,94 @@ KeywordSearchListsViewerPanel.manageListsButton.toolTipText=Manage keyword lists KeywordSearchConfigurationPanel2.frequencyLabel.text=Results update frequency during ingest: KeywordSearchConfigurationPanel2.timeRadioButton4.text_1=1 minute (faster feedback, longest ingest) KeywordSearchConfigurationPanel2.timeRadioButton4.toolTipText=1 minute (overall ingest time will be longest) +KeywordSearchConfigurationPanel2.showSnippetsCB.text=Show Keyword Preview in Keyword Search Results (will result in longer search times) +AbstractKeywordSearchPerformer.search.dialogErrorHeader=Keyword Search Error +AbstractKeywordSearchPerformer.search.invalidSyntaxHeader=Invalid query syntax. +AbstractKeywordSearchPerformer.search.searchIngestInProgressTitle=Keyword Search Ingest in Progress +AbstractKeywordSearchPerformer.search.ingestInProgressBody=Keyword Search Ingest is currently running.
Not all files have been indexed and this search might yield incomplete results.
Do you want to proceed with this search anyway? +AbstractKeywordSearchPerformer.search.emptyKeywordErrorBody=Keyword list is empty, please add at least one keyword to the list +AbstractKeywordSearchPerformer.search.pleaseEnterKeywordBody=Please enter a keyword to search for +AbstractKeywordSearchPerformer.search.noFilesInIdxMsg=No files are in index yet.
Try again later. Index is updated every {0} minutes. +AbstractKeywordSearchPerformer.search.noFilesIdxdMsg=No files were indexed.
Re-ingest the image with the Keyword Search Module enabled. +ExtractedContentPanel.setMarkup.panelTxt=Loading text... Please wait +ExtractedContentViewer.toString=Extracted Text +ExtractedContentViewer.toolTip=Displays extracted text from files and keyword-search results. Requires Keyword Search ingest to be run on a file to activate this viewer. +ExtractedContentViewer.getTitle=Text +ExtractedContentViewer.getSolrContent.knownFileMsg=

{0} is a known file (based on MD5 hash) and does not have text in the index.

+ExtractedContentViewer.getSolrContent.noTxtYetMsg=

{0} does not have text in the index.
It may have no text, not been analyzed yet, or keyword search was not enabled during ingest.

+ExtractedContentViewer.getSolrContent.txtBodyItal={0} +HighlightedMatchesSource.getMarkup.noMatchMsg=
There were no keyword hits on this page. 
Keyword could have been in file name. 
Advance to another page for hits or choose Extracted Text to view original text..
+HighlightedMatchesSource.toString=Search Results +Installer.reportPortError=Indexing server port {0} is not available. Check if your security software does not block {1} and consider changing {2} in {3} property file in the application user folder. Then try rebooting your system if another process was causing the conflict. +Installer.reportStopPortError=Indexing server stop port {0} is not available. Consider changing {1} in {2} property file in the application user folder. +Installer.errorInitKsmMsg=Error initializing Keyword Search module +Installer.reportInitError=Indexing server port {0} is not available. Check if your security software does not block {1} and consider changing {2} in {3} property file in the application user folder. Then try rebooting your system if another process was causing the conflict. +KeywordSearchConfigurationPanel.customizeComponents.title=Advanced Keyword Search Configuration +KeywordSearchConfigurationPanel.customizeComponents.listTabTitle=Lists +KeywordSearchConfigurationPanel.customizeComponents.stringExtTitle=String Extraction +KeywordSearchConfigurationPanel.customizeComponents.genTabTitle=General +KeywordSearchConfigurationPanel.customizeComponents.listLabToolTip=List configuration +KeywordSearchConfigurationPanel.customizeComponents.stringExtToolTip=String extraction configuration for Keyword Search Ingest +KeywordSearchConfigurationPanel.customizeComponents.genTabToolTip=General configuration +KeywordSearchConfigurationPanel1.customizeComponents.title=Delete a keyword list +KeywordSearchConfigurationPanel1.customizeComponents.body=This will delete the keyword list globally (for all Cases). Do you want to proceed with the deletion? +KeywordSearchConfigurationPanel1.customizeComponents.keywordListEmptyErr=Keyword List is empty and cannot be saved +KeywordSearch.newKwListTitle=New keyword list name\: +KeywordSearchConfigurationPanel1.customizeComponents.noOwDefaultMsg=Cannot overwrite default list +KeywordSearchConfigurationPanel1.customizeComponents.kwListExistMsg=Keyword List <{0}> already exists, do you want to replace it? +KeywordSearchConfigurationPanel1.customizeComponents.kwListSavedMsg=Keyword List <{0}> saved +KeywordSearchEditListPanel.customizeComponents.kwReToolTip=Keyword is a regular expression +KeywordSearchEditListPanel.customizeComponents.addWordToolTip=Add a new word to the keyword search list +KeywordSearchEditListPanel.customizeComponents.enterNewWordToolTip=Enter a new word or regex to search +KeywordSearchEditListPanel.customizeComponents.exportToFile=Export the current keyword list to a file +KeywordSearchEditListPanel.customizeComponents.saveCurrentWIthNewNameToolTip=Save the current keyword list with a new name +KeywordSearchEditListPanel.customizeComponents.removeSelectedMsg=Remove selected keyword(s) from the list +KeywordSearchEditListPanel.newKwTitle=New Keyword Entry +KeywordSearchEditListPanel.addWordButtonAction.kwAlreadyExistsMsg=Keyword already exists in the list. +KeywordSearchEditListPanel.invalidKwMsg=Invalid keyword pattern. Use words or a correct regex pattern. +KeywordSearchEditListPanel.removeKwMsg=Removing a keyword +KeywordSearchEditListPanel.deleteWordButtonActionPerformed.delConfirmMsg=This will remove a keyword from the list globally (for all Cases). Do you want to proceed? +KeywordSearchEditListPanel.exportButtonActionPerformed.fileFilterLabel=Keyword List XML file +KeywordSearchEditListPanel.exportButtonActionPerformed.fileExistPrompt=File {0} exists, overwrite? +KeywordSearchEditListPanel.exportButtonActionPerformed.kwListExportedMsg=Keyword lists exported +KeywordSearchEditListPanel.kwColName=Keyword +KeywordSearchEditListPanel.exportButtonActionPerformed.regExColName=RegEx +KeywordSearchFilterNode.getFileActions.openExternViewActLbl=Open in External Viewer +KeywordSearchFilterNode.getFileActions.searchSameMd5=Search for files with the same MD5 hash +KeywordSearchFilterNode.getFileActions.viewInNewWinActionLbl=View in New Window +KeywordSearchIngestModule.init.badInitMsg=Keyword search server was not properly initialized, cannot run keyword search ingest. +KeywordSearchIngestModule.init.tryStopSolrMsg={0}
Please try stopping old java Solr process (if it exists) and restart the application. +KeywordSearchIngestModule.init.noKwInLstMsg=No keywords in keyword list. +KeywordSearchIngestModule.init.onlyIdxKwSkipMsg=Only indexing will be done and and keyword search will be skipped (you can still add keyword lists using the Keyword Lists - Add to Ingest). +KeywordSearchIngestModule.postIndexSummary.knowFileHeaderLbl=Files with known types +KeywordSearchIngestModule.postIndexSummary.fileGenStringsHead=Files with general strings extracted +KeywordSearchIngestModule.postIndexSummary.mdOnlyLbl=Metadata only was indexed +KeywordSearchIngestModule.postIndexSummary.idxErrLbl=Error (indexer) +KeywordSearchIngestModule.postIndexSummary.errTxtLbl=Error (text extraction) +KeywordSearchIngestModule.postIndexSummary.errIoLbl=Error (I/O) +KeywordSearchIngestModule.postIndexSummary.kwIdxResultsLbl=Keyword Indexing Results +KeywordSearchIngestModule.postIndexSummary.kwIdxErrsTitle=Keyword Indexing Errors +KeywordSearchIngestModule.postIndexSummary.kwIdxErrMsgFiles=Keyword index service had errors ingesting {0} files. +KeywordSearchIngestModule.postIndexSummary.kwIdxWarnMsgTitle=Keyword Indexing Warning +KeywordSearchIngestModule.postIndexSummary.idxErrReadFilesMsg=Keyword index service had errors reading files and extracting text. Could have been from corrupt media or files. +KeywordSearchListsViewerPanel.initIngest.addIngestTitle=Add to Ingest +KeywordSearchListsViewerPanel.initIngest.addIngestMsg=You can select additional keyword lists
and enqueue them to the ongoing ingest.
The selected lists will be searched next time the file index is rebuilt. +KeywordSearchListsViewerPanel.initIngest.searchIngestTitle=Search +KeywordSearchListsViewerPanel.initIngest.addIdxSearchMsg=Search indexed files for keywords in selected lists +KeywordSearchListsViewerPanel.initIngest.ongoingIngestMsg=Files Indexed\: {0} (ingest is ongoing) +KeywordSearchListsViewerPanel.initIngest.fileIndexCtMsg=Files Indexed\: {0} +KeywordSearch.selectedColLbl=Selected +KeywordSearch.nameColLbl=Name +KeywordSearch.regExColLbl=RegEx +KeywordSearchQueryManager.execute.exeWinTitle=Keyword search {0} - {1} +KeywordSearch.newKeywordListMsg=New Keyword List +KeywordSearch.importListFileDialogMsg=Error importing keyword list from file {0} +KeywordSearch.yesOwMsg=Yes, overwrite +KeywordSearch.noSkipMsg=No, skip +KeywordSearch.cancelImportMsg=Cancel import +KeywordSearch.overwriteListPrompt=Keyword list <{0}> already exists locally, overwrite? +KeywordSearch.importOwConflict=Import list conflict +KeywordSearch.kwListFailImportMsg=Keyword list not imported +KeywordSearchListsManagementPanel.fileExtensionFilterLbl=Keyword List File +KeywordSearch.listImportFeatureTitle=Keyword List Import + diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/ExtractedContentPanel.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/ExtractedContentPanel.java index 828b046d6d..bbad85160f 100644 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/ExtractedContentPanel.java +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/ExtractedContentPanel.java @@ -26,6 +26,8 @@ import java.awt.event.ItemEvent; import java.awt.event.ItemListener; import java.util.ArrayList; import java.util.List; + +import org.openide.util.NbBundle; import org.sleuthkit.autopsy.coreutils.Logger; import javax.swing.JMenuItem; import javax.swing.JTextPane; @@ -659,7 +661,7 @@ class ExtractedContentPanel extends javax.swing.JPanel { * background thread. To be invoked from GUI thread only. */ private void setMarkup(MarkupSource source) { - setPanelText("Loading text... Please wait", false); + setPanelText(NbBundle.getMessage(this.getClass(), "ExtractedContentPanel.setMarkup.panelTxt"), false); new SetMarkup(source).execute(); } diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/ExtractedContentViewer.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/ExtractedContentViewer.java index d57e993b08..e8368e14b6 100644 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/ExtractedContentViewer.java +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/ExtractedContentViewer.java @@ -27,6 +27,8 @@ import java.util.Collection; import java.util.LinkedHashMap; import java.util.List; import java.util.logging.Level; + +import org.openide.util.NbBundle; import org.sleuthkit.autopsy.coreutils.Logger; import org.apache.solr.client.solrj.SolrServerException; import org.openide.nodes.Node; @@ -184,7 +186,7 @@ public class ExtractedContentViewer implements DataContentViewer { @Override public String toString() { - return "Extracted Text"; + return NbBundle.getMessage(this.getClass(), "ExtractedContentViewer.toString"); } @Override @@ -264,12 +266,12 @@ public class ExtractedContentViewer implements DataContentViewer { @Override public String getTitle() { - return "Text"; + return NbBundle.getMessage(this.getClass(), "ExtractedContentViewer.getTitle"); } @Override public String getToolTip() { - return "Displays extracted text from files and keyword-search results. Requires Keyword Search ingest to be run on a file to activate this viewer. "; + return NbBundle.getMessage(this.getClass(), "ExtractedContentViewer.toolTip"); } @Override @@ -424,13 +426,13 @@ public class ExtractedContentViewer implements DataContentViewer { //we know it's AbstractFile, but do quick check to make sure if we index other objects in future boolean isKnown = FileKnown.KNOWN.equals(((AbstractFile)contentObj).getKnown()); if (isKnown && KeywordSearchSettings.getSkipKnown()) { - msg = "

" + name + " is a known file (based on MD5 hash) and does not have text in the index.

"; + msg = NbBundle.getMessage(this.getClass(), "ExtractedContentViewer.getSolrContent.knownFileMsg", name); } } if (msg == null) { - msg = "

" + name + " does not have text in the index.
It may have no text, not been analyzed yet, or keyword search was not enabled during ingest.

"; + msg = NbBundle.getMessage(this.getClass(), "ExtractedContentViewer.getSolrContent.noTxtYetMsg", name); } - String htmlMsg = "" + msg + ""; + String htmlMsg = NbBundle.getMessage(this.getClass(), "ExtractedContentViewer.getSolrContent.txtBodyItal", msg); return htmlMsg; } diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/HighlightedMatchesSource.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/HighlightedMatchesSource.java index 8026d3689e..a7d08fdcd3 100644 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/HighlightedMatchesSource.java +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/HighlightedMatchesSource.java @@ -26,6 +26,8 @@ import java.util.List; import java.util.Map; import java.util.TreeSet; import java.util.logging.Level; + +import org.openide.util.NbBundle; import org.sleuthkit.autopsy.coreutils.Logger; import org.apache.solr.client.solrj.SolrQuery; import org.apache.solr.client.solrj.SolrRequest.METHOD; @@ -46,7 +48,7 @@ class HighlightedMatchesSource implements MarkupSource, HighlightLookup { private static final String HIGHLIGHT_PRE = ""; private static final String HIGHLIGHT_POST = ""; private static final String ANCHOR_PREFIX = HighlightedMatchesSource.class.getName() + "_"; - private static final String NO_MATCHES = "
There were no keyword hits on this page. 
Keyword could have been in file name. 
Advance to another page for hits or choose Extracted Text to view original text..
"; + private Content content; private String keywordHitQuery; private Server solrServer; @@ -364,11 +366,12 @@ class HighlightedMatchesSource implements MarkupSource, HighlightLookup { Map> responseHighlightID = responseHighlight.get(contentIdStr); if (responseHighlightID == null) { - return NO_MATCHES; + return NbBundle.getMessage(this.getClass(), "HighlightedMatchesSource.getMarkup.noMatchMsg"); + } List contentHighlights = responseHighlightID.get(highLightField); if (contentHighlights == null) { - return NO_MATCHES; + return NbBundle.getMessage(this.getClass(), "HighlightedMatchesSource.getMarkup.noMatchMsg"); } else { // extracted content (minus highlight tags) is HTML-escaped String highlightedContent = contentHighlights.get(0).trim(); @@ -388,7 +391,7 @@ class HighlightedMatchesSource implements MarkupSource, HighlightLookup { @Override public String toString() { - return "Search Results"; + return NbBundle.getMessage(this.getClass(), "HighlightedMatchesSource.toString"); } @Override @@ -453,4 +456,4 @@ class HighlightedMatchesSource implements MarkupSource, HighlightLookup { public HighlightLookup createInstance(Content c, String keywordHitQuery, boolean isRegex, String originalQuery) { return new HighlightedMatchesSource(c, keywordHitQuery, isRegex, originalQuery); } -} \ No newline at end of file +} diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Installer.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Installer.java index 2683be17b8..44689e819e 100644 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Installer.java +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Installer.java @@ -20,6 +20,7 @@ package org.sleuthkit.autopsy.keywordsearch; import java.util.logging.Level; import org.openide.modules.ModuleInstall; +import org.openide.util.NbBundle; import org.openide.windows.WindowManager; import org.sleuthkit.autopsy.casemodule.Case; import org.sleuthkit.autopsy.keywordsearch.Server.SolrServerNoPortException; @@ -201,12 +202,8 @@ class Installer extends ModuleInstall { WindowManager.getDefault().invokeWhenUIReady(new Runnable() { @Override public void run() { - final String msg = "Indexing server port " + curFailPort + " is not available. " - + " Check if your security software does not block " + Version.getName() - + " and consider changing " + Server.PROPERTIES_CURRENT_SERVER_PORT + " in " - + Server.PROPERTIES_FILE + " property file in the application user folder." - + " Then try rebooting your system if another process was causing the conflict. "; - MessageNotifyUtil.Notify.error("Error initializing Keyword Search module", msg); + final String msg = NbBundle.getMessage(this.getClass(), "Installer.reportPortError", curFailPort, Version.getName(), Server.PROPERTIES_CURRENT_SERVER_PORT, Server.PROPERTIES_FILE); + MessageNotifyUtil.Notify.error(NbBundle.getMessage(this.getClass(), "Installer.errorInitKsmMsg"), msg); } }); } @@ -215,10 +212,8 @@ class Installer extends ModuleInstall { WindowManager.getDefault().invokeWhenUIReady(new Runnable() { @Override public void run() { - final String msg = "Indexing server stop port " + curFailPort + " is not available. " - + " Consider changing " + Server.PROPERTIES_CURRENT_STOP_PORT + " in " - + Server.PROPERTIES_FILE + " property file in the application user folder."; - MessageNotifyUtil.Notify.error("Error initializing Keyword Search module", msg); + final String msg = NbBundle.getMessage(this.getClass(), "Installer.reportStopPortError", curFailPort, Server.PROPERTIES_CURRENT_STOP_PORT, Server.PROPERTIES_FILE); + MessageNotifyUtil.Notify.error(NbBundle.getMessage(this.getClass(), "Installer.errorInitKsmMsg"), msg); } }); } @@ -227,14 +222,10 @@ class Installer extends ModuleInstall { WindowManager.getDefault().invokeWhenUIReady(new Runnable() { @Override public void run() { - final String msg = "Indexing server port " + KeywordSearch.getServer().getCurrentSolrServerPort() + " is not available. " - + " Check if your security software does not block " + Version.getName() - + " and consider changing " + Server.PROPERTIES_CURRENT_SERVER_PORT + " in " - + Server.PROPERTIES_FILE + " property file in the application user folder." - + " Then try rebooting your system if another process was causing the conflict. "; - MessageNotifyUtil.Notify.error("Error initializing Keyword Search module", msg); + final String msg = NbBundle.getMessage(this.getClass(), "Installer.reportInitError", KeywordSearch.getServer().getCurrentSolrServerPort(), Version.getName(), Server.PROPERTIES_CURRENT_SERVER_PORT, Server.PROPERTIES_FILE); + MessageNotifyUtil.Notify.error(NbBundle.getMessage(this.getClass(), "Installer.errorInitKsmMsg"), msg); - MessageNotifyUtil.Notify.error("Error initializing Keyword Search module", msg); + MessageNotifyUtil.Notify.error(NbBundle.getMessage(this.getClass(), "Installer.errorInitKsmMsg"), msg); } }); } diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchConfigurationPanel.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchConfigurationPanel.java index a3e1ee5314..b7fb10dddc 100644 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchConfigurationPanel.java +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchConfigurationPanel.java @@ -19,6 +19,7 @@ package org.sleuthkit.autopsy.keywordsearch; +import org.openide.util.NbBundle; import org.sleuthkit.autopsy.corecomponents.OptionsPanel; /** @@ -36,13 +37,16 @@ final class KeywordSearchConfigurationPanel extends javax.swing.JPanel implement } private void customizeComponents() { - setName("Advanced Keyword Search Configuration"); + setName(NbBundle.getMessage(this.getClass(), "KeywordSearchConfigurationPanel.customizeComponents.title")); listsPanel = new KeywordSearchConfigurationPanel1(); languagesPanel = new KeywordSearchConfigurationPanel3(); generalPanel = new KeywordSearchConfigurationPanel2(); - tabbedPane.insertTab("Lists", null, listsPanel, "List configuration", 0); - tabbedPane.insertTab("String Extraction", null, languagesPanel, "String extraction configuration for Keyword Search Ingest", 1); - tabbedPane.insertTab("General", null, generalPanel, "General configuration", 2); + tabbedPane.insertTab(NbBundle.getMessage(this.getClass(), "KeywordSearchConfigurationPanel.customizeComponents.listTabTitle"), null, + listsPanel, NbBundle.getMessage(this.getClass(), "KeywordSearchConfigurationPanel.customizeComponents.listLabToolTip"), 0); + tabbedPane.insertTab(NbBundle.getMessage(this.getClass(), "KeywordSearchConfigurationPanel.customizeComponents.stringExtTitle"), null, + languagesPanel, NbBundle.getMessage(this.getClass(), "KeywordSearchConfigurationPanel.customizeComponents.stringExtToolTip"), 1); + tabbedPane.insertTab(NbBundle.getMessage(this.getClass(), "KeywordSearchConfigurationPanel.customizeComponents.genTabTitle"), null, + generalPanel, NbBundle.getMessage(this.getClass(), "KeywordSearchConfigurationPanel.customizeComponents.genTabToolTip"), 2); } /** diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchConfigurationPanel1.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchConfigurationPanel1.java index 991f0d4c3a..34bb43a679 100644 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchConfigurationPanel1.java +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchConfigurationPanel1.java @@ -28,9 +28,10 @@ import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.util.List; import javax.swing.JOptionPane; + +import org.openide.util.NbBundle; import org.sleuthkit.autopsy.coreutils.Logger; import org.sleuthkit.autopsy.corecomponents.OptionsPanel; -import org.sleuthkit.autopsy.ingest.IngestManager; /** * Panel containing all other Keyword search Options panels. @@ -59,9 +60,8 @@ class KeywordSearchConfigurationPanel1 extends javax.swing.JPanel implements Opt @Override public void actionPerformed(ActionEvent e) { - if (KeywordSearchUtil.displayConfirmDialog("Delete a keyword list" - , "This will delete the keyword list globally (for all Cases). " - + "Do you want to proceed with the deletion? " + if (KeywordSearchUtil.displayConfirmDialog(NbBundle.getMessage(this.getClass(), "KeywordSearchConfigurationPanel1.customizeComponents.title") + , NbBundle.getMessage(this.getClass(), "KeywordSearchConfigurationPanel1.customizeComponents.body" ) , KeywordSearchUtil.DIALOG_MESSAGE_TYPE.WARN) ) { KeywordSearchListsXML deleter = KeywordSearchListsXML.getCurrent(); @@ -84,13 +84,14 @@ class KeywordSearchConfigurationPanel1 extends javax.swing.JPanel implements Opt List keywords = currentKeywordList.getKeywords(); if (keywords.isEmpty()) { - KeywordSearchUtil.displayDialog(FEATURE_NAME, "Keyword List is empty and cannot be saved", KeywordSearchUtil.DIALOG_MESSAGE_TYPE.INFO); + KeywordSearchUtil.displayDialog(FEATURE_NAME, NbBundle.getMessage(this.getClass(), "KeywordSearchConfigurationPanel1.customizeComponents.keywordListEmptyErr"), + KeywordSearchUtil.DIALOG_MESSAGE_TYPE.INFO); return; } String listName = (String) JOptionPane.showInputDialog( null, - "New keyword list name:", + NbBundle.getMessage(this.getClass(), "KeywordSearch.newKwListTitle"), FEATURE_NAME, JOptionPane.PLAIN_MESSAGE, null, @@ -101,12 +102,12 @@ class KeywordSearchConfigurationPanel1 extends javax.swing.JPanel implements Opt } if (writer.listExists(listName) && writer.getList(listName).isLocked()) { - KeywordSearchUtil.displayDialog(FEATURE_NAME, "Cannot overwrite default list", KeywordSearchUtil.DIALOG_MESSAGE_TYPE.WARN); + KeywordSearchUtil.displayDialog(FEATURE_NAME, NbBundle.getMessage(this.getClass(), "KeywordSearchConfigurationPanel1.customizeComponents.noOwDefaultMsg"), KeywordSearchUtil.DIALOG_MESSAGE_TYPE.WARN); return; } boolean shouldAdd = false; if (writer.listExists(listName)) { - boolean replace = KeywordSearchUtil.displayConfirmDialog(FEATURE_NAME, "Keyword List <" + listName + "> already exists, do you want to replace it?", + boolean replace = KeywordSearchUtil.displayConfirmDialog(FEATURE_NAME, NbBundle.getMessage(this.getClass(), "KeywordSearchConfigurationPanel1.customizeComponents.kwListExistMsg", listName), KeywordSearchUtil.DIALOG_MESSAGE_TYPE.WARN); if (replace) { shouldAdd = true; @@ -118,7 +119,7 @@ class KeywordSearchConfigurationPanel1 extends javax.swing.JPanel implements Opt if (shouldAdd) { writer.addList(listName, keywords); - KeywordSearchUtil.displayDialog(FEATURE_NAME, "Keyword List <" + listName + "> saved", KeywordSearchUtil.DIALOG_MESSAGE_TYPE.INFO); + KeywordSearchUtil.displayDialog(FEATURE_NAME, NbBundle.getMessage(this.getClass(), "KeywordSearchConfigurationPanel1.customizeComponents.kwListSavedMsg", listName), KeywordSearchUtil.DIALOG_MESSAGE_TYPE.INFO); } //currentKeywordList = writer.getList(listName); diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchEditListPanel.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchEditListPanel.java index ce91aefd16..2cf89f27c5 100644 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchEditListPanel.java +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchEditListPanel.java @@ -30,6 +30,8 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.logging.Level; + +import org.openide.util.NbBundle; import org.sleuthkit.autopsy.coreutils.Logger; import java.util.regex.Pattern; import java.util.regex.PatternSyntaxException; @@ -71,12 +73,12 @@ class KeywordSearchEditListPanel extends javax.swing.JPanel implements ListSelec private void customizeComponents() { - chRegex.setToolTipText("Keyword is a regular expression"); - addWordButton.setToolTipText(("Add a new word to the keyword search list")); - addWordField.setToolTipText("Enter a new word or regex to search"); - exportButton.setToolTipText("Export the current keyword list to a file"); - saveListButton.setToolTipText("Save the current keyword list with a new name"); - deleteWordButton.setToolTipText("Remove selected keyword(s) from the list"); + chRegex.setToolTipText(NbBundle.getMessage(this.getClass(), "KeywordSearchEditListPanel.customizeComponents.kwReToolTip")); + addWordButton.setToolTipText((NbBundle.getMessage(this.getClass(), "KeywordSearchEditListPanel.customizeComponents.addWordToolTip"))); + addWordField.setToolTipText(NbBundle.getMessage(this.getClass(), "KeywordSearchEditListPanel.customizeComponents.enterNewWordToolTip")); + exportButton.setToolTipText(NbBundle.getMessage(this.getClass(), "KeywordSearchEditListPanel.customizeComponents.exportToFile")); + saveListButton.setToolTipText(NbBundle.getMessage(this.getClass(), "KeywordSearchEditListPanel.customizeComponents.saveCurrentWIthNewNameToolTip")); + deleteWordButton.setToolTipText(NbBundle.getMessage(this.getClass(), "KeywordSearchEditListPanel.customizeComponents.removeSelectedMsg")); //keywordTable.setAutoscrolls(true); //keywordTable.setTableHeader(null); @@ -489,7 +491,8 @@ class KeywordSearchEditListPanel extends javax.swing.JPanel implements ListSelec if (newWord.equals("")) { return; } else if (currentKeywordList.hasKeyword(keyword)) { - KeywordSearchUtil.displayDialog("New Keyword Entry", "Keyword already exists in the list.", KeywordSearchUtil.DIALOG_MESSAGE_TYPE.INFO); + KeywordSearchUtil.displayDialog(NbBundle.getMessage(this.getClass(), "KeywordSearchEditListPanel.newKwTitle"), + NbBundle.getMessage(this.getClass(), "KeywordSearchEditListPanel.addWordButtonAction.kwAlreadyExistsMsg"), KeywordSearchUtil.DIALOG_MESSAGE_TYPE.INFO); return; } @@ -504,7 +507,8 @@ class KeywordSearchEditListPanel extends javax.swing.JPanel implements ListSelec valid = false; } if (!valid) { - KeywordSearchUtil.displayDialog("New Keyword Entry", "Invalid keyword pattern. Use words or a correct regex pattern.", KeywordSearchUtil.DIALOG_MESSAGE_TYPE.ERROR); + KeywordSearchUtil.displayDialog(NbBundle.getMessage(this.getClass(), "KeywordSearchEditListPanel.newKwTitle"), + NbBundle.getMessage(this.getClass(), "KeywordSearchEditListPanel.invalidKwMsg"), KeywordSearchUtil.DIALOG_MESSAGE_TYPE.ERROR); return; } @@ -518,9 +522,8 @@ class KeywordSearchEditListPanel extends javax.swing.JPanel implements ListSelec }//GEN-LAST:event_addWordButtonActionPerformed private void deleteWordButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_deleteWordButtonActionPerformed - if (KeywordSearchUtil.displayConfirmDialog("Removing a keyword" - , "This will remove a keyword from the list globally (for all Cases). " - + "Do you want to proceed? " + if (KeywordSearchUtil.displayConfirmDialog(NbBundle.getMessage(this.getClass(), "KeywordSearchEditListPanel.removeKwMsg") + , NbBundle.getMessage(this.getClass(), "KeywordSearchEditListPanel.deleteWordButtonActionPerformed.delConfirmMsg") , KeywordSearchUtil.DIALOG_MESSAGE_TYPE.WARN) ) { tableModel.deleteSelected(keywordTable.getSelectedRows()); @@ -540,7 +543,7 @@ class KeywordSearchEditListPanel extends javax.swing.JPanel implements ListSelec JFileChooser chooser = new JFileChooser(); final String EXTENSION = "xml"; FileNameExtensionFilter filter = new FileNameExtensionFilter( - "Keyword List XML file", EXTENSION); + NbBundle.getMessage(this.getClass(), "KeywordSearchEditListPanel.exportButtonActionPerformed.fileFilterLabel"), EXTENSION); chooser.setFileFilter(filter); chooser.setSelectedFile(new File(currentKeywordList.getName())); chooser.setFileSelectionMode(JFileChooser.FILES_ONLY); @@ -561,7 +564,9 @@ class KeywordSearchEditListPanel extends javax.swing.JPanel implements ListSelec boolean shouldWrite = true; if (selFile.exists()) { - shouldWrite = KeywordSearchUtil.displayConfirmDialog(FEATURE_NAME, "File " + selFile.getName() + " exists, overwrite?", KeywordSearchUtil.DIALOG_MESSAGE_TYPE.WARN); + shouldWrite = KeywordSearchUtil.displayConfirmDialog(FEATURE_NAME, + NbBundle.getMessage(this.getClass(), "KeywordSearchEditListPanel.exportButtonActionPerformed.fileExistPrompt", + selFile.getName()), KeywordSearchUtil.DIALOG_MESSAGE_TYPE.WARN); } if (!shouldWrite) { return; @@ -575,7 +580,8 @@ class KeywordSearchEditListPanel extends javax.swing.JPanel implements ListSelec final KeywordSearchListsXML exporter = new KeywordSearchListsXML(fileAbs); boolean written = exporter.saveLists(toWrite); if (written) { - KeywordSearchUtil.displayDialog(FEATURE_NAME, "Keyword lists exported", + KeywordSearchUtil.displayDialog(FEATURE_NAME, + NbBundle.getMessage(this.getClass(), "KeywordSearchEditListPanel.exportButtonActionPerformed.kwListExportedMsg"), KeywordSearchUtil.DIALOG_MESSAGE_TYPE.INFO); } } @@ -689,10 +695,10 @@ private void useForIngestCheckboxActionPerformed(java.awt.event.ActionEvent evt) switch (column) { case 0: - colName = "Keyword"; + colName = NbBundle.getMessage(this.getClass(), "KeywordSearchEditListPanel.kwColName"); break; case 1: - colName = "RegEx"; + colName = NbBundle.getMessage(this.getClass(), "KeywordSearchEditListPanel.exportButtonActionPerformed.regExColName"); break; default: ; diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchFilterNode.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchFilterNode.java index d4d18d36a4..1b450ce186 100644 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchFilterNode.java +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchFilterNode.java @@ -26,6 +26,7 @@ import org.openide.nodes.Node; import org.openide.nodes.Node.Property; import org.openide.nodes.PropertySupport; import org.openide.nodes.Sheet; +import org.openide.util.NbBundle; import org.openide.util.lookup.Lookups; import org.openide.util.lookup.ProxyLookup; import org.sleuthkit.autopsy.coreutils.ContextMenuExtensionPoint; @@ -127,11 +128,11 @@ class KeywordSearchFilterNode extends FilterNode { private List getFileActions() { List actions = new ArrayList<>(); - actions.add(new NewWindowViewAction("View in New Window", KeywordSearchFilterNode.this)); - actions.add(new ExternalViewerAction("Open in External Viewer", getOriginal())); + actions.add(new NewWindowViewAction(NbBundle.getMessage(this.getClass(), "KeywordSearchFilterNode.getFileActions.viewInNewWinActionLbl"), KeywordSearchFilterNode.this)); + actions.add(new ExternalViewerAction(NbBundle.getMessage(this.getClass(), "KeywordSearchFilterNode.getFileActions.openExternViewActLbl"), getOriginal())); actions.add(null); actions.add(ExtractAction.getInstance()); - actions.add(new HashSearchAction("Search for files with the same MD5 hash", getOriginal())); + actions.add(new HashSearchAction(NbBundle.getMessage(this.getClass(), "KeywordSearchFilterNode.getFileActions.searchSameMd5"), getOriginal())); actions.add(null); // creates a menu separator actions.add(AddContentTagAction.getInstance()); actions.addAll(ContextMenuExtensionPoint.getActions()); diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchIngestModule.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchIngestModule.java index 4942c41a14..0240d56c4d 100644 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchIngestModule.java +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchIngestModule.java @@ -33,6 +33,8 @@ import java.util.concurrent.CancellationException; import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReentrantReadWriteLock; import java.util.logging.Level; + +import org.openide.util.NbBundle; import org.sleuthkit.autopsy.coreutils.Logger; import javax.swing.SwingUtilities; import javax.swing.SwingWorker; @@ -352,9 +354,9 @@ public final class KeywordSearchIngestModule extends IngestModuleAbstractFile { final Server server = KeywordSearch.getServer(); try { if (!server.isRunning()) { - String msg = "Keyword search server was not properly initialized, cannot run keyword search ingest. "; + String msg = NbBundle.getMessage(this.getClass(), "KeywordSearchIngestModule.init.badInitMsg"); logger.log(Level.SEVERE, msg); - String details = msg + "
Please try stopping old java Solr process (if it exists) and restart the application."; + String details = NbBundle.getMessage(this.getClass(), "KeywordSearchIngestModule.init.tryStopSolrMsg", msg); services.postMessage(IngestMessage.createErrorMessage(++messageID, instance, msg, details)); return; @@ -362,8 +364,8 @@ public final class KeywordSearchIngestModule extends IngestModuleAbstractFile { } catch (KeywordSearchModuleException ex) { logger.log(Level.WARNING, "Error checking if Solr server is running while initializing ingest", ex); //this means Solr is not properly initialized - String msg = "Keyword search server was not properly initialized, cannot run keyword search ingest. "; - String details = msg + "
Please try stopping old java Solr process (if it exists) and restart the application."; + String msg = NbBundle.getMessage(this.getClass(), "KeywordSearchIngestModule.init.badInitMsg"); + String details = NbBundle.getMessage(this.getClass(), "KeywordSearchIngestModule.init.tryStopSolrMsg", msg); services.postMessage(IngestMessage.createErrorMessage(++messageID, instance, msg, details)); return; } @@ -397,7 +399,8 @@ public final class KeywordSearchIngestModule extends IngestModuleAbstractFile { initKeywords(); if (keywords.isEmpty() || keywordLists.isEmpty()) { - services.postMessage(IngestMessage.createWarningMessage(++messageID, instance, "No keywords in keyword list.", "Only indexing will be done and and keyword search will be skipped (you can still add keyword lists using the Keyword Lists - Add to Ingest).")); + services.postMessage(IngestMessage.createWarningMessage(++messageID, instance, NbBundle.getMessage(this.getClass(), "KeywordSearchIngestModule.init.noKwInLstMsg"), + NbBundle.getMessage(this.getClass(), "KeywordSearchIngestModule.init.onlyIdxKwSkipMsg"))); } processedFiles = false; @@ -540,21 +543,23 @@ public final class KeywordSearchIngestModule extends IngestModuleAbstractFile { } StringBuilder msg = new StringBuilder(); - msg.append(""); - msg.append(""); - msg.append(""); - msg.append(""); - msg.append(""); - msg.append(""); + msg.append("
Files with known types").append(text_ingested).append("
Files with general strings extracted").append(strings_ingested).append("
Metadata only was indexed").append(metadata_ingested).append("
Error (indexer)").append(error_index).append("
Error (text extraction)").append(error_text).append("
Error (I/O)").append(error_io).append("
"); + msg.append(""); + msg.append(""); + msg.append(""); + msg.append(""); + msg.append(""); msg.append("
").append(NbBundle.getMessage(this.getClass(), "KeywordSearchIngestModule.postIndexSummary.knowFileHeaderLbl")).append("").append(text_ingested).append("
").append(NbBundle.getMessage(this.getClass(), "KeywordSearchIngestModule.postIndexSummary.fileGenStringsHead")).append("").append(strings_ingested).append("
").append(NbBundle.getMessage(this.getClass(), "KeywordSearchIngestModule.postIndexSummary.mdOnlyLbl")).append("").append(metadata_ingested).append("
").append(NbBundle.getMessage(this.getClass(), "KeywordSearchIngestModule.postIndexSummary.idxErrLbl")).append("").append(error_index).append("
").append(NbBundle.getMessage(this.getClass(), "KeywordSearchIngestModule.postIndexSummary.errTxtLbl")).append("").append(error_text).append("
").append(NbBundle.getMessage(this.getClass(), "KeywordSearchIngestModule.postIndexSummary.errIoLbl")).append("").append(error_io).append("
"); String indexStats = msg.toString(); logger.log(Level.INFO, "Keyword Indexing Completed: " + indexStats); - services.postMessage(IngestMessage.createMessage(++messageID, MessageType.INFO, this, "Keyword Indexing Results", indexStats)); + services.postMessage(IngestMessage.createMessage(++messageID, MessageType.INFO, this, NbBundle.getMessage(this.getClass(), "KeywordSearchIngestModule.postIndexSummary.kwIdxResultsLbl"), indexStats)); if (error_index > 0) { - MessageNotifyUtil.Notify.error("Keyword Indexing Errors", "Keyword index service had errors ingesting " + error_index + " files."); + MessageNotifyUtil.Notify.error(NbBundle.getMessage(this.getClass(), "KeywordSearchIngestModule.postIndexSummary.kwIdxErrsTitle"), + NbBundle.getMessage(this.getClass(), "KeywordSearchIngestModule.postIndexSummary.kwIdxErrMsgFiles", error_index)); } else if (error_io + error_text > 0) { - MessageNotifyUtil.Notify.warn("Keyword Indexing Warning", "Keyword index service had errors reading files and extracting text. Could have been from corrupt media or files."); + MessageNotifyUtil.Notify.warn(NbBundle.getMessage(this.getClass(), "KeywordSearchIngestModule.postIndexSummary.kwIdxWarnMsgTitle"), + NbBundle.getMessage(this.getClass(), "KeywordSearchIngestModule.postIndexSummary.idxErrReadFilesMsg")); } } @@ -901,13 +906,15 @@ public final class KeywordSearchIngestModule extends IngestModuleAbstractFile { logger.log(Level.INFO, "Pending start of new searcher"); } - final String displayName = "Keyword Search" + (finalRun ? " - Finalizing" : ""); - progressGroup = AggregateProgressFactory.createSystemHandle(displayName + (" (Pending)"), null, new Cancellable() { + final String displayName = NbBundle.getMessage(this.getClass(), "KeywordSearchIngestModule.doInBackGround.displayName") + + (finalRun ? (" - "+ NbBundle.getMessage(this.getClass(), "KeywordSearchIngestModule.doInBackGround.finalizeMsg")) : ""); + progressGroup = AggregateProgressFactory.createSystemHandle(displayName + (" ("+ + NbBundle.getMessage(this.getClass(), "KeywordSearchIngestModule.doInBackGround.pendingMsg") +")"), null, new Cancellable() { @Override public boolean cancel() { logger.log(Level.INFO, "Cancelling the searcher by user."); if (progressGroup != null) { - progressGroup.setDisplayName(displayName + " (Cancelling...)"); + progressGroup.setDisplayName(displayName + " ("+ NbBundle.getMessage(this.getClass(), "KeywordSearchIngestModule.doInBackGround.cancelMsg") +"...)"); } return Searcher.this.cancel(true); } @@ -1069,9 +1076,9 @@ public final class KeywordSearchIngestModule extends IngestModuleAbstractFile { //final int hitFiles = newResults.size(); if (!keywordQuery.isLiteral()) { - subjectSb.append("RegExp hit: "); + subjectSb.append(NbBundle.getMessage(this.getClass(), "KeywordSearchIngestModule.regExpHitLbl")); } else { - subjectSb.append("Keyword hit: "); + subjectSb.append(NbBundle.getMessage(this.getClass(), "KeywordSearchIngestModule.kwHitLbl")); } //subjectSb.append("<"); String uniqueKey = null; @@ -1089,7 +1096,7 @@ public final class KeywordSearchIngestModule extends IngestModuleAbstractFile { detailsSb.append(""); //hit detailsSb.append(""); - detailsSb.append(""); + detailsSb.append(NbBundle.getMessage(this.getClass(), "KeywordSearchIngestModule.kwHitLThLbl")); detailsSb.append(""); detailsSb.append(""); @@ -1097,7 +1104,7 @@ public final class KeywordSearchIngestModule extends IngestModuleAbstractFile { attr = written.getAttribute(BlackboardAttribute.ATTRIBUTE_TYPE.TSK_KEYWORD_PREVIEW.getTypeID()); if (attr != null) { detailsSb.append(""); - detailsSb.append(""); + detailsSb.append(NbBundle.getMessage(this.getClass(), "KeywordSearchIngestModule.previewThLbl")); detailsSb.append(""); detailsSb.append(""); @@ -1105,7 +1112,7 @@ public final class KeywordSearchIngestModule extends IngestModuleAbstractFile { //file detailsSb.append(""); - detailsSb.append(""); + detailsSb.append(NbBundle.getMessage(this.getClass(), "KeywordSearchIngestModule.fileThLbl")); detailsSb.append(""); detailsSb.append(""); @@ -1114,7 +1121,7 @@ public final class KeywordSearchIngestModule extends IngestModuleAbstractFile { //list attr = written.getAttribute(BlackboardAttribute.ATTRIBUTE_TYPE.TSK_SET_NAME.getTypeID()); detailsSb.append(""); - detailsSb.append(""); + detailsSb.append(NbBundle.getMessage(this.getClass(), "KeywordSearchIngestModule.listThLbl")); detailsSb.append(""); detailsSb.append(""); @@ -1123,7 +1130,7 @@ public final class KeywordSearchIngestModule extends IngestModuleAbstractFile { attr = written.getAttribute(BlackboardAttribute.ATTRIBUTE_TYPE.TSK_KEYWORD_REGEXP.getTypeID()); if (attr != null) { detailsSb.append(""); - detailsSb.append(""); + detailsSb.append(NbBundle.getMessage(this.getClass(), "KeywordSearchIngestModule.regExThLbl")); detailsSb.append(""); detailsSb.append(""); diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchListsManagementPanel.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchListsManagementPanel.java index 3e64ad20d3..e406580f7d 100644 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchListsManagementPanel.java +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchListsManagementPanel.java @@ -25,11 +25,11 @@ package org.sleuthkit.autopsy.keywordsearch; import java.awt.event.KeyEvent; -import java.beans.PropertyChangeEvent; -import java.beans.PropertyChangeListener; import java.io.File; import java.util.ArrayList; import java.util.List; + +import org.openide.util.NbBundle; import org.sleuthkit.autopsy.coreutils.Logger; import javax.swing.JFileChooser; import javax.swing.JOptionPane; @@ -176,21 +176,23 @@ class KeywordSearchListsManagementPanel extends javax.swing.JPanel implements Op private void newListButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_newListButtonActionPerformed KeywordSearchListsXML writer = KeywordSearchListsXML.getCurrent(); - String listName = (String) JOptionPane.showInputDialog(null, "New keyword list name:", "New Keyword List", JOptionPane.PLAIN_MESSAGE, null, null, ""); + String listName = (String) JOptionPane.showInputDialog(null, NbBundle.getMessage(this.getClass(), "KeywordSearch.newKwListTitle"), + NbBundle.getMessage(this.getClass(), "KeywordSearch.newKeywordListMsg"), JOptionPane.PLAIN_MESSAGE, null, null, ""); if (listName == null || listName.trim().equals("")) { return; } boolean shouldAdd = false; if (writer.listExists(listName)) { if (writer.getList(listName).isLocked() ) { - boolean replace = KeywordSearchUtil.displayConfirmDialog("New Keyword List", "Keyword List <" + listName - + "> already exists as a read-only list. Do you want to replace it for the duration of the program (the change will not be persistent).", KeywordSearchUtil.DIALOG_MESSAGE_TYPE.WARN); + boolean replace = KeywordSearchUtil.displayConfirmDialog(NbBundle.getMessage(this.getClass(), "KeywordSearch.newKeywordListMsg"), + NbBundle.getMessage(this.getClass(), "KeywordSearch.keywordListAlreadyExistMsg", listName), KeywordSearchUtil.DIALOG_MESSAGE_TYPE.WARN); if (replace) { shouldAdd = true; } } else { - boolean replace = KeywordSearchUtil.displayConfirmDialog("New Keyword List", "Keyword List <" + listName + "> already exists, do you want to replace it?", KeywordSearchUtil.DIALOG_MESSAGE_TYPE.WARN); + boolean replace = KeywordSearchUtil.displayConfirmDialog(NbBundle.getMessage(this.getClass(), "KeywordSearch.newKwListTitle"), + NbBundle.getMessage(this.getClass(), "KeywordSearch.kwListAlreadyExistMsg", listName), KeywordSearchUtil.DIALOG_MESSAGE_TYPE.WARN); if (replace) { shouldAdd = true; } @@ -211,12 +213,10 @@ class KeywordSearchListsManagementPanel extends javax.swing.JPanel implements Op private void importButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_importButtonActionPerformed - final String FEATURE_NAME = "Keyword List Import"; - JFileChooser chooser = new JFileChooser(); final String[] EXTENSION = new String[]{"xml", "txt"}; FileNameExtensionFilter filter = new FileNameExtensionFilter( - "Keyword List File", EXTENSION); + NbBundle.getMessage(this.getClass(), "KeywordSearchListsManagementPanel.fileExtensionFilterLbl"), EXTENSION); chooser.setFileFilter(filter); chooser.setFileSelectionMode(JFileChooser.FILES_ONLY); @@ -239,7 +239,8 @@ class KeywordSearchListsManagementPanel extends javax.swing.JPanel implements Op } if (!reader.load()) { - KeywordSearchUtil.displayDialog(FEATURE_NAME, "Error importing keyword list from file " + fileAbs, KeywordSearchUtil.DIALOG_MESSAGE_TYPE.ERROR); + KeywordSearchUtil.displayDialog( + NbBundle.getMessage(this.getClass(), "KeywordSearch.listImportFeatureTitle"), NbBundle.getMessage(this.getClass(), "KeywordSearch.importListFileDialogMsg", fileAbs), KeywordSearchUtil.DIALOG_MESSAGE_TYPE.ERROR); return; } @@ -251,12 +252,12 @@ class KeywordSearchListsManagementPanel extends javax.swing.JPanel implements Op for (KeywordSearchListsAbstract.KeywordSearchList list : toImport) { //check name collisions if (writer.listExists(list.getName())) { - Object[] options = {"Yes, overwrite", - "No, skip", - "Cancel import"}; + Object[] options = {NbBundle.getMessage(this.getClass(), "KeywordSearch.yesOwMsg"), + NbBundle.getMessage(this.getClass(), "KeywordSearch.noSkipMsg"), + NbBundle.getMessage(this.getClass(), "KeywordSearch.cancelImportMsg")}; int choice = JOptionPane.showOptionDialog(this, - "Keyword list <" + list.getName() + "> already exists locally, overwrite?", - "Import list conflict", + NbBundle.getMessage(this.getClass(), "KeywordSearch.overwriteListPrompt", list.getName()), + NbBundle.getMessage(this.getClass(), "KeywordSearch.importOwConflict"), JOptionPane.YES_NO_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE, null, @@ -280,7 +281,8 @@ class KeywordSearchListsManagementPanel extends javax.swing.JPanel implements Op } if (!writer.writeLists(toImportConfirmed)) { - KeywordSearchUtil.displayDialog(FEATURE_NAME, "Keyword list not imported", KeywordSearchUtil.DIALOG_MESSAGE_TYPE.INFO); + KeywordSearchUtil.displayDialog( + NbBundle.getMessage(this.getClass(), "KeywordSearch.listImportFeatureTitle"), NbBundle.getMessage(this.getClass(), "KeywordSearch.kwListFailImportMsg"), KeywordSearchUtil.DIALOG_MESSAGE_TYPE.INFO); } } diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchListsViewerPanel.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchListsViewerPanel.java index 3aec4613e3..3444d19d16 100644 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchListsViewerPanel.java +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchListsViewerPanel.java @@ -36,7 +36,8 @@ import javax.swing.event.ListSelectionListener; import javax.swing.table.AbstractTableModel; import javax.swing.table.TableCellRenderer; import javax.swing.table.TableColumn; -import org.apache.solr.client.solrj.SolrServerException; + +import org.openide.util.NbBundle; import org.openide.util.actions.SystemAction; import org.sleuthkit.autopsy.coreutils.Logger; import org.sleuthkit.autopsy.ingest.IngestManager; @@ -162,16 +163,14 @@ class KeywordSearchListsViewerPanel extends AbstractKeywordSearchPerformer { private void initIngest(boolean running) { if (running) { ingestRunning = true; - searchAddButton.setText("Add to Ingest"); - searchAddButton.setToolTipText("You can select additional keyword lists" - + "
and enqueue them to the ongoing ingest." - + "
The selected lists will be searched next time the file index is rebuilt."); + searchAddButton.setText(NbBundle.getMessage(this.getClass(), "KeywordSearchListsViewerPanel.initIngest.addIngestTitle")); + searchAddButton.setToolTipText(NbBundle.getMessage(this.getClass(), "KeywordSearchListsViewerPanel.initIngest.addIngestMsg" )); listsTableModel.resync(); } else { ingestRunning = false; - searchAddButton.setText("Search"); - searchAddButton.setToolTipText("Search indexed files for keywords in selected lists"); + searchAddButton.setText(NbBundle.getMessage(this.getClass(), "KeywordSearchListsViewerPanel.initIngest.searchIngestTitle")); + searchAddButton.setToolTipText(NbBundle.getMessage(this.getClass(), "KeywordSearchListsViewerPanel.initIngest.addIdxSearchMsg")); listsTableModel.resync(); } updateIngestIndexLabel(running); @@ -179,11 +178,10 @@ class KeywordSearchListsViewerPanel extends AbstractKeywordSearchPerformer { private void updateIngestIndexLabel(boolean ingestRunning) { if (ingestRunning) { - ingestIndexLabel.setText("Files Indexed: " + filesIndexed - + " (ingest is ongoing)"); + ingestIndexLabel.setText(NbBundle.getMessage(this.getClass(), "KeywordSearchListsViewerPanel.initIngest.ongoingIngestMsg", filesIndexed)); } else { - ingestIndexLabel.setText("Files Indexed: " + filesIndexed); + ingestIndexLabel.setText(NbBundle.getMessage(this.getClass(), "KeywordSearchListsViewerPanel.initIngest.fileIndexCtMsg", filesIndexed)); } } @@ -357,10 +355,10 @@ class KeywordSearchListsViewerPanel extends AbstractKeywordSearchPerformer { String ret = null; switch (column) { case 0: - ret = "Selected"; + ret = NbBundle.getMessage(this.getClass(), "KeywordSearch.selectedColLbl"); break; case 1: - ret = "Name"; + ret = NbBundle.getMessage(this.getClass(), "KeywordSearch.nameColLbl"); break; default: break; @@ -511,10 +509,10 @@ class KeywordSearchListsViewerPanel extends AbstractKeywordSearchPerformer { String ret = null; switch (column) { case 0: - ret = "Name"; + ret = NbBundle.getMessage(this.getClass(), "KeywordSearch.nameColLbl"); break; case 1: - ret = "RegEx"; + ret = NbBundle.getMessage(this.getClass(), "KeywordSearch.regExColLbl"); break; default: break; diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchQueryManager.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchQueryManager.java index ff9d5daaee..b3243cf9b1 100644 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchQueryManager.java +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchQueryManager.java @@ -24,6 +24,8 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Map; import java.util.logging.Level; + +import org.openide.util.NbBundle; import org.sleuthkit.autopsy.coreutils.Logger; import org.openide.nodes.AbstractNode; import org.openide.nodes.Children; @@ -152,7 +154,7 @@ class KeywordSearchQueryManager { String queryConcatStr = queryConcat.toString(); final int queryConcatStrLen = queryConcatStr.length(); final String queryStrShort = queryConcatStrLen > 15 ? queryConcatStr.substring(0, 14) + "..." : queryConcatStr; - final String windowTitle = "Keyword search " + (++resultWindowCount) + " - " + queryStrShort; + final String windowTitle = NbBundle.getMessage(this.getClass(), "KeywordSearchQueryManager.execute.exeWinTitle", ++resultWindowCount, queryStrShort); DataResultTopComponent searchResultWin = DataResultTopComponent.createInstance(windowTitle); if (things.size() > 0) { Children childThingNodes = From 2595e7f3f260a92f85fd2bca80982b4a1a30a471 Mon Sep 17 00:00:00 2001 From: Nick Davis Date: Fri, 24 Jan 2014 18:55:56 -0500 Subject: [PATCH 30/38] First pass at Japanese translation of Bundle.properties. --- .../keywordsearch/Bundle_ja.properties | 168 ++++++++++++++++++ 1 file changed, 168 insertions(+) create mode 100644 KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Bundle_ja.properties diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Bundle_ja.properties b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Bundle_ja.properties new file mode 100644 index 0000000000..f684bfac60 --- /dev/null +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Bundle_ja.properties @@ -0,0 +1,168 @@ +OpenIDE-Module-Display-Category=\u30E2\u30B8\u30E5\u30FC\u30EB\u633F\u5165 +OpenIDE-Module-Long-Description=\u30AD\u30FC\u30EF\u30FC\u30C9\u691C\u7D22\u30E2\u30B8\u30E5\u30FC\u30EB\u633F\u5165\n\n\ +\u633F\u5165\u6642\u306E\u30C7\u30A3\u30B9\u30AF\u30A4\u30E1\u30FC\u30B8\u306B\u3042\u308B\u30D5\u30A1\u30A4\u30EB\u3092\u30A4\u30F3\u30C7\u30C3\u30AF\u30B9\u5316\u3057\u307E\u3059\u3002\ +\u305D\u3057\u3066\u3001\u4E00\u3064\u4EE5\u4E0A\u306E\u30AD\u30FC\u30EF\u30FC\u30C9\u30EA\u30B9\u30C8\uFF08\u5358\u8A9E\u3084\u4E00\u822C\u7684\u306A\u8868\u73FE\u3092\u542B\u3080\uFF09\u3092\u5229\u7528\u3057\u3001\u30A4\u30F3\u30C7\u30C3\u30AF\u30B9\u5316\u3055\u308C\u305F\u30D5\u30A1\u30A4\u30EB\u3092\u5B9A\u671F\u7684\u306B\u691C\u7D22\u3057\u3001\u7D50\u679C\u3092\u8868\u793A\u3057\u307E\u3059\u3002\n\n\ +\u3053\u306E\u30E2\u30B8\u30E5\u30FC\u30EB\u306B\u306F\u30AD\u30FC\u30EF\u30FC\u30C9\u30EA\u30B9\u30C8\u8A2D\u5B9A\u3001\u53F3\u4E0A\u9685\u306E\u30AD\u30FC\u30EF\u30FC\u30C9\u691C\u7D22\u30D0\u30FC\u3001\u30AD\u30FC\u30EF\u30FC\u30C9\u691C\u7D22\u306E\u7D50\u679C\u3092\u30CF\u30A4\u30E9\u30A4\u30C8\u3057\u3066\u8868\u793A\u3059\u308B\u62BD\u51FA\u3055\u308C\u305F\u30C6\u30AD\u30B9\u30C8\u30D3\u30E5\u30FC\u30A2\u3068\u691C\u7D22\u7D50\u679C\u30D3\u30E5\u30FC\u30A2\u306A\u3069\u3001\u30E1\u30A4\u30F3GUI\u3068\u9023\u643A\u3059\u308B\u8FFD\u52A0\u306E\u30C4\u30FC\u30EB\u304C\u542B\u307E\u308C\u307E\u3059\u3002 +OpenIDE-Module-Name=\u30AD\u30FC\u30EF\u30FC\u30C9\u691C\u7D22 +ListBundleName=\u30AD\u30FC\u30EF\u30FC\u30C9\u30EA\u30B9\u30C8 +ListBundleConfig=\u30AD\u30FC\u30EF\u30FC\u30C9\u30EA\u30B9\u30C8\u8A2D\u5B9A +IndexProgressPanel.statusText.text=\u30B9\u30C6\u30FC\u30BF\u30B9\u30C6\u30AD\u30B9\u30C8 +IndexProgressPanel.cancelButton.text=\u30AD\u30E3\u30F3\u30BB\u30EB +ExtractedContentPanel.hitLabel.text=\u30DA\u30FC\u30B8\u4E0A\u306E\u4E00\u81F4 +ExtractedContentPanel.hitCountLabel.text= +ExtractedContentPanel.hitOfLabel.text= +ExtractedContentPanel.hitTotalLabel.text= +ExtractedContentPanel.hitButtonsLabel.text=\u4E00\u81F4 +ExtractedContentPanel.copyMenuItem.text=\u30B3\u30D4\u30FC +ExtractedContentPanel.selectAllMenuItem.text=\u3059\u3079\u3066\u9078\u629E +KeywordSearchEditListPanel.saveListButton.text=\u30EA\u30B9\u30C8\u3092\u30B3\u30D4\u30FC +KeywordSearchEditListPanel.addWordButton.text=\u8FFD\u52A0 +KeywordSearchEditListPanel.chRegex.text=\u4E00\u822C\u7684\u306A\u8868\u73FE +KeywordSearchEditListPanel.deleteWordButton.text=\u9078\u629E\u3057\u305F\u3082\u306E\u3092\u524A\u9664 +KeywordSearchEditListPanel.cutMenuItem.text=\u30AB\u30C3\u30C8 +KeywordSearchEditListPanel.selectAllMenuItem.text=\u3059\u3079\u3066\u9078\u629E +KeywordSearchEditListPanel.pasteMenuItem.text=\u8CBC\u308A\u4ED8\u3051 +KeywordSearchEditListPanel.copyMenuItem.text=\u30B3\u30D4\u30FC +KeywordSearchEditListPanel.exportButton.text=\u30EA\u30B9\u30C8\u3092\u30A8\u30AF\u30B9\u30DD\u30FC\u30C8 +KeywordSearchEditListPanel.deleteListButton.text=\u30EA\u30B9\u30C8\u3092\u524A\u9664 +KeywordSearchListsManagementPanel.newListButton.text=\u65B0\u898F\u30EA\u30B9\u30C8 +KeywordSearchEditListPanel.useForIngestCheckbox.text=\u51E6\u7406\u4E2D\u306B\u4F7F\u7528 +KeywordSearchListsManagementPanel.importButton.text=\u30EA\u30B9\u30C8\u3092\u30A4\u30F3\u30DD\u30FC\u30C8 +KeywordSearchPanel.searchBox.text=\u691C\u7D22... +KeywordSearchPanel.regExCheckboxMenuItem.text=\u4E00\u822C\u7684\u306A\u8868\u73FE\u3092\u4F7F\u7528 +KeywordSearchListsViewerPanel.searchAddButton.text=\u691C\u7D22 +KeywordSearchListsViewerPanel.manageListsButton.text=\u30EA\u30B9\u30C8\u3092\u7BA1\u7406 +KeywordSearchListsViewerPanel.ingestIndexLabel.text=\u30A4\u30F3\u30C7\u30C3\u30AF\u30B9\u5316\u3055\u308C\u305F\u30D5\u30A1\u30A4\u30EB\uFF1A +KeywordSearchPanel.cutMenuItem.text=\u30AB\u30C3\u30C8 +KeywordSearchPanel.copyMenuItem.text=\u30B3\u30D4\u30FC +KeywordSearchPanel.pasteMenuItem.text=\u8CBC\u308A\u4ED8\u3051 +KeywordSearchPanel.selectAllMenuItem.text=\u3059\u3079\u3066\u9078\u629E +ExtractedContentPanel.pageButtonsLabel.text=\u30DA\u30FC\u30B8 +ExtractedContentPanel.pagesLabel.text=\u30DA\u30FC\u30B8\uFF1A +KeywordSearchEditListPanel.ingestMessagesCheckbox.text=\u51E6\u7406\u4E2D\u306B\u30E1\u30C3\u30BB\u30FC\u30B8\u3092\u30A4\u30F3\u30DC\u30C3\u30AF\u30B9\u306B\u9001\u4FE1 +KeywordSearchEditListPanel.ingestMessagesCheckbox.toolTipText=\u3053\u306E\u30EA\u30B9\u30C8\u306E\u30AD\u30FC\u30EF\u30FC\u30C9\u304C\u691C\u7D22\u306B\u30D2\u30C3\u30C8\u3057\u305F\u5834\u5408\u3001\u51E6\u7406\u4E2D\u306B\u30E1\u30C3\u30BB\u30FC\u30B8\u3092\u30A4\u30F3\u30DC\u30C3\u30AF\u30B9\u306B\u9001\u4FE1 +KeywordSearchConfigurationPanel2.skipNSRLCheckBox.text=\u51E6\u7406\u4E2D\u306BNSRL\u306E\u30D5\u30A1\u30A4\u30EB\uFF08\u65E2\u77E5\u306E\u30D5\u30A1\u30A4\u30EB\uFF09\u3092\u30AD\u30FC\u30EF\u30FC\u30C9\u30A4\u30F3\u30C7\u30C3\u30AF\u30B9\u306B\u8FFD\u52A0\u3057\u306A\u3044 +KeywordSearchConfigurationPanel2.skipNSRLCheckBox.toolTipText=Hash DB\u30B5\u30FC\u30D3\u30B9\u3092\u4E8B\u524D\u306B\u5B9F\u884C\u3059\u308B\u304B\u3001\u6B21\u56DE\u306E\u51E6\u7406\u6642\u306B\u9078\u629E\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002 +KeywordSearchConfigurationPanel2.filesIndexedLabel.text=\u30AD\u30FC\u30EF\u30FC\u30C9\u30A4\u30F3\u30C7\u30C3\u30AF\u30B9\u5185\u306E\u30D5\u30A1\u30A4\u30EB\uFF1A +KeywordSearchIngestSimplePanel.languagesLabel.text=\u4E0D\u660E\u306A\u30D5\u30A1\u30A4\u30EB\u5F62\u5F0F\u304B\u3089\u306E\u30B9\u30C8\u30EA\u30F3\u30B0\u62BD\u51FA\u3092\u6709\u52B9\u306B\u3057\u305F\u30B9\u30AF\u30EA\u30D7\u30C8\uFF1A +KeywordSearchIngestSimplePanel.languagesLabel.toolTipText=\u4E0D\u660E\u306A\u30D5\u30A1\u30A4\u30EB\u5F62\u5F0F\u304B\u3089\u306E\u30B9\u30C8\u30EA\u30F3\u30B0\u62BD\u51FA\u3092\u6709\u52B9\u306B\u3057\u305F\u30B9\u30AF\u30EA\u30D7\u30C8\u3002\u30A2\u30C9\u30D0\u30F3\u30B9\u8A2D\u5B9A\u3067\u5909\u66F4\u304C\u53EF\u80FD\u3067\u3059\u3002 +KeywordSearchConfigurationPanel3.languagesLabel.text=\u6709\u52B9\u306A\u30B9\u30AF\u30EA\u30D7\u30C8\uFF08\u8A00\u8A9E\uFF09\uFF1A +KeywordSearchConfigurationPanel2.chunksLabel.text=\u30AD\u30FC\u30EF\u30FC\u30C9\u30A4\u30F3\u30C7\u30C3\u30AF\u30B9\u5185\u306E\u30C1\u30E3\u30F3\u30AF\uFF1A +KeywordSearchConfigurationPanel3.enableUTF8Checkbox.text=UTF8\u30C6\u30AD\u30B9\u30C8\u62BD\u51FA\u306E\u6709\u52B9\u5316 +KeywordSearchConfigurationPanel3.enableUTF16Checkbox.text=UTF16LE\u3068UTF16BE\u30B9\u30C8\u30EA\u30F3\u30B0\u62BD\u51FA\u306E\u6709\u52B9\u5316 +KeywordSearchEditListPanel.keywordOptionsLabel.text=\u30AD\u30FC\u30EF\u30FC\u30C9\u30AA\u30D7\u30B7\u30E7\u30F3 +KeywordSearchEditListPanel.listOptionsLabel.text=\u30EA\u30B9\u30C8\u30AA\u30D7\u30B7\u30E7\u30F3 +KeywordSearchConfigurationPanel3.ingestSettingsLabel.text=\u4E0D\u660E\u306A\u30D5\u30A1\u30A4\u30EB\u5F62\u5F0F\u304B\u3089\u306E\u30B9\u30C8\u30EA\u30F3\u30B0\u62BD\u51FA\u306E\u51E6\u7406\u65B9\u6CD5\u306E\u8A2D\u5B9A\uFF08\u5909\u66F4\u306F\u6B21\u56DE\u306E\u51E6\u7406\u304B\u3089\u6709\u52B9\uFF09\uFF1A\ + +KeywordSearchConfigurationPanel2.settingsLabel.text=\u8A2D\u5B9A +KeywordSearchConfigurationPanel2.informationLabel.text=\u30A4\u30F3\u30D5\u30A9\u30E1\u30FC\u30B7\u30E7\u30F3 +KeywordSearchListsManagementPanel.keywordListsLabel.text=\u30AD\u30FC\u30EF\u30FC\u30C9\u30EA\u30B9\u30C8\uFF1A +KeywordSearchEditListPanel.keywordsLabel.text=\u30AD\u30FC\u30EF\u30FC\u30C9\uFF1A +KeywordSearchConfigurationPanel2.timeRadioButton1.toolTipText=\uFF12\uFF10\u5206\uFF08\u6700\u77ED\u306E\u51E6\u7406\u6642\u9593\uFF09\ + +KeywordSearchConfigurationPanel2.timeRadioButton1.text=\uFF12\uFF10\u5206\uFF08\u6700\u3082\u9045\u3044\u30D5\u30A3\u30FC\u30C9\u30D0\u30C3\u30AF\u3001\u6700\u77ED\u306E\u51E6\u7406\u6642\u9593\uFF09 +KeywordSearchConfigurationPanel2.timeRadioButton2.toolTipText=\uFF11\uFF10\u5206\uFF08\u30C7\u30D5\u30A9\u30EB\u30C8\u3088\u308A\u5168\u4F53\u7684\u306B\u901F\u3044\u51E6\u7406\u6642\u9593\uFF09 +KeywordSearchConfigurationPanel2.timeRadioButton2.text=\uFF11\uFF10\u5206\uFF08\u3088\u308A\u9045\u3044\u30D5\u30A3\u30FC\u30C9\u30D0\u30C3\u30AF\u3001\u3088\u308A\u901F\u3044\u51E6\u7406\u6642\u9593\uFF09 +KeywordSearchConfigurationPanel2.timeRadioButton3.toolTipText=\uFF15\u5206\uFF08\u5168\u4F53\u7684\u306A\u51E6\u7406\u6642\u9593\u304C\u9577\u304F\u306A\u308A\u307E\u3059\uFF09 +KeywordSearchConfigurationPanel2.timeRadioButton3.text=\uFF15\u5206\uFF08\u30C7\u30D5\u30A9\u30EB\u30C8\uFF09 +KeywordSearchIngestSimplePanel.encodingsLabel.text=\u30A8\u30F3\u30B3\u30FC\u30C7\u30A3\u30F3\u30B0\uFF1A +KeywordSearchIngestSimplePanel.titleLabel.text=\u51E6\u7406\u4E2D\u306B\u6709\u52B9\u306A\u30AD\u30FC\u30EF\u30FC\u30C9\u30EA\u30B9\u30C8\u3092\u9078\u629E\uFF1A +OpenIDE-Module-Short-Description=\u30AD\u30FC\u30EF\u30FC\u30C9\u691C\u7D22\u51E6\u7406\u30E2\u30B8\u30E5\u30FC\u30EB\u3001\u62BD\u51FA\u3055\u308C\u305F\u30C6\u30AD\u30B9\u30C8\u30D3\u30E5\u30FC\u30A2\u3001\u30AD\u30FC\u30EF\u30FC\u30C9\u691C\u7D22\u30C4\u30FC\u30EB +KeywordSearchListsViewerPanel.manageListsButton.toolTipText=\u30AD\u30FC\u30EF\u30FC\u30C9\u30EA\u30B9\u30C8\u3001\u30EA\u30B9\u30C8\u306E\u8A2D\u5B9A\u3068\u95A2\u9023\u3059\u308B\u30AD\u30FC\u30EF\u30FC\u30C9\u306E\u7BA1\u7406\u3002\u3053\u306E\u8A2D\u5B9A\u306F\u5168\u3066\u306E\u30B1\u30FC\u30B9\u306B\u9069\u7528\u3055\u308C\u307E\u3059\u3002 +KeywordSearchConfigurationPanel2.frequencyLabel.text=\u51E6\u7406\u4E2D\u306E\u7D50\u679C\u66F4\u65B0\u306E\u983B\u5EA6\uFF1A +KeywordSearchConfigurationPanel2.timeRadioButton4.text_1=\uFF11\u5206\uFF08\u3088\u308A\u901F\u3044\u30D5\u30A3\u30FC\u30C9\u30D0\u30C3\u30AF\u3001\u6700\u3082\u9577\u3044\u51E6\u7406\u6642\u9593\uFF09 +KeywordSearchConfigurationPanel2.timeRadioButton4.toolTipText=\uFF11\u5206\uFF08\u5168\u4F53\u7684\u306A\u51E6\u7406\u6642\u9593\u304C\u9577\u304F\u306A\u308A\u307E\u3059\uFF09 +KeywordSearchConfigurationPanel2.showSnippetsCB.text=\u30AD\u30FC\u30EF\u30FC\u30C9\u691C\u7D22\u7D50\u679C\u306B\u30AD\u30FC\u30EF\u30FC\u30C9\u30D7\u30EC\u30D3\u30E5\u30FC\u3092\u8868\u793A\uFF08\u691C\u7D22\u6642\u9593\u304C\u9577\u304F\u306A\u308A\u307E\u3059\uFF09 +AbstractKeywordSearchPerformer.search.dialogErrorHeader=\u30AD\u30FC\u30EF\u30FC\u30C9\u691C\u7D22\u30A8\u30E9\u30FC +AbstractKeywordSearchPerformer.search.invalidSyntaxHeader=\u30B7\u30F3\u30BF\u30C3\u30AF\u30B9\u30A8\u30E9\u30FC\ + +AbstractKeywordSearchPerformer.search.searchIngestInProgressTitle=\u30AD\u30FC\u30EF\u30FC\u30C9\u30A4\u30F3\u30C7\u30C3\u30AF\u30B9\u5316\u3092\u5B9F\u884C\u4E2D\ + +AbstractKeywordSearchPerformer.search.ingestInProgressBody=\u30AD\u30FC\u30EF\u30FC\u30C9\u30A4\u30F3\u30C7\u30C3\u30AF\u30B9\u5316\u3092\u5B9F\u884C\u4E2D
\u5168\u3066\u306E\u30D5\u30A1\u30A4\u30EB\u304C\u30A4\u30F3\u30C7\u30C3\u30AF\u30B9\u5316\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002\u691C\u7D22\u7D50\u679C\u304C\u4E0D\u5B8C\u5168\u306B\u306A\u308B\u5834\u5408\u304C\u3042\u308A\u307E\u3059\u3002
\u3053\u306E\u691C\u7D22\u3092\u5B9F\u884C\u3057\u307E\u3059\u304B\uFF1F +AbstractKeywordSearchPerformer.search.emptyKeywordErrorBody=\u30AD\u30FC\u30EF\u30FC\u30C9\u30EA\u30B9\u30C8\u304C\u7A7A\u767D\u3067\u3059\u3002\u6700\u4F4E\uFF11\u3064\u30AD\u30FC\u30EF\u30FC\u30C9\u3092\u8FFD\u52A0\u3057\u3066\u4E0B\u3055\u3044\u3002 +AbstractKeywordSearchPerformer.search.pleaseEnterKeywordBody=\u691C\u7D22\u3059\u308B\u30AD\u30FC\u30EF\u30FC\u30C9\u3092\u5165\u529B\u3057\u3066\u4E0B\u3055\u3044 +AbstractKeywordSearchPerformer.search.noFilesInIdxMsg=\u30A4\u30F3\u30C7\u30C3\u30AF\u30B9\u306B\u307E\u3060\u30D5\u30A1\u30A4\u30EB\u304C\u3042\u308A\u307E\u305B\u3093\u3002
\u3057\u3070\u3089\u304F\u3057\u3066\u304B\u3089\u3001\u518D\u5EA6\u5B9F\u884C\u3057\u3066\u304F\u3060\u3055\u3044\u3002\u30A4\u30F3\u30C7\u30C3\u30AF\u30B9\u306F\u3000{0}\u3000\u5206\u6BCE\u66F4\u65B0\u3055\u308C\u307E\u3059\u3002 +AbstractKeywordSearchPerformer.search.noFilesIdxdMsg=\u30A4\u30F3\u30C7\u30C3\u30AF\u30B9\u5316\u3055\u308C\u305F\u30D5\u30A1\u30A4\u30EB\u304C\u3042\u308A\u307E\u305B\u3093\u3002
\u30AD\u30FC\u30EF\u30FC\u30C9\u691C\u7D22\u30E2\u30B8\u30E5\u30FC\u30EB\u3092\u6709\u52B9\u5316\u3057\u3066\u30A4\u30E1\u30FC\u30B8\u3092\u518D\u51E6\u7406\u3002 +ExtractedContentPanel.setMarkup.panelTxt=\u30C6\u30AD\u30B9\u30C8\u30ED\u30FC\u30C9\u4E2D\u3002\u3057\u3070\u3089\u304F\u304A\u5F85\u3061\u304F\u3060\u3055\u3044... +ExtractedContentViewer.toString=\u62BD\u51FA\u3055\u308C\u305F\u30C6\u30AD\u30B9\u30C8 +ExtractedContentViewer.toolTip=\u30D5\u30A1\u30A4\u30EB\u3084\u30AD\u30FC\u30EF\u30FC\u30C9\u691C\u7D22\u7D50\u679C\u304B\u3089\u62BD\u51FA\u3055\u308C\u305F\u30C6\u30AD\u30B9\u30C8\u3092\u8868\u793A\u3002\u3053\u306E\u30D3\u30E5\u30FC\u30A2\u3092\u30A2\u30AF\u30C6\u30A3\u30D9\u30A4\u30C8\u3059\u308B\u306B\u306F\u3001\u30AD\u30FC\u30EF\u30FC\u30C9\u691C\u7D22\u51E6\u7406\u3092\u30D5\u30A1\u30A4\u30EB\u4E0A\u3067\u5B9F\u884C\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002 +ExtractedContentViewer.getTitle=\u30C6\u30AD\u30B9\u30C8 +ExtractedContentViewer.getSolrContent.knownFileMsg=

{0}\u306F\u65E2\u77E5\u30D5\u30A1\u30A4\u30EB\u3067\u3059\uFF08MDS\u30CF\u30C3\u30B7\u30E5\u306B\u57FA\u3065\u304F\u3068\uFF09\u3002\u30A4\u30F3\u30C7\u30C3\u30AF\u30B9\u306B\u30C6\u30AD\u30B9\u30C8\u304C\u3042\u308A\u307E\u305B\u3093\u3002

+ExtractedContentViewer.getSolrContent.noTxtYetMsg=

{0}\u306E\u30A4\u30F3\u30C7\u30C3\u30AF\u30B9\u306B\u30C6\u30AD\u30B9\u30C8\u304C\u3042\u308A\u307E\u305B\u3093\u3002
\u30C6\u30AD\u30B9\u30C8\u304C\u7121\u3044\u304B\u3001\u307E\u3060\u89E3\u6790\u3055\u308C\u3066\u3044\u306A\u3044\u304B\u3001\u30AD\u30FC\u30EF\u30FC\u30C9\u691C\u7D22\u304C\u51E6\u7406\u4E2D\u306B\u6709\u52B9\u5316\u3055\u308C\u3066\u3044\u306A\u304B\u3063\u305F\u306E\u304B\u3082\u3057\u308C\u307E\u305B\u3093\u3002

+HighlightedMatchesSource.getMarkup.noMatchMsg=
\u3053\u306E\u30DA\u30FC\u30B8\u4E0A\u3067\u30AD\u30FC\u30EF\u30FC\u30C9\u304C\u30D2\u30C3\u30C8\u3057\u307E\u305B\u3093\u3067\u3057\u305F\u3002
\u30AD\u30FC\u30EF\u30FC\u30C9\u304C\u30D5\u30A1\u30A4\u30EB\u540D\u306B\u542B\u307E\u308C\u3066\u3044\u305F\u304B\u3082\u3057\u308C\u307E\u305B\u3093\u3002 
\u5225\u306E\u30DA\u30FC\u30B8\u306B\u79FB\u52D5\u3059\u308B\u304B\u3001\u30AA\u30EA\u30B8\u30CA\u30EB\u30C6\u30AD\u30B9\u30C8\u3092\u8868\u793A\u3059\u308B\u306E\u306B\u3001\u300C\u62BD\u51FA\u3055\u308C\u305F\u30C6\u30AD\u30B9\u30C8\u300D\u3092\u9078\u629E\u3057\u3066\u4E0B\u3055\u3044\u3002
+HighlightedMatchesSource.toString=\u691C\u7D22\u7D50\u679C +Installer.reportPortError=\u30A4\u30F3\u30C7\u30C3\u30AF\u30B9\u30B5\u30FC\u30D0\u30FC\u30DD\u30FC\u30C8 {0} \u306F\u5229\u7528\u3067\u304D\u307E\u305B\u3093\u3002\u4F7F\u7528\u3057\u3066\u3044\u308B\u30BB\u30AD\u30E5\u30EA\u30C6\u30A3\u30BD\u30D5\u30C8\u30A6\u30A7\u30A2\u304C {1} \u3092\u30D6\u30ED\u30C3\u30AF\u3057\u3066\u3044\u306A\u3044\u304B\u78BA\u8A8D\u3057\u3001\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u30E6\u30FC\u30B6\u30FC\u30D5\u30A9\u30EB\u30C0\u30FC\u5185\u306E {3} \u306E {2} \u306E\u30D7\u30ED\u30D1\u30C6\u30A3\u30D5\u30A1\u30A4\u30EB\u306E\u5909\u66F4\u3092\u691C\u8A0E\u3057\u3066\u304F\u3060\u3055\u3044\u3002\u3082\u3057\u4ED6\u306E\u51E6\u7406\u304C\u554F\u984C\u306E\u539F\u56E0\u3067\u3042\u308C\u3070\u3001\u30B7\u30B9\u30C6\u30E0\u3092\u518D\u8D77\u52D5\u3057\u3066\u4E0B\u3055\u3044\u3002\ +"consider changing" should it be check if you can change? +Installer.reportStopPortError=\u30A4\u30F3\u30C7\u30C3\u30AF\u30B9\u30B5\u30FC\u30D0\u30FC\u30B9\u30C8\u30C3\u30D7\u30DD\u30FC\u30C8 {0} \u306F\u5229\u7528\u3067\u304D\u307E\u305B\u3093\u3002\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u30E6\u30FC\u30B6\u30FC\u30D5\u30A9\u30EB\u30C0\u30FC\u5185\u306E {1} \u306E {2} \u306E\u30D7\u30ED\u30D1\u30C6\u30A3\u30D5\u30A1\u30A4\u30EB\u306E\u5909\u66F4\u3092\u691C\u8A0E\u3057\u3066\u304F\u3060\u3055\u3044\u3002 +Installer.errorInitKsmMsg=\u30AD\u30FC\u30EF\u30FC\u30C9\u691C\u7D22\u30E2\u30B8\u30E5\u30FC\u30EB\u306E\u8D77\u52D5\u30A8\u30E9\u30FC +Installer.reportInitError=\u30A4\u30F3\u30C7\u30C3\u30AF\u30B9\u30B5\u30FC\u30D0\u30FC\u30DD\u30FC\u30C8 {0} \u306F\u5229\u7528\u3067\u304D\u307E\u305B\u3093\u3002\u4F7F\u7528\u3057\u3066\u3044\u308B\u30BB\u30AD\u30E5\u30EA\u30C6\u30A3\u30BD\u30D5\u30C8\u30A6\u30A7\u30A2\u304C {1} \u3092\u30D6\u30ED\u30C3\u30AF\u3057\u3066\u3044\u306A\u3044\u304B\u78BA\u8A8D\u3057\u3001\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u30E6\u30FC\u30B6\u30FC\u30D5\u30A9\u30EB\u30C0\u30FC\u5185\u306E {2} \u306E {3} \u306E\u30D7\u30ED\u30D1\u30C6\u30A3\u30D5\u30A1\u30A4\u30EB\u306E\u5909\u66F4\u3092\u691C\u8A0E\u3057\u3066\u304F\u3060\u3055\u3044\u3002\u3082\u3057\u4ED6\u306E\u51E6\u7406\u304C\u554F\u984C\u306E\u539F\u56E0\u3067\u3042\u308C\u3070\u3001\u30B7\u30B9\u30C6\u30E0\u3092\u518D\u8D77\u52D5\u3057\u3066\u4E0B\u3055\u3044\u3002 +KeywordSearchConfigurationPanel.customizeComponents.title=\u30A2\u30C9\u30D0\u30F3\u30B9\u30AD\u30FC\u30EF\u30FC\u30C9\u691C\u7D22\u8A2D\u5B9A +KeywordSearchConfigurationPanel.customizeComponents.listTabTitle=\u30EA\u30B9\u30C8 +KeywordSearchConfigurationPanel.customizeComponents.stringExtTitle=\u30B9\u30C8\u30EA\u30F3\u30B0\u62BD\u51FA +KeywordSearchConfigurationPanel.customizeComponents.genTabTitle=\u4E00\u822C +KeywordSearchConfigurationPanel.customizeComponents.listLabToolTip=\u30EA\u30B9\u30C8\u8A2D\u5B9A +KeywordSearchConfigurationPanel.customizeComponents.stringExtToolTip=\u30AD\u30FC\u30EF\u30FC\u30C9\u691C\u7D22\u51E6\u7406\u306E\u30B9\u30C8\u30EA\u30F3\u30B0\u62BD\u51FA\u8A2D\u5B9A +KeywordSearchConfigurationPanel.customizeComponents.genTabToolTip=\u4E00\u822C\u8A2D\u5B9A +KeywordSearchConfigurationPanel1.customizeComponents.title=\u30AD\u30FC\u30EF\u30FC\u30C9\u30EA\u30B9\u30C8\u3092\u524A\u9664 +KeywordSearchConfigurationPanel1.customizeComponents.body=\u5168\u3066\u306E\u30B1\u30FC\u30B9\u306B\u304A\u3051\u308B\u30AD\u30FC\u30EF\u30FC\u30C9\u30EA\u30B9\u30C8\u3092\u524A\u9664\u3057\u307E\u3059\u3002\u3053\u306E\u524A\u9664\u3092\u5B9F\u884C\u3057\u307E\u3059\u304B\uFF1F +KeywordSearchConfigurationPanel1.customizeComponents.keywordListEmptyErr=\u30AD\u30FC\u30EF\u30FC\u30C9\u30EA\u30B9\u30C8\u304C\u7A7A\u767D\u3067\u3059\u306E\u3067\u3001\u4FDD\u5B58\u3067\u304D\u307E\u305B\u3093 +KeywordSearch.newKwListTitle=\u65B0\u898F\u30AD\u30FC\u30EF\u30FC\u30C9\u30EA\u30B9\u30C8\u540D\uFF1A +KeywordSearchConfigurationPanel1.customizeComponents.noOwDefaultMsg=\u30C7\u30D5\u30A9\u30EB\u30C8\u30EA\u30B9\u30C8\u306F\u4E0A\u66F8\u304D\u3067\u304D\u307E\u305B\u3093 +KeywordSearchConfigurationPanel1.customizeComponents.kwListExistMsg=\u30AD\u30FC\u30EF\u30FC\u30C9\u30EA\u30B9\u30C8 <{0}> \u306F\u65E2\u306B\u5B58\u5728\u3057\u307E\u3059\u3002\u4E0A\u66F8\u304D\u3057\u307E\u3059\u304B\uFF1F +KeywordSearchConfigurationPanel1.customizeComponents.kwListSavedMsg=\u30AD\u30FC\u30EF\u30FC\u30C9\u30EA\u30B9\u30C8 <{0}> \u4FDD\u5B58\u3055\u308C\u307E\u3057\u305F +KeywordSearchEditListPanel.customizeComponents.kwReToolTip=\u30AD\u30FC\u30EF\u30FC\u30C9\u306F\u4E00\u822C\u7684\u306A\u8868\u73FE\u3067\u3059 +KeywordSearchEditListPanel.customizeComponents.addWordToolTip=\u30AD\u30FC\u30EF\u30FC\u30C9\u691C\u7D22\u30EA\u30B9\u30C8\u306B\u5358\u8A9E\u3092\u8FFD\u52A0 +KeywordSearchEditListPanel.customizeComponents.enterNewWordToolTip=\u65B0\u898F\u5358\u8A9E\u3084\u4E00\u822C\u7684\u306A\u8868\u73FE\u3092\u5165\u529B +KeywordSearchEditListPanel.customizeComponents.exportToFile=\u65E2\u5B58\u306E\u30AD\u30FC\u30EF\u30FC\u30C9\u30EA\u30B9\u30C8\u3092\u30D5\u30A1\u30A4\u30EB\u306B\u30A8\u30AF\u30B9\u30DD\u30FC\u30C8 +KeywordSearchEditListPanel.customizeComponents.saveCurrentWIthNewNameToolTip=\u65E2\u5B58\u306E\u30AD\u30FC\u30EF\u30FC\u30C9\u30EA\u30B9\u30C8\u306B\u540D\u524D\u3092\u4ED8\u3051\u3066\u4FDD\u5B58 +KeywordSearchEditListPanel.customizeComponents.removeSelectedMsg=\u9078\u629E\u3057\u305F\u30AD\u30FC\u30EF\u30FC\u30C9\u3092\u30EA\u30B9\u30C8\u304B\u3089\u524A\u9664 +KeywordSearchEditListPanel.newKwTitle=\u65B0\u898F\u30AD\u30FC\u30EF\u30FC\u30C9\u30A8\u30F3\u30C8\u30EA\u30FC +KeywordSearchEditListPanel.addWordButtonAction.kwAlreadyExistsMsg=\u30AD\u30FC\u30EF\u30FC\u30C9\u306F\u65E2\u306B\u30EA\u30B9\u30C8\u306B\u5B58\u5728\u3057\u307E\u3059\u3002 +KeywordSearchEditListPanel.invalidKwMsg=\u7121\u52B9\u306A\u30AD\u30FC\u30EF\u30FC\u30C9\u30D1\u30BF\u30FC\u30F3\u3002\u5358\u8A9E\u3082\u3057\u304F\u306F\u6B63\u3057\u3044\u4E00\u822C\u7684\u306A\u8868\u73FE\u3092\u5165\u529B\u3057\u3066\u304F\u3060\u3055\u3044\u3002 +KeywordSearchEditListPanel.removeKwMsg=\u30AD\u30FC\u30EF\u30FC\u30C9\u3092\u524A\u9664 +KeywordSearchEditListPanel.deleteWordButtonActionPerformed.delConfirmMsg=\u5168\u3066\u306E\u30B1\u30FC\u30B9\u306B\u304A\u3051\u308B\u30AD\u30FC\u30EF\u30FC\u30C9\u30EA\u30B9\u30C8\u3092\u524A\u9664\u3057\u307E\u3059\u3002\u3053\u306E\u524A\u9664\u3092\u5B9F\u884C\u3057\u307E\u3059\u304B\uFF1F +KeywordSearchEditListPanel.exportButtonActionPerformed.fileFilterLabel=\u30AD\u30FC\u30EF\u30FC\u30C9\u30EA\u30B9\u30C8XML\u30D5\u30A1\u30A4\u30EB +KeywordSearchEditListPanel.exportButtonActionPerformed.fileExistPrompt=\ {0} \u30D5\u30A1\u30A4\u30EB\u306F\u65E2\u306B\u5B58\u5728\u3057\u307E\u3059\u3002\u4E0A\u66F8\u304D\u3057\u307E\u3059\u304B\uFF1F +KeywordSearchEditListPanel.exportButtonActionPerformed.kwListExportedMsg=\u30A8\u30AF\u30B9\u30DD\u30FC\u30C8\u3055\u308C\u305F\u30AD\u30FC\u30EF\u30FC\u30C9\u30EA\u30B9\u30C8 +KeywordSearchEditListPanel.kwColName=\u30AD\u30FC\u30EF\u30FC\u30C9 +KeywordSearchEditListPanel.exportButtonActionPerformed.regExColName=\u4E00\u822C\u7684\u306A\u8868\u73FE +KeywordSearchFilterNode.getFileActions.openExternViewActLbl=\u5916\u90E8\u30D3\u30E5\u30FC\u30A2\u3067\u958B\u304F +KeywordSearchFilterNode.getFileActions.searchSameMd5=\u540C\u4E00\u306EMD5\u30CF\u30C3\u30B7\u30E5\u3092\u6301\u3064\u30D5\u30A1\u30A4\u30EB\u3092\u691C\u7D22 +KeywordSearchFilterNode.getFileActions.viewInNewWinActionLbl=\u65B0\u3057\u3044\u30A6\u30A3\u30F3\u30C9\u30A6\u3067\u8868\u793A +KeywordSearchIngestModule.init.badInitMsg=\u30AD\u30FC\u30EF\u30FC\u30C9\u691C\u7D22\u30B5\u30FC\u30D0\u30FC\u304C\u6B63\u3057\u304F\u8D77\u52D5\u3057\u307E\u305B\u3093\u3067\u3057\u305F\u3002\u30AD\u30FC\u30EF\u30FC\u30C9\u691C\u7D22\u51E6\u7406\u3092\u5B9F\u884C\u3067\u304D\u307E\u305B\u3093\u3002 +KeywordSearchIngestModule.init.tryStopSolrMsg={0}
\u53E4\u3044java Solr\u51E6\u7406\u3092\u505C\u6B62\u3057\uFF08\u3082\u3057\u5B58\u5728\u3059\u308C\u3070\uFF09\u3001\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u3092\u518D\u8D77\u52D5\u3057\u3066\u304F\u3060\u3055\u3044\u3002 +KeywordSearchIngestModule.init.noKwInLstMsg=\u30AD\u30FC\u30EF\u30FC\u30C9\u30EA\u30B9\u30C8\u306B\u30AD\u30FC\u30EF\u30FC\u30C9\u304C\u3042\u308A\u307E\u305B\u3093\u3002 +KeywordSearchIngestModule.init.onlyIdxKwSkipMsg=\u30A4\u30F3\u30C7\u30C3\u30AF\u30B9\u5316\u3060\u3051\u5B9F\u884C\u3055\u308C\u3001\u30AD\u30FC\u30EF\u30FC\u30C9\u691C\u7D22\u306F\u30B9\u30AD\u30C3\u30D7\u3055\u308C\u307E\u3059\uFF08\u300C\u30AD\u30FC\u30EF\u30FC\u30C9\u30EA\u30B9\u30C8 - \u51E6\u7406\u306B\u8FFD\u52A0\u300D\u3092\u4F7F\u7528\u3057\u3001\u30AD\u30FC\u30EF\u30FC\u30C9\u30EA\u30B9\u30C8\u3092\u8FFD\u52A0\u3059\u308B\u306E\u306F\u53EF\u80FD\u3067\u3059\ +Keyword Lists - Add to Ingest\u3000one word?? +KeywordSearchIngestModule.postIndexSummary.knowFileHeaderLbl=\u65E2\u77E5\u306E\u7A2E\u985E\u306E\u30D5\u30A1\u30A4\u30EB +KeywordSearchIngestModule.postIndexSummary.fileGenStringsHead=\u4E00\u822C\u7684\u306A\u30B9\u30C8\u30EA\u30F3\u30B0\u304C\u62BD\u51FA\u3055\u308C\u305F\u30D5\u30A1\u30A4\u30EB +KeywordSearchIngestModule.postIndexSummary.mdOnlyLbl=\u30E1\u30BF\u30C7\u30FC\u30BF\u306E\u307F\u30A4\u30F3\u30C7\u30C3\u30AF\u30B9\u5316\u3055\u308C\u307E\u3057\u305F +KeywordSearchIngestModule.postIndexSummary.idxErrLbl=\u30A8\u30E9\u30FC\uFF08\u30A4\u30F3\u30C7\u30C3\u30AF\u30B9\u30A8\u30E9\u30FC\uFF09\ + +KeywordSearchIngestModule.postIndexSummary.errTxtLbl=\u30A8\u30E9\u30FC\uFF08\u30C6\u30AD\u30B9\u30C8\u62BD\u51FA\uFF09 +KeywordSearchIngestModule.postIndexSummary.errIoLbl=\u30A8\u30E9\u30FC\uFF08I/O\uFF09 +KeywordSearchIngestModule.postIndexSummary.kwIdxResultsLbl=\u30AD\u30FC\u30EF\u30FC\u30C9\u30A4\u30F3\u30C7\u30C3\u30AF\u30B9\u5316\u7D50\u679C +KeywordSearchIngestModule.postIndexSummary.kwIdxErrsTitle=\u30AD\u30FC\u30EF\u30FC\u30C9\u30A4\u30F3\u30C7\u30C3\u30AF\u30B9\u5316\u30A8\u30E9\u30FC +KeywordSearchIngestModule.postIndexSummary.kwIdxErrMsgFiles=\u30AD\u30FC\u30EF\u30FC\u30C9\u30A4\u30F3\u30C7\u30C3\u30AF\u30B9\u30B5\u30FC\u30D3\u30B9\u4E2D\u306B {0} \u30D5\u30A1\u30A4\u30EB\u306E\u51E6\u7406\u30A8\u30E9\u30FC\u304C\u3042\u308A\u307E\u3057\u305F\u3002 +KeywordSearchIngestModule.postIndexSummary.kwIdxWarnMsgTitle=\u30AD\u30FC\u30EF\u30FC\u30C9\u30A4\u30F3\u30C7\u30C3\u30AF\u30B9\u5316\u8B66\u544A +KeywordSearchIngestModule.postIndexSummary.idxErrReadFilesMsg=\u30AD\u30FC\u30EF\u30FC\u30C9\u30A4\u30F3\u30C7\u30C3\u30AF\u30B9\u30B5\u30FC\u30D3\u30B9\u4E2D\u306B\u30D5\u30A1\u30A4\u30EB\u306E\u8AAD\u307F\u8FBC\u307F\u3084\u30C6\u30AD\u30B9\u30C8\u62BD\u51FA\u4E2D\u306B\u30A8\u30E9\u30FC\u304C\u3042\u308A\u307E\u3057\u305F\u3002\u539F\u56E0\u306F\u7834\u640D\u3057\u305F\u30E1\u30C7\u30A3\u30A2\u3084\u30D5\u30A1\u30A4\u30EB\u304B\u3082\u3057\u308C\u307E\u305B\u3093\u3002 +KeywordSearchListsViewerPanel.initIngest.addIngestTitle=\u51E6\u7406\u306B\u8FFD\u52A0 +KeywordSearchListsViewerPanel.initIngest.addIngestMsg=\u8FFD\u52A0\u306E\u30AD\u30FC\u30EF\u30FC\u30C9\u30EA\u30B9\u30C8\u3092\u9078\u629E\u3067\u304D\u307E\u3059
\u305D\u3057\u3066\u5B9F\u884C\u4E2D\u306E\u51E6\u7406\u306B\u8FFD\u52A0\u3067\u304D\u307E\u3059
\u6B21\u56DE\u306E\u30D5\u30A1\u30A4\u30EB\u30A4\u30F3\u30C7\u30C3\u30AF\u30B9\u518D\u69CB\u7BC9\u306E\u3068\u304D\u306B\u9078\u629E\u3055\u308C\u305F\u30EA\u30B9\u30C8\u3082\u691C\u7D22\u3055\u308C\u307E\u3059\u3002 +KeywordSearchListsViewerPanel.initIngest.searchIngestTitle=\u691C\u7D22 +KeywordSearchListsViewerPanel.initIngest.addIdxSearchMsg=\u9078\u629E\u3057\u305F\u30EA\u30B9\u30C8\u5185\u306E\u30AD\u30FC\u30EF\u30FC\u30C9\u3092\u30A4\u30F3\u30C7\u30C3\u30AF\u30B9\u5316\u3055\u308C\u305F\u30D5\u30A1\u30A4\u30EB\u5185\u3067\u691C\u7D22 +KeywordSearchListsViewerPanel.initIngest.ongoingIngestMsg=\u30A4\u30F3\u30C7\u30C3\u30AF\u30B9\u5316\u3055\u308C\u305F\u30D5\u30A1\u30A4\u30EB\uFF1A {0} \uFF08\u51E6\u7406\u306F\u5B9F\u884C\u4E2D\uFF09 +KeywordSearchListsViewerPanel.initIngest.fileIndexCtMsg=\u30A4\u30F3\u30C7\u30C3\u30AF\u30B9\u5316\u3055\u308C\u305F\u30D5\u30A1\u30A4\u30EB\uFF1A {0} +KeywordSearch.selectedColLbl=\u9078\u629E\u6E08\u307F +KeywordSearch.nameColLbl=\u540D\u524D +KeywordSearch.regExColLbl=\u4E00\u822C\u7684\u306A\u8868\u73FE +KeywordSearchQueryManager.execute.exeWinTitle=\u30AD\u30FC\u30EF\u30FC\u30C9\u691C\u7D22 {0} - {1} +KeywordSearch.newKeywordListMsg=\u65B0\u898F\u30AD\u30FC\u30EF\u30FC\u30C9\u30EA\u30B9\u30C8 +KeywordSearch.importListFileDialogMsg=\ {0}\u3000\u30D5\u30A1\u30A4\u30EB\u304B\u3089\u30AD\u30FC\u30EF\u30FC\u30C9\u30EA\u30B9\u30C8\u3092\u30A4\u30F3\u30DD\u30FC\u30C8\u3059\u308B\u306E\u306B\u30A8\u30E9\u30FC\u304C\u3042\u308A\u307E\u3057\u305F +KeywordSearch.yesOwMsg=\u306F\u3044\u3001\u4E0A\u66F8\u304D\u3057\u307E\u3059 +KeywordSearch.noSkipMsg=\u3044\u3044\u3048\u3001\u30B9\u30AD\u30C3\u30D7\u3057\u307E\u3059 +KeywordSearch.cancelImportMsg=\u30A4\u30F3\u30DD\u30FC\u30C8\u3092\u30AD\u30E3\u30F3\u30BB\u30EB +KeywordSearch.overwriteListPrompt=\u30AD\u30FC\u30EF\u30FC\u30C9\u30EA\u30B9\u30C8 <{0}> \u306F\u30ED\u30FC\u30AB\u30EB\u306B\u65E2\u306B\u5B58\u5728\u3057\u307E\u3059\u304C\u3001\u4E0A\u66F8\u304D\u3057\u307E\u3059\u304B\uFF1F +KeywordSearch.importOwConflict=\u30EA\u30B9\u30C8\u30A4\u30F3\u30DD\u30FC\u30C8\u306E\u554F\u984C +KeywordSearch.kwListFailImportMsg=\u30AD\u30FC\u30EF\u30FC\u30C9\u30EA\u30B9\u30C8\u304C\u30A4\u30F3\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u305B\u3093 +KeywordSearchListsManagementPanel.fileExtensionFilterLbl=\u30AD\u30FC\u30EF\u30FC\u30C9\u30EA\u30B9\u30C8\u30D5\u30A1\u30A4\u30EB +KeywordSearch.listImportFeatureTitle=TODO \ No newline at end of file From 2c614147e05f9e84704baa92ac915c4af503d2a9 Mon Sep 17 00:00:00 2001 From: "U-BASIS\\rcordovano" Date: Mon, 27 Jan 2014 10:17:59 -0500 Subject: [PATCH 31/38] Made keyword search list management classes public again --- .../autopsy/keywordsearch/KeywordSearchListsAbstract.java | 2 +- .../sleuthkit/autopsy/keywordsearch/KeywordSearchListsXML.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchListsAbstract.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchListsAbstract.java index ab68f1f847..ab61cee3aa 100644 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchListsAbstract.java +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchListsAbstract.java @@ -33,7 +33,7 @@ import org.sleuthkit.datamodel.BlackboardAttribute; /** * Keyword list saving, loading, and editing abstract class. */ -abstract class KeywordSearchListsAbstract { +public abstract class KeywordSearchListsAbstract { protected String filePath; Map theLists; //the keyword data diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchListsXML.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchListsXML.java index 328059e44f..5891f8a406 100644 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchListsXML.java +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchListsXML.java @@ -39,7 +39,7 @@ import org.w3c.dom.NodeList; * Manages reading and writing of keyword lists to user settings XML file keywords.xml * or to any file provided in constructor */ -class KeywordSearchListsXML extends KeywordSearchListsAbstract{ +public class KeywordSearchListsXML extends KeywordSearchListsAbstract{ private static final String ROOT_EL = "keyword_lists"; private static final String LIST_EL = "keyword_list"; From be1e0528526e4f27252ef058b730749e8321c2fe Mon Sep 17 00:00:00 2001 From: Richard Cordovano Date: Mon, 27 Jan 2014 10:20:00 -0500 Subject: [PATCH 32/38] Made tagging dialogs public again --- .../sleuthkit/autopsy/actions/GetTagNameAndCommentDialog.java | 2 +- Core/src/org/sleuthkit/autopsy/actions/GetTagNameDialog.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Core/src/org/sleuthkit/autopsy/actions/GetTagNameAndCommentDialog.java b/Core/src/org/sleuthkit/autopsy/actions/GetTagNameAndCommentDialog.java index 1260f920cd..e953694d90 100644 --- a/Core/src/org/sleuthkit/autopsy/actions/GetTagNameAndCommentDialog.java +++ b/Core/src/org/sleuthkit/autopsy/actions/GetTagNameAndCommentDialog.java @@ -37,7 +37,7 @@ import org.sleuthkit.autopsy.coreutils.Logger; import org.sleuthkit.datamodel.TagName; import org.sleuthkit.datamodel.TskCoreException; - class GetTagNameAndCommentDialog extends JDialog { +public class GetTagNameAndCommentDialog extends JDialog { private static final String NO_TAG_NAMES_MESSAGE = "No Tags"; private final HashMap tagNames = new HashMap<>(); private TagNameAndComment tagNameAndComment = null; diff --git a/Core/src/org/sleuthkit/autopsy/actions/GetTagNameDialog.java b/Core/src/org/sleuthkit/autopsy/actions/GetTagNameDialog.java index 8e9d961b7e..fb0d50ddc4 100644 --- a/Core/src/org/sleuthkit/autopsy/actions/GetTagNameDialog.java +++ b/Core/src/org/sleuthkit/autopsy/actions/GetTagNameDialog.java @@ -41,7 +41,7 @@ import org.sleuthkit.autopsy.coreutils.Logger; import org.sleuthkit.datamodel.TagName; import org.sleuthkit.datamodel.TskCoreException; - class GetTagNameDialog extends JDialog { +public class GetTagNameDialog extends JDialog { private static final String TAG_ICON_PATH = "org/sleuthkit/autopsy/images/tag-folder-blue-icon-16.png"; private final HashMap tagNames = new HashMap<>(); private TagName tagName = null; From e38c22d65225061e5a19d6f98dc2af0969dd29e8 Mon Sep 17 00:00:00 2001 From: Richard Cordovano Date: Mon, 27 Jan 2014 10:56:16 -0500 Subject: [PATCH 33/38] Restored public access to hash db manager and case action exception --- .../sleuthkit/autopsy/casemodule/CaseActionException.java | 7 +++---- .../org/sleuthkit/autopsy/hashdatabase/HashDbManager.java | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/CaseActionException.java b/Core/src/org/sleuthkit/autopsy/casemodule/CaseActionException.java index 4f7e2fa6d2..01bad4a628 100644 --- a/Core/src/org/sleuthkit/autopsy/casemodule/CaseActionException.java +++ b/Core/src/org/sleuthkit/autopsy/casemodule/CaseActionException.java @@ -19,9 +19,10 @@ package org.sleuthkit.autopsy.casemodule; /** - * Exception thrown when case action (such as open, close, create) resulted in an error + * Exception thrown when case action (such as open, close, create) resulted in + * an error */ - class CaseActionException extends Exception { +public class CaseActionException extends Exception { public CaseActionException(String message) { super(message); @@ -30,6 +31,4 @@ package org.sleuthkit.autopsy.casemodule; public CaseActionException(String message, Throwable cause) { super(message, cause); } - - } diff --git a/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashDbManager.java b/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashDbManager.java index 248457f77c..cb67028c88 100755 --- a/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashDbManager.java +++ b/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashDbManager.java @@ -56,7 +56,7 @@ import org.sleuthkit.datamodel.TskCoreException; * This class implements a singleton that manages the set of hash databases * used to classify files as unknown, known or known bad. */ -class HashDbManager implements PropertyChangeListener { +public class HashDbManager implements PropertyChangeListener { private static final String ROOT_ELEMENT = "hash_sets"; private static final String SET_ELEMENT = "hash_set"; From c38faeb15fe5365767470de49a49178e0e724e58 Mon Sep 17 00:00:00 2001 From: Richard Cordovano Date: Mon, 27 Jan 2014 11:11:13 -0500 Subject: [PATCH 34/38] Restored public access to GeneralFilter and ImageFilePanel classes --- Core/src/org/sleuthkit/autopsy/casemodule/GeneralFilter.java | 2 +- Core/src/org/sleuthkit/autopsy/casemodule/ImageFilePanel.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/GeneralFilter.java b/Core/src/org/sleuthkit/autopsy/casemodule/GeneralFilter.java index d7a8e4df37..9b9a091466 100644 --- a/Core/src/org/sleuthkit/autopsy/casemodule/GeneralFilter.java +++ b/Core/src/org/sleuthkit/autopsy/casemodule/GeneralFilter.java @@ -27,7 +27,7 @@ import javax.swing.filechooser.FileFilter; /** * FileFilter helper class. Matches files based on extension */ - class GeneralFilter extends FileFilter{ +public class GeneralFilter extends FileFilter{ // Extensions & Descriptions for commonly used filters diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/ImageFilePanel.java b/Core/src/org/sleuthkit/autopsy/casemodule/ImageFilePanel.java index 6a99067af7..03dd184e8c 100644 --- a/Core/src/org/sleuthkit/autopsy/casemodule/ImageFilePanel.java +++ b/Core/src/org/sleuthkit/autopsy/casemodule/ImageFilePanel.java @@ -39,7 +39,7 @@ import org.sleuthkit.autopsy.coreutils.ModuleSettings; /** * ImageTypePanel for adding an image file such as .img, .E0x, .00x, etc. */ - class ImageFilePanel extends JPanel implements DocumentListener { +public class ImageFilePanel extends JPanel implements DocumentListener { private final String PROP_LASTIMAGE_PATH = "LBL_LastImage_PATH"; From c9d0ace569f831715a6071622f04d563f177a45b Mon Sep 17 00:00:00 2001 From: Nick Davis Date: Mon, 27 Jan 2014 12:42:27 -0500 Subject: [PATCH 35/38] Finished Japanese translation of Bundle.properties in Bundle_ja.properties. --- .../keywordsearch/Bundle_ja.properties | 23 +++++++------------ 1 file changed, 8 insertions(+), 15 deletions(-) diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Bundle_ja.properties b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Bundle_ja.properties index f684bfac60..780e6c6e59 100644 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Bundle_ja.properties +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Bundle_ja.properties @@ -52,14 +52,12 @@ KeywordSearchConfigurationPanel3.enableUTF8Checkbox.text=UTF8\u30C6\u30AD\u30B9\ KeywordSearchConfigurationPanel3.enableUTF16Checkbox.text=UTF16LE\u3068UTF16BE\u30B9\u30C8\u30EA\u30F3\u30B0\u62BD\u51FA\u306E\u6709\u52B9\u5316 KeywordSearchEditListPanel.keywordOptionsLabel.text=\u30AD\u30FC\u30EF\u30FC\u30C9\u30AA\u30D7\u30B7\u30E7\u30F3 KeywordSearchEditListPanel.listOptionsLabel.text=\u30EA\u30B9\u30C8\u30AA\u30D7\u30B7\u30E7\u30F3 -KeywordSearchConfigurationPanel3.ingestSettingsLabel.text=\u4E0D\u660E\u306A\u30D5\u30A1\u30A4\u30EB\u5F62\u5F0F\u304B\u3089\u306E\u30B9\u30C8\u30EA\u30F3\u30B0\u62BD\u51FA\u306E\u51E6\u7406\u65B9\u6CD5\u306E\u8A2D\u5B9A\uFF08\u5909\u66F4\u306F\u6B21\u56DE\u306E\u51E6\u7406\u304B\u3089\u6709\u52B9\uFF09\uFF1A\ - +KeywordSearchConfigurationPanel3.ingestSettingsLabel.text=\u4E0D\u660E\u306A\u30D5\u30A1\u30A4\u30EB\u5F62\u5F0F\u304B\u3089\u306E\u30B9\u30C8\u30EA\u30F3\u30B0\u62BD\u51FA\u306E\u51E6\u7406\u65B9\u6CD5\u306E\u8A2D\u5B9A\uFF08\u5909\u66F4\u306F\u6B21\u56DE\u306E\u51E6\u7406\u304B\u3089\u6709\u52B9\uFF09\uFF1A KeywordSearchConfigurationPanel2.settingsLabel.text=\u8A2D\u5B9A KeywordSearchConfigurationPanel2.informationLabel.text=\u30A4\u30F3\u30D5\u30A9\u30E1\u30FC\u30B7\u30E7\u30F3 KeywordSearchListsManagementPanel.keywordListsLabel.text=\u30AD\u30FC\u30EF\u30FC\u30C9\u30EA\u30B9\u30C8\uFF1A KeywordSearchEditListPanel.keywordsLabel.text=\u30AD\u30FC\u30EF\u30FC\u30C9\uFF1A -KeywordSearchConfigurationPanel2.timeRadioButton1.toolTipText=\uFF12\uFF10\u5206\uFF08\u6700\u77ED\u306E\u51E6\u7406\u6642\u9593\uFF09\ - +KeywordSearchConfigurationPanel2.timeRadioButton1.toolTipText=\uFF12\uFF10\u5206\uFF08\u6700\u77ED\u306E\u51E6\u7406\u6642\u9593\uFF09 KeywordSearchConfigurationPanel2.timeRadioButton1.text=\uFF12\uFF10\u5206\uFF08\u6700\u3082\u9045\u3044\u30D5\u30A3\u30FC\u30C9\u30D0\u30C3\u30AF\u3001\u6700\u77ED\u306E\u51E6\u7406\u6642\u9593\uFF09 KeywordSearchConfigurationPanel2.timeRadioButton2.toolTipText=\uFF11\uFF10\u5206\uFF08\u30C7\u30D5\u30A9\u30EB\u30C8\u3088\u308A\u5168\u4F53\u7684\u306B\u901F\u3044\u51E6\u7406\u6642\u9593\uFF09 KeywordSearchConfigurationPanel2.timeRadioButton2.text=\uFF11\uFF10\u5206\uFF08\u3088\u308A\u9045\u3044\u30D5\u30A3\u30FC\u30C9\u30D0\u30C3\u30AF\u3001\u3088\u308A\u901F\u3044\u51E6\u7406\u6642\u9593\uFF09 @@ -74,10 +72,8 @@ KeywordSearchConfigurationPanel2.timeRadioButton4.text_1=\uFF11\u5206\uFF08\u308 KeywordSearchConfigurationPanel2.timeRadioButton4.toolTipText=\uFF11\u5206\uFF08\u5168\u4F53\u7684\u306A\u51E6\u7406\u6642\u9593\u304C\u9577\u304F\u306A\u308A\u307E\u3059\uFF09 KeywordSearchConfigurationPanel2.showSnippetsCB.text=\u30AD\u30FC\u30EF\u30FC\u30C9\u691C\u7D22\u7D50\u679C\u306B\u30AD\u30FC\u30EF\u30FC\u30C9\u30D7\u30EC\u30D3\u30E5\u30FC\u3092\u8868\u793A\uFF08\u691C\u7D22\u6642\u9593\u304C\u9577\u304F\u306A\u308A\u307E\u3059\uFF09 AbstractKeywordSearchPerformer.search.dialogErrorHeader=\u30AD\u30FC\u30EF\u30FC\u30C9\u691C\u7D22\u30A8\u30E9\u30FC -AbstractKeywordSearchPerformer.search.invalidSyntaxHeader=\u30B7\u30F3\u30BF\u30C3\u30AF\u30B9\u30A8\u30E9\u30FC\ - -AbstractKeywordSearchPerformer.search.searchIngestInProgressTitle=\u30AD\u30FC\u30EF\u30FC\u30C9\u30A4\u30F3\u30C7\u30C3\u30AF\u30B9\u5316\u3092\u5B9F\u884C\u4E2D\ - +AbstractKeywordSearchPerformer.search.invalidSyntaxHeader=\u30B7\u30F3\u30BF\u30C3\u30AF\u30B9\u30A8\u30E9\u30FC +AbstractKeywordSearchPerformer.search.searchIngestInProgressTitle=\u30AD\u30FC\u30EF\u30FC\u30C9\u30A4\u30F3\u30C7\u30C3\u30AF\u30B9\u5316\u3092\u5B9F\u884C\u4E2D AbstractKeywordSearchPerformer.search.ingestInProgressBody=\u30AD\u30FC\u30EF\u30FC\u30C9\u30A4\u30F3\u30C7\u30C3\u30AF\u30B9\u5316\u3092\u5B9F\u884C\u4E2D
\u5168\u3066\u306E\u30D5\u30A1\u30A4\u30EB\u304C\u30A4\u30F3\u30C7\u30C3\u30AF\u30B9\u5316\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002\u691C\u7D22\u7D50\u679C\u304C\u4E0D\u5B8C\u5168\u306B\u306A\u308B\u5834\u5408\u304C\u3042\u308A\u307E\u3059\u3002
\u3053\u306E\u691C\u7D22\u3092\u5B9F\u884C\u3057\u307E\u3059\u304B\uFF1F AbstractKeywordSearchPerformer.search.emptyKeywordErrorBody=\u30AD\u30FC\u30EF\u30FC\u30C9\u30EA\u30B9\u30C8\u304C\u7A7A\u767D\u3067\u3059\u3002\u6700\u4F4E\uFF11\u3064\u30AD\u30FC\u30EF\u30FC\u30C9\u3092\u8FFD\u52A0\u3057\u3066\u4E0B\u3055\u3044\u3002 AbstractKeywordSearchPerformer.search.pleaseEnterKeywordBody=\u691C\u7D22\u3059\u308B\u30AD\u30FC\u30EF\u30FC\u30C9\u3092\u5165\u529B\u3057\u3066\u4E0B\u3055\u3044 @@ -91,8 +87,7 @@ ExtractedContentViewer.getSolrContent.knownFileMsg=

{0}\u306E\u30A4\u30F3\u30C7\u30C3\u30AF\u30B9\u306B\u30C6\u30AD\u30B9\u30C8\u304C\u3042\u308A\u307E\u305B\u3093\u3002
\u30C6\u30AD\u30B9\u30C8\u304C\u7121\u3044\u304B\u3001\u307E\u3060\u89E3\u6790\u3055\u308C\u3066\u3044\u306A\u3044\u304B\u3001\u30AD\u30FC\u30EF\u30FC\u30C9\u691C\u7D22\u304C\u51E6\u7406\u4E2D\u306B\u6709\u52B9\u5316\u3055\u308C\u3066\u3044\u306A\u304B\u3063\u305F\u306E\u304B\u3082\u3057\u308C\u307E\u305B\u3093\u3002

HighlightedMatchesSource.getMarkup.noMatchMsg=
\u3053\u306E\u30DA\u30FC\u30B8\u4E0A\u3067\u30AD\u30FC\u30EF\u30FC\u30C9\u304C\u30D2\u30C3\u30C8\u3057\u307E\u305B\u3093\u3067\u3057\u305F\u3002
\u30AD\u30FC\u30EF\u30FC\u30C9\u304C\u30D5\u30A1\u30A4\u30EB\u540D\u306B\u542B\u307E\u308C\u3066\u3044\u305F\u304B\u3082\u3057\u308C\u307E\u305B\u3093\u3002 
\u5225\u306E\u30DA\u30FC\u30B8\u306B\u79FB\u52D5\u3059\u308B\u304B\u3001\u30AA\u30EA\u30B8\u30CA\u30EB\u30C6\u30AD\u30B9\u30C8\u3092\u8868\u793A\u3059\u308B\u306E\u306B\u3001\u300C\u62BD\u51FA\u3055\u308C\u305F\u30C6\u30AD\u30B9\u30C8\u300D\u3092\u9078\u629E\u3057\u3066\u4E0B\u3055\u3044\u3002
HighlightedMatchesSource.toString=\u691C\u7D22\u7D50\u679C -Installer.reportPortError=\u30A4\u30F3\u30C7\u30C3\u30AF\u30B9\u30B5\u30FC\u30D0\u30FC\u30DD\u30FC\u30C8 {0} \u306F\u5229\u7528\u3067\u304D\u307E\u305B\u3093\u3002\u4F7F\u7528\u3057\u3066\u3044\u308B\u30BB\u30AD\u30E5\u30EA\u30C6\u30A3\u30BD\u30D5\u30C8\u30A6\u30A7\u30A2\u304C {1} \u3092\u30D6\u30ED\u30C3\u30AF\u3057\u3066\u3044\u306A\u3044\u304B\u78BA\u8A8D\u3057\u3001\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u30E6\u30FC\u30B6\u30FC\u30D5\u30A9\u30EB\u30C0\u30FC\u5185\u306E {3} \u306E {2} \u306E\u30D7\u30ED\u30D1\u30C6\u30A3\u30D5\u30A1\u30A4\u30EB\u306E\u5909\u66F4\u3092\u691C\u8A0E\u3057\u3066\u304F\u3060\u3055\u3044\u3002\u3082\u3057\u4ED6\u306E\u51E6\u7406\u304C\u554F\u984C\u306E\u539F\u56E0\u3067\u3042\u308C\u3070\u3001\u30B7\u30B9\u30C6\u30E0\u3092\u518D\u8D77\u52D5\u3057\u3066\u4E0B\u3055\u3044\u3002\ -"consider changing" should it be check if you can change? +Installer.reportPortError=\u30A4\u30F3\u30C7\u30C3\u30AF\u30B9\u30B5\u30FC\u30D0\u30FC\u30DD\u30FC\u30C8 {0} \u306F\u5229\u7528\u3067\u304D\u307E\u305B\u3093\u3002\u4F7F\u7528\u3057\u3066\u3044\u308B\u30BB\u30AD\u30E5\u30EA\u30C6\u30A3\u30BD\u30D5\u30C8\u30A6\u30A7\u30A2\u304C {1} \u3092\u30D6\u30ED\u30C3\u30AF\u3057\u3066\u3044\u306A\u3044\u304B\u78BA\u8A8D\u3057\u3001\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u30E6\u30FC\u30B6\u30FC\u30D5\u30A9\u30EB\u30C0\u30FC\u5185\u306E {3} \u306E {2} \u306E\u30D7\u30ED\u30D1\u30C6\u30A3\u30D5\u30A1\u30A4\u30EB\u306E\u5909\u66F4\u3092\u691C\u8A0E\u3057\u3066\u304F\u3060\u3055\u3044\u3002\u3082\u3057\u4ED6\u306E\u51E6\u7406\u304C\u554F\u984C\u306E\u539F\u56E0\u3067\u3042\u308C\u3070\u3001\u30B7\u30B9\u30C6\u30E0\u3092\u518D\u8D77\u52D5\u3057\u3066\u4E0B\u3055\u3044\u3002 Installer.reportStopPortError=\u30A4\u30F3\u30C7\u30C3\u30AF\u30B9\u30B5\u30FC\u30D0\u30FC\u30B9\u30C8\u30C3\u30D7\u30DD\u30FC\u30C8 {0} \u306F\u5229\u7528\u3067\u304D\u307E\u305B\u3093\u3002\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u30E6\u30FC\u30B6\u30FC\u30D5\u30A9\u30EB\u30C0\u30FC\u5185\u306E {1} \u306E {2} \u306E\u30D7\u30ED\u30D1\u30C6\u30A3\u30D5\u30A1\u30A4\u30EB\u306E\u5909\u66F4\u3092\u691C\u8A0E\u3057\u3066\u304F\u3060\u3055\u3044\u3002 Installer.errorInitKsmMsg=\u30AD\u30FC\u30EF\u30FC\u30C9\u691C\u7D22\u30E2\u30B8\u30E5\u30FC\u30EB\u306E\u8D77\u52D5\u30A8\u30E9\u30FC Installer.reportInitError=\u30A4\u30F3\u30C7\u30C3\u30AF\u30B9\u30B5\u30FC\u30D0\u30FC\u30DD\u30FC\u30C8 {0} \u306F\u5229\u7528\u3067\u304D\u307E\u305B\u3093\u3002\u4F7F\u7528\u3057\u3066\u3044\u308B\u30BB\u30AD\u30E5\u30EA\u30C6\u30A3\u30BD\u30D5\u30C8\u30A6\u30A7\u30A2\u304C {1} \u3092\u30D6\u30ED\u30C3\u30AF\u3057\u3066\u3044\u306A\u3044\u304B\u78BA\u8A8D\u3057\u3001\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u30E6\u30FC\u30B6\u30FC\u30D5\u30A9\u30EB\u30C0\u30FC\u5185\u306E {2} \u306E {3} \u306E\u30D7\u30ED\u30D1\u30C6\u30A3\u30D5\u30A1\u30A4\u30EB\u306E\u5909\u66F4\u3092\u691C\u8A0E\u3057\u3066\u304F\u3060\u3055\u3044\u3002\u3082\u3057\u4ED6\u306E\u51E6\u7406\u304C\u554F\u984C\u306E\u539F\u56E0\u3067\u3042\u308C\u3070\u3001\u30B7\u30B9\u30C6\u30E0\u3092\u518D\u8D77\u52D5\u3057\u3066\u4E0B\u3055\u3044\u3002 @@ -132,13 +127,11 @@ KeywordSearchFilterNode.getFileActions.viewInNewWinActionLbl=\u65B0\u3057\u3044\ KeywordSearchIngestModule.init.badInitMsg=\u30AD\u30FC\u30EF\u30FC\u30C9\u691C\u7D22\u30B5\u30FC\u30D0\u30FC\u304C\u6B63\u3057\u304F\u8D77\u52D5\u3057\u307E\u305B\u3093\u3067\u3057\u305F\u3002\u30AD\u30FC\u30EF\u30FC\u30C9\u691C\u7D22\u51E6\u7406\u3092\u5B9F\u884C\u3067\u304D\u307E\u305B\u3093\u3002 KeywordSearchIngestModule.init.tryStopSolrMsg={0}
\u53E4\u3044java Solr\u51E6\u7406\u3092\u505C\u6B62\u3057\uFF08\u3082\u3057\u5B58\u5728\u3059\u308C\u3070\uFF09\u3001\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u3092\u518D\u8D77\u52D5\u3057\u3066\u304F\u3060\u3055\u3044\u3002 KeywordSearchIngestModule.init.noKwInLstMsg=\u30AD\u30FC\u30EF\u30FC\u30C9\u30EA\u30B9\u30C8\u306B\u30AD\u30FC\u30EF\u30FC\u30C9\u304C\u3042\u308A\u307E\u305B\u3093\u3002 -KeywordSearchIngestModule.init.onlyIdxKwSkipMsg=\u30A4\u30F3\u30C7\u30C3\u30AF\u30B9\u5316\u3060\u3051\u5B9F\u884C\u3055\u308C\u3001\u30AD\u30FC\u30EF\u30FC\u30C9\u691C\u7D22\u306F\u30B9\u30AD\u30C3\u30D7\u3055\u308C\u307E\u3059\uFF08\u300C\u30AD\u30FC\u30EF\u30FC\u30C9\u30EA\u30B9\u30C8 - \u51E6\u7406\u306B\u8FFD\u52A0\u300D\u3092\u4F7F\u7528\u3057\u3001\u30AD\u30FC\u30EF\u30FC\u30C9\u30EA\u30B9\u30C8\u3092\u8FFD\u52A0\u3059\u308B\u306E\u306F\u53EF\u80FD\u3067\u3059\ -Keyword Lists - Add to Ingest\u3000one word?? +KeywordSearchIngestModule.init.onlyIdxKwSkipMsg=\u30A4\u30F3\u30C7\u30C3\u30AF\u30B9\u5316\u3060\u3051\u5B9F\u884C\u3055\u308C\u3001\u30AD\u30FC\u30EF\u30FC\u30C9\u691C\u7D22\u306F\u30B9\u30AD\u30C3\u30D7\u3055\u308C\u307E\u3059\uFF08\u300C\u30AD\u30FC\u30EF\u30FC\u30C9\u30EA\u30B9\u30C8 - \u51E6\u7406\u306B\u8FFD\u52A0\u300D\u3092\u4F7F\u7528\u3057\u3001\u30AD\u30FC\u30EF\u30FC\u30C9\u30EA\u30B9\u30C8\u3092\u8FFD\u52A0\u3059\u308B\u306E\u306F\u53EF\u80FD\u3067\u3059 KeywordSearchIngestModule.postIndexSummary.knowFileHeaderLbl=\u65E2\u77E5\u306E\u7A2E\u985E\u306E\u30D5\u30A1\u30A4\u30EB KeywordSearchIngestModule.postIndexSummary.fileGenStringsHead=\u4E00\u822C\u7684\u306A\u30B9\u30C8\u30EA\u30F3\u30B0\u304C\u62BD\u51FA\u3055\u308C\u305F\u30D5\u30A1\u30A4\u30EB KeywordSearchIngestModule.postIndexSummary.mdOnlyLbl=\u30E1\u30BF\u30C7\u30FC\u30BF\u306E\u307F\u30A4\u30F3\u30C7\u30C3\u30AF\u30B9\u5316\u3055\u308C\u307E\u3057\u305F -KeywordSearchIngestModule.postIndexSummary.idxErrLbl=\u30A8\u30E9\u30FC\uFF08\u30A4\u30F3\u30C7\u30C3\u30AF\u30B9\u30A8\u30E9\u30FC\uFF09\ - +KeywordSearchIngestModule.postIndexSummary.idxErrLbl=\u30A8\u30E9\u30FC\uFF08\u30A4\u30F3\u30C7\u30C3\u30AF\u30B9\u30A8\u30E9\u30FC\uFF09 KeywordSearchIngestModule.postIndexSummary.errTxtLbl=\u30A8\u30E9\u30FC\uFF08\u30C6\u30AD\u30B9\u30C8\u62BD\u51FA\uFF09 KeywordSearchIngestModule.postIndexSummary.errIoLbl=\u30A8\u30E9\u30FC\uFF08I/O\uFF09 KeywordSearchIngestModule.postIndexSummary.kwIdxResultsLbl=\u30AD\u30FC\u30EF\u30FC\u30C9\u30A4\u30F3\u30C7\u30C3\u30AF\u30B9\u5316\u7D50\u679C @@ -165,4 +158,4 @@ KeywordSearch.overwriteListPrompt=\u30AD\u30FC\u30EF\u30FC\u30C9\u30EA\u30B9\u30 KeywordSearch.importOwConflict=\u30EA\u30B9\u30C8\u30A4\u30F3\u30DD\u30FC\u30C8\u306E\u554F\u984C KeywordSearch.kwListFailImportMsg=\u30AD\u30FC\u30EF\u30FC\u30C9\u30EA\u30B9\u30C8\u304C\u30A4\u30F3\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u305B\u3093 KeywordSearchListsManagementPanel.fileExtensionFilterLbl=\u30AD\u30FC\u30EF\u30FC\u30C9\u30EA\u30B9\u30C8\u30D5\u30A1\u30A4\u30EB -KeywordSearch.listImportFeatureTitle=TODO \ No newline at end of file +KeywordSearch.listImportFeatureTitle=\u30AD\u30FC\u30EF\u30FC\u30C9\u30EA\u30B9\u30C8\u30A4\u30F3\u30DD\u30FC\u30C8 \ No newline at end of file From 9458fbe12bd35f475594098f738094ac0c0554f4 Mon Sep 17 00:00:00 2001 From: Richard Cordovano Date: Mon, 27 Jan 2014 15:44:45 -0500 Subject: [PATCH 36/38] Restored public access to NoTabsTabDisplayerUI class --- .../sleuthkit/autopsy/corecomponents/NoTabsTabDisplayerUI.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/NoTabsTabDisplayerUI.java b/Core/src/org/sleuthkit/autopsy/corecomponents/NoTabsTabDisplayerUI.java index 67d114ecc6..1db15285d8 100644 --- a/Core/src/org/sleuthkit/autopsy/corecomponents/NoTabsTabDisplayerUI.java +++ b/Core/src/org/sleuthkit/autopsy/corecomponents/NoTabsTabDisplayerUI.java @@ -33,7 +33,7 @@ import org.netbeans.swing.tabcontrol.TabDisplayerUI; * * @author dfickling */ - class NoTabsTabDisplayerUI extends TabDisplayerUI { +public class NoTabsTabDisplayerUI extends TabDisplayerUI { /** Creates a new instance of NoTabsTabDisplayerUI */ public NoTabsTabDisplayerUI(TabDisplayer displayer) { From e8c3eb81a350807e512e545378dd424a162b4854 Mon Sep 17 00:00:00 2001 From: alexjacks92 Date: Mon, 27 Jan 2014 16:14:11 -0500 Subject: [PATCH 37/38] Added reset command before checkout. --- test/script/srcupdater.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/test/script/srcupdater.py b/test/script/srcupdater.py index c444be2346..168bc7da7c 100755 --- a/test/script/srcupdater.py +++ b/test/script/srcupdater.py @@ -78,6 +78,9 @@ def gitPull(TskOrAutopsy, branch): ccwd = os.path.join("..", "..", "..", "sleuthkit") else: ccwd = os.path.join("..", "..") + print("Resetting " + TskOrAutopsy) + call = ["git", "reset", "--hard"] + subprocess.call(call, stdout=sys.stdout, cwd=ccwd) print("Checking out " + branch) call = ["git", "checkout", branch] subprocess.call(call, stdout=sys.stdout, cwd=ccwd) From d6e0366c735ba3fd12854e6d0897a41670efaa4c Mon Sep 17 00:00:00 2001 From: Nick Davis Date: Mon, 27 Jan 2014 16:25:11 -0500 Subject: [PATCH 38/38] Reformatted code. --- .../keywordsearch/AbstractFileChunk.java | 10 +- .../keywordsearch/AbstractFileExtract.java | 75 ++-- .../AbstractFileHtmlExtract.java | 11 +- .../AbstractFileStringContentStream.java | 8 +- .../AbstractFileStringExtract.java | 13 +- .../AbstractFileStringIntStream.java | 56 +-- .../AbstractFileStringStream.java | 24 +- .../AbstractFileTikaTextExtract.java | 24 +- .../AbstractKeywordSearchPerformer.java | 30 +- .../keywordsearch/ByteContentStream.java | 20 +- .../autopsy/keywordsearch/ContentHit.java | 6 +- .../keywordsearch/ExtractedContentPanel.java | 375 ++++++++++-------- .../keywordsearch/ExtractedContentViewer.java | 38 +- .../HighlightedMatchesSource.java | 10 +- .../autopsy/keywordsearch/Ingester.java | 80 ++-- .../autopsy/keywordsearch/Installer.java | 15 +- .../keywordsearch/JerichoParserWrapper.java | 46 ++- .../autopsy/keywordsearch/Keyword.java | 26 +- .../keywordsearch/KeywordQueryFilter.java | 9 +- .../autopsy/keywordsearch/KeywordSearch.java | 10 +- .../keywordsearch/KeywordSearchAction.java | 1 + .../KeywordSearchConfigurationAction.java | 14 +- .../KeywordSearchConfigurationPanel.java | 42 +- .../KeywordSearchConfigurationPanel1.java | 83 ++-- .../KeywordSearchConfigurationPanel2.java | 64 +-- .../KeywordSearchConfigurationPanel3.java | 113 +++--- .../KeywordSearchEditListPanel.java | 216 ++++++---- .../KeywordSearchFilterNode.java | 19 +- .../KeywordSearchIngestModule.java | 252 +++++++----- .../KeywordSearchIngestSimplePanel.java | 85 ++-- .../KeywordSearchListsAbstract.java | 72 ++-- .../KeywordSearchListsEncase.java | 90 +++-- .../KeywordSearchListsManagementPanel.java | 185 +++++---- .../KeywordSearchListsViewerPanel.java | 50 ++- .../keywordsearch/KeywordSearchListsXML.java | 39 +- .../KeywordSearchModuleException.java | 4 +- .../KeywordSearchOptionsPanelController.java | 14 +- .../keywordsearch/KeywordSearchPanel.java | 100 +++-- .../KeywordSearchPerformerInterface.java | 31 +- .../keywordsearch/KeywordSearchQuery.java | 49 ++- .../KeywordSearchQueryManager.java | 30 +- .../KeywordSearchResultFactory.java | 89 +++-- .../keywordsearch/KeywordSearchSettings.java | 166 ++++---- .../keywordsearch/KeywordSearchUtil.java | 14 +- .../keywordsearch/KeywordWriteResult.java | 1 + .../autopsy/keywordsearch/KeywordsSchema.xsd | 14 +- .../autopsy/keywordsearch/LuceneQuery.java | 67 ++-- .../autopsy/keywordsearch/MarkupSource.java | 68 ++-- .../keywordsearch/NoOpenCoreException.java | 3 +- .../autopsy/keywordsearch/Server.java | 118 +++--- .../keywordsearch/TermComponentQuery.java | 19 +- .../keywordsearch/TextLanguageIdentifier.java | 6 +- .../keywordsearch/TikaLanguageIdentifier.java | 7 +- .../keywordsearch/docs/package-info.java | 4 +- .../sleuthkit/autopsy/keywordsearch/layer.xml | 19 +- 55 files changed, 1791 insertions(+), 1243 deletions(-) diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/AbstractFileChunk.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/AbstractFileChunk.java index 9e5e0a2da2..88ce54707c 100644 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/AbstractFileChunk.java +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/AbstractFileChunk.java @@ -20,6 +20,7 @@ package org.sleuthkit.autopsy.keywordsearch; import java.nio.charset.Charset; + import org.sleuthkit.autopsy.keywordsearch.Ingester.IngesterException; /** @@ -51,7 +52,8 @@ class AbstractFileChunk { return Server.getChunkIdString(this.parent.getSourceFile().getId(), this.chunkID); } - public boolean index(Ingester ingester, byte[] content, long contentSize, Charset indexCharset) throws IngesterException { + public boolean index(Ingester ingester, byte[] content, long contentSize, Charset indexCharset) + throws IngesterException { boolean success = true; ByteContentStream bcs = new ByteContentStream(content, contentSize, parent.getSourceFile(), indexCharset); try { @@ -59,9 +61,11 @@ class AbstractFileChunk { //logger.log(Level.INFO, "Ingesting string chunk: " + this.getName() + ": " + chunkID); } catch (Exception ingEx) { success = false; - throw new IngesterException("Problem ingesting file string chunk: " + parent.getSourceFile().getId() + ", chunk: " + chunkID, ingEx); + throw new IngesterException("Problem ingesting file string chunk: " + + parent.getSourceFile().getId() + + ", chunk: " + chunkID, ingEx); } return success; } - + } diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/AbstractFileExtract.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/AbstractFileExtract.java index dcb8b25728..41fa61801d 100644 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/AbstractFileExtract.java +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/AbstractFileExtract.java @@ -21,6 +21,7 @@ package org.sleuthkit.autopsy.keywordsearch; import java.util.Arrays; import java.util.List; import java.util.Map; + import org.sleuthkit.autopsy.coreutils.StringExtract.StringExtractUnicodeTable.SCRIPT; import org.sleuthkit.datamodel.AbstractFile; @@ -37,44 +38,46 @@ interface AbstractFileExtract { EXTRACT_UTF16, ///< extract UTF16 text, possible values Boolean.TRUE.toString(), Boolean.FALSE.toString() EXTRACT_UTF8, ///< extract UTF8 text, possible values Boolean.TRUE.toString(), Boolean.FALSE.toString() - }; - + } + + ; + //generally text extractors should ignore archives //and let unpacking modules take case of them static final List ARCHIVE_MIME_TYPES = Arrays.asList( - //ignore unstructured binary and compressed data, for which string extraction or unzipper works better - "application/x-7z-compressed", - "application/x-ace-compressed", - "application/x-alz-compressed", - "application/x-arj", - "application/vnd.ms-cab-compressed", - "application/x-cfs-compressed", - "application/x-dgc-compressed", - "application/x-apple-diskimage", - "application/x-gca-compressed", - "application/x-dar", - "application/x-lzx", - "application/x-lzh", - "application/x-rar-compressed", - "application/x-stuffit", - "application/x-stuffitx", - "application/x-gtar", - "application/x-archive", - "application/x-executable", - "application/x-gzip", - "application/zip", - "application/x-zoo", - "application/x-cpio", - "application/x-shar", - "application/x-tar", - "application/x-bzip", - "application/x-bzip2", - "application/x-lzip", - "application/x-lzma", - "application/x-lzop", - "application/x-z", - "application/x-compress"); + //ignore unstructured binary and compressed data, for which string extraction or unzipper works better + "application/x-7z-compressed", + "application/x-ace-compressed", + "application/x-alz-compressed", + "application/x-arj", + "application/vnd.ms-cab-compressed", + "application/x-cfs-compressed", + "application/x-dgc-compressed", + "application/x-apple-diskimage", + "application/x-gca-compressed", + "application/x-dar", + "application/x-lzx", + "application/x-lzh", + "application/x-rar-compressed", + "application/x-stuffit", + "application/x-stuffitx", + "application/x-gtar", + "application/x-archive", + "application/x-executable", + "application/x-gzip", + "application/zip", + "application/x-zoo", + "application/x-cpio", + "application/x-shar", + "application/x-tar", + "application/x-bzip", + "application/x-bzip2", + "application/x-lzip", + "application/x-lzma", + "application/x-lzop", + "application/x-z", + "application/x-compress"); /** * Get number of chunks resulted from extracting this AbstractFile @@ -143,9 +146,9 @@ interface AbstractFileExtract { * Determines if the file content is supported by the extractor if * isContentTypeSpecific() returns true. * - * @param file to test if its content should be supported + * @param file to test if its content should be supported * @param detectedFormat mime-type with detected format (such as text/plain) - * or null if not detected + * or null if not detected * @return true if the file content is supported, false otherwise */ boolean isSupported(AbstractFile file, String detectedFormat); diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/AbstractFileHtmlExtract.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/AbstractFileHtmlExtract.java index e63545a904..230f67dc96 100644 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/AbstractFileHtmlExtract.java +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/AbstractFileHtmlExtract.java @@ -26,6 +26,7 @@ import java.util.Arrays; import java.util.List; import java.util.Map; import java.util.logging.Level; + import org.sleuthkit.autopsy.coreutils.Logger; import org.sleuthkit.autopsy.coreutils.StringExtract.StringExtractUnicodeTable.SCRIPT; import org.sleuthkit.autopsy.keywordsearch.Ingester.IngesterException; @@ -37,7 +38,7 @@ import org.sleuthkit.datamodel.ReadContentInputStream; * divided into chunks and indexed with Solr. If HTML extraction succeeds, * chunks are indexed with Solr. */ - class AbstractFileHtmlExtract implements AbstractFileExtract { +class AbstractFileHtmlExtract implements AbstractFileExtract { private static final Logger logger = Logger.getLogger(AbstractFileHtmlExtract.class.getName()); static final Charset outCharset = Server.DEFAULT_INDEXED_TEXT_CHARSET; @@ -58,7 +59,7 @@ import org.sleuthkit.datamodel.ReadContentInputStream; "text/html", "text/javascript" //"application/xml", //"application/xml-dtd", - ); + ); private final TikaLanguageIdentifier tikaLanguageIdentifier; AbstractFileHtmlExtract() { @@ -189,10 +190,12 @@ import org.sleuthkit.datamodel.ReadContentInputStream; module.checkRunCommitSearch(); } } catch (IOException ex) { - logger.log(Level.WARNING, "Unable to read content stream from " + sourceFile.getId() + ": " + sourceFile.getName(), ex); + logger.log(Level.WARNING, "Unable to read content stream from " + + sourceFile.getId() + ": " + sourceFile.getName(), ex); success = false; } catch (Exception ex) { - logger.log(Level.WARNING, "Unexpected error, can't read content stream from " + sourceFile.getId() + ": " + sourceFile.getName(), ex); + logger.log(Level.WARNING, "Unexpected error, can't read content stream from " + + sourceFile.getId() + ": " + sourceFile.getName(), ex); success = false; } finally { try { diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/AbstractFileStringContentStream.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/AbstractFileStringContentStream.java index 63873f9dd3..d6de6b4dbe 100644 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/AbstractFileStringContentStream.java +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/AbstractFileStringContentStream.java @@ -23,6 +23,7 @@ import java.io.InputStream; import java.io.InputStreamReader; import java.io.Reader; import java.nio.charset.Charset; + import org.sleuthkit.autopsy.coreutils.Logger; import org.apache.solr.common.util.ContentStream; import org.sleuthkit.datamodel.AbstractContent; @@ -31,7 +32,7 @@ import org.sleuthkit.datamodel.AbstractFile; /** * Wrapper over InputStream that implements ContentStream to feed to Solr. */ - class AbstractFileStringContentStream implements ContentStream { +class AbstractFileStringContentStream implements ContentStream { //input private AbstractFile content; @@ -69,7 +70,8 @@ import org.sleuthkit.datamodel.AbstractFile; @Override public Long getSize() { //return convertedLength; - throw new UnsupportedOperationException("Cannot tell how many chars in converted string, until entire string is converted"); + throw new UnsupportedOperationException( + "Cannot tell how many chars in converted string, until entire string is converted"); } @Override @@ -85,7 +87,7 @@ import org.sleuthkit.datamodel.AbstractFile; @Override protected void finalize() throws Throwable { super.finalize(); - + stream.close(); } } diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/AbstractFileStringExtract.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/AbstractFileStringExtract.java index 15c6aac52c..1370b9b782 100644 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/AbstractFileStringExtract.java +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/AbstractFileStringExtract.java @@ -26,6 +26,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.logging.Level; + import org.sleuthkit.autopsy.coreutils.Logger; import org.sleuthkit.autopsy.coreutils.StringExtract.StringExtractUnicodeTable.SCRIPT; import org.sleuthkit.autopsy.keywordsearch.Ingester.IngesterException; @@ -51,7 +52,7 @@ class AbstractFileStringExtract implements AbstractFileExtract { private static final SCRIPT DEFAULT_SCRIPT = SCRIPT.LATIN_2; private final List tags scripts.append(tag.getElement().getContent()).append("\n"); numScripts++; - } else if(tag.getName().equals("a")) { + } else if (tag.getName().equals("a")) { links.append(numLinks).append(") "); links.append(tag.getTagContent()).append("\n"); numLinks++; - } else if(tag.getName().equals("img")) { + } else if (tag.getName().equals("img")) { images.append(numImages).append(") "); images.append(tag.getTagContent()).append("\n"); numImages++; - } else if(tag.getTagType().equals(StartTagType.COMMENT)) { + } else if (tag.getTagType().equals(StartTagType.COMMENT)) { comments.append(numComments).append(") "); comments.append(tag.getTagContent()).append("\n"); numComments++; } else { // Make sure it has an attribute Attributes atts = tag.getAttributes(); - if (atts!=null && atts.length()>0) { + if (atts != null && atts.length() > 0) { others.append(numOthers).append(") "); others.append(tag.getName()).append(":"); others.append(tag.getTagContent()).append("\n"); @@ -119,19 +121,23 @@ class JerichoParserWrapper { out.append(text).append("\n\n"); out.append("----------NONVISIBLE TEXT----------\n\n"); - if(numScripts>1) { + if (numScripts > 1) { out.append("---Scripts---\n"); out.append(scripts.toString()).append("\n"); - } if(numLinks>1) { + } + if (numLinks > 1) { out.append("---Links---\n"); out.append(links.toString()).append("\n"); - } if(numImages>1) { + } + if (numImages > 1) { out.append("---Images---\n"); out.append(images.toString()).append("\n"); - } if(numComments>1) { + } + if (numComments > 1) { out.append("---Comments---\n"); out.append(comments.toString()).append("\n"); - } if(numOthers>1) { + } + if (numOthers > 1) { out.append("---Others---\n"); out.append(others.toString()).append("\n"); } @@ -141,7 +147,7 @@ class JerichoParserWrapper { logger.log(Level.WARNING, "Unable to parse the HTML file", ex); } } - + // Extract text from the source, nicely formatted with whitespace and // newlines where appropriate. private String renderHTMLAsPlainText(Source source) { diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Keyword.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Keyword.java index 39035a1684..5c1e27980a 100644 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Keyword.java +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Keyword.java @@ -30,36 +30,33 @@ class Keyword { private BlackboardAttribute.ATTRIBUTE_TYPE keywordType = null; /** - * - * @param query Keyword to search for + * @param query Keyword to search for * @param isLiteral false if reg exp */ Keyword(String query, boolean isLiteral) { this.keywordString = query; this.isLiteral = isLiteral; } - + /** - * - * @param query Keyword to search for - * @param isLiteral false if reg exp - * @param keywordType + * @param query Keyword to search for + * @param isLiteral false if reg exp + * @param keywordType */ Keyword(String query, boolean isLiteral, BlackboardAttribute.ATTRIBUTE_TYPE keywordType) { this(query, isLiteral); this.keywordType = keywordType; } - + void setType(BlackboardAttribute.ATTRIBUTE_TYPE keywordType) { this.keywordType = keywordType; } - + BlackboardAttribute.ATTRIBUTE_TYPE getType() { return this.keywordType; } /** - * * @return Keyword to search for */ String getQuery() { @@ -72,10 +69,10 @@ class Keyword { @Override public String toString() { - return "Keyword{" + "query=" + keywordString + ", isLiteral=" + isLiteral + ", keywordType=" + keywordType + '}'; + return "Keyword{" + "query=" + keywordString + ", isLiteral=" + isLiteral + ", keywordType=" + keywordType + + '}'; } - - + @Override public boolean equals(Object obj) { @@ -86,7 +83,8 @@ class Keyword { return false; } final Keyword other = (Keyword) obj; - if ((this.keywordString == null) ? (other.keywordString != null) : !this.keywordString.equals(other.keywordString)) { + if ((this.keywordString == null) ? (other.keywordString != null) + : !this.keywordString.equals(other.keywordString)) { return false; } if (this.isLiteral != other.isLiteral) { diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordQueryFilter.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordQueryFilter.java index 8d7990ba1b..f6cca5df51 100644 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordQueryFilter.java +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordQueryFilter.java @@ -23,7 +23,6 @@ import java.util.Iterator; import java.util.Set; /** - * * Filter to restrict query only specific files, chunks, images * Single filter supports multiple ids per file/chunk/image, that act as OR filter */ @@ -33,7 +32,7 @@ class KeywordQueryFilter { FILE, CHUNK, DATA_SOURCE }; - private SetidFilters; + private Set idFilters; private FilterType filterType; public KeywordQueryFilter(FilterType filterType, long id) { @@ -42,7 +41,7 @@ class KeywordQueryFilter { this.idFilters.add(id); } - public KeywordQueryFilter(FilterType filterType, Setids) { + public KeywordQueryFilter(FilterType filterType, Set ids) { this.filterType = filterType; this.idFilters = ids; } @@ -59,8 +58,8 @@ class KeywordQueryFilter { public String toString() { StringBuilder sb = new StringBuilder(); String id = null; - - Iteratorit = idFilters.iterator(); + + Iterator it = idFilters.iterator(); for (int i = 0; it.hasNext(); ++i) { if (i > 0) { sb.append(" "); //OR diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearch.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearch.java index 96d3562474..e85a62a790 100644 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearch.java +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearch.java @@ -27,6 +27,7 @@ import java.util.logging.FileHandler; import java.util.logging.Level; import java.util.logging.Logger; import java.util.logging.SimpleFormatter; + import org.openide.util.Exceptions; import org.sleuthkit.autopsy.casemodule.Case; import org.sleuthkit.autopsy.coreutils.PlatformUtil; @@ -66,7 +67,8 @@ class KeywordSearch { static { try { final int MAX_TIKA_LOG_FILES = 3; - FileHandler tikaLogHandler = new FileHandler(PlatformUtil.getUserDirectory().getAbsolutePath() + "/var/log/tika.log", + FileHandler tikaLogHandler = new FileHandler( + PlatformUtil.getUserDirectory().getAbsolutePath() + "/var/log/tika.log", 0, MAX_TIKA_LOG_FILES); tikaLogHandler.setFormatter(new SimpleFormatter()); tikaLogHandler.setEncoding(PlatformUtil.getLogFileEncoding()); @@ -88,16 +90,16 @@ class KeywordSearch { static Logger getTikaLogger() { return TIKA_LOGGER; } - + public static void addNumIndexedFilesChangeListener(PropertyChangeListener l) { changeSupport.addPropertyChangeListener(NUM_FILES_CHANGE_EVT, l); } - + public static void removeNumIndexedFilesChangeListener(PropertyChangeListener l) { changeSupport.removePropertyChangeListener(l); } - + static void fireNumIndexedFilesChange(Integer oldNum, Integer newNum) { changeSupport.firePropertyChange(NUM_FILES_CHANGE_EVT, oldNum, newNum); } diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchAction.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchAction.java index 2134ac55ce..7ae6086728 100644 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchAction.java +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchAction.java @@ -21,6 +21,7 @@ package org.sleuthkit.autopsy.keywordsearch; import java.awt.Component; import java.awt.event.ActionEvent; import javax.swing.AbstractAction; + import org.openide.util.actions.Presenter; final class KeywordSearchAction extends AbstractAction implements Presenter.Toolbar { diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchConfigurationAction.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchConfigurationAction.java index faa4f9688e..e3898b58b1 100644 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchConfigurationAction.java +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchConfigurationAction.java @@ -23,6 +23,7 @@ import java.awt.event.ActionListener; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; import java.awt.event.WindowListener; + import org.openide.util.HelpCtx; import org.openide.util.actions.CallableSystemAction; import org.sleuthkit.autopsy.corecomponents.AdvancedConfigurationDialog; @@ -30,9 +31,10 @@ import org.sleuthkit.autopsy.corecomponents.AdvancedConfigurationDialog; /** * System action to open the KeywordSearch Options panel. */ -class KeywordSearchConfigurationAction extends CallableSystemAction{ - - private static final String ACTION_NAME = org.openide.util.NbBundle.getMessage(KeywordSearchPanel.class, "ListBundleConfig"); +class KeywordSearchConfigurationAction extends CallableSystemAction { + + private static final String ACTION_NAME = org.openide.util.NbBundle + .getMessage(KeywordSearchPanel.class, "ListBundleConfig"); private KeywordSearchConfigurationPanel panel; @Override @@ -59,9 +61,9 @@ class KeywordSearchConfigurationAction extends CallableSystemAction{ dialog.addWindowListener(exitListener); dialog.display(panel); } - + private KeywordSearchConfigurationPanel getPanel() { - if(panel==null) { + if (panel == null) { panel = new KeywordSearchConfigurationPanel(); } return panel; @@ -76,7 +78,7 @@ class KeywordSearchConfigurationAction extends CallableSystemAction{ public HelpCtx getHelpCtx() { return HelpCtx.DEFAULT_HELP; } - + @Override protected boolean asynchronous() { return false; diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchConfigurationPanel.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchConfigurationPanel.java index b7fb10dddc..59f24424cd 100644 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchConfigurationPanel.java +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchConfigurationPanel.java @@ -35,18 +35,30 @@ final class KeywordSearchConfigurationPanel extends javax.swing.JPanel implement initComponents(); customizeComponents(); } - + private void customizeComponents() { setName(NbBundle.getMessage(this.getClass(), "KeywordSearchConfigurationPanel.customizeComponents.title")); listsPanel = new KeywordSearchConfigurationPanel1(); languagesPanel = new KeywordSearchConfigurationPanel3(); generalPanel = new KeywordSearchConfigurationPanel2(); - tabbedPane.insertTab(NbBundle.getMessage(this.getClass(), "KeywordSearchConfigurationPanel.customizeComponents.listTabTitle"), null, - listsPanel, NbBundle.getMessage(this.getClass(), "KeywordSearchConfigurationPanel.customizeComponents.listLabToolTip"), 0); - tabbedPane.insertTab(NbBundle.getMessage(this.getClass(), "KeywordSearchConfigurationPanel.customizeComponents.stringExtTitle"), null, - languagesPanel, NbBundle.getMessage(this.getClass(), "KeywordSearchConfigurationPanel.customizeComponents.stringExtToolTip"), 1); - tabbedPane.insertTab(NbBundle.getMessage(this.getClass(), "KeywordSearchConfigurationPanel.customizeComponents.genTabTitle"), null, - generalPanel, NbBundle.getMessage(this.getClass(), "KeywordSearchConfigurationPanel.customizeComponents.genTabToolTip"), 2); + tabbedPane.insertTab(NbBundle.getMessage(this.getClass(), + "KeywordSearchConfigurationPanel.customizeComponents.listTabTitle"), + null, + listsPanel, NbBundle.getMessage(this.getClass(), + "KeywordSearchConfigurationPanel.customizeComponents.listLabToolTip"), + 0); + tabbedPane.insertTab(NbBundle.getMessage(this.getClass(), + "KeywordSearchConfigurationPanel.customizeComponents.stringExtTitle"), + null, + languagesPanel, NbBundle.getMessage(this.getClass(), + "KeywordSearchConfigurationPanel.customizeComponents.stringExtToolTip"), + 1); + tabbedPane.insertTab( + NbBundle.getMessage(this.getClass(), "KeywordSearchConfigurationPanel.customizeComponents.genTabTitle"), + null, + generalPanel, NbBundle.getMessage(this.getClass(), + "KeywordSearchConfigurationPanel.customizeComponents.genTabToolTip"), + 2); } /** @@ -62,12 +74,14 @@ final class KeywordSearchConfigurationPanel extends javax.swing.JPanel implement javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this); this.setLayout(layout); layout.setHorizontalGroup( - layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(tabbedPane, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, 675, Short.MAX_VALUE) + layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addComponent(tabbedPane, javax.swing.GroupLayout.Alignment.TRAILING, + javax.swing.GroupLayout.DEFAULT_SIZE, 675, Short.MAX_VALUE) ); layout.setVerticalGroup( - layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(tabbedPane, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, 505, Short.MAX_VALUE) + layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addComponent(tabbedPane, javax.swing.GroupLayout.Alignment.TRAILING, + javax.swing.GroupLayout.DEFAULT_SIZE, 505, Short.MAX_VALUE) ); }// //GEN-END:initComponents @@ -95,14 +109,14 @@ final class KeywordSearchConfigurationPanel extends javax.swing.JPanel implement } public void cancel() { - KeywordSearchListsXML.getCurrent().reload(); + KeywordSearchListsXML.getCurrent().reload(); } - + boolean valid() { // TODO check whether form is consistent and complete return true; } - + // Variables declaration - do not modify//GEN-BEGIN:variables private javax.swing.JTabbedPane tabbedPane; // End of variables declaration//GEN-END:variables diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchConfigurationPanel1.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchConfigurationPanel1.java index 34bb43a679..24861675e3 100644 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchConfigurationPanel1.java +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchConfigurationPanel1.java @@ -41,11 +41,14 @@ class KeywordSearchConfigurationPanel1 extends javax.swing.JPanel implements Opt KeywordSearchListsManagementPanel listsManagementPanel; KeywordSearchEditListPanel editListPanel; private static final Logger logger = Logger.getLogger(KeywordSearchConfigurationPanel1.class.getName()); - private static final String KEYWORD_CONFIG_NAME = org.openide.util.NbBundle.getMessage(KeywordSearchPanel.class, "ListBundleConfig"); - - /** Creates new form KeywordSearchConfigurationPanel1 */ + private static final String KEYWORD_CONFIG_NAME = org.openide.util.NbBundle.getMessage(KeywordSearchPanel.class, + "ListBundleConfig"); + + /** + * Creates new form KeywordSearchConfigurationPanel1 + */ KeywordSearchConfigurationPanel1() { - + initComponents(); customizeComponents(); setName(KEYWORD_CONFIG_NAME); @@ -57,12 +60,14 @@ class KeywordSearchConfigurationPanel1 extends javax.swing.JPanel implements Opt listsManagementPanel.addListSelectionListener(editListPanel); editListPanel.addDeleteButtonActionPerformed(new ActionListener() { - + @Override public void actionPerformed(ActionEvent e) { - if (KeywordSearchUtil.displayConfirmDialog(NbBundle.getMessage(this.getClass(), "KeywordSearchConfigurationPanel1.customizeComponents.title") - , NbBundle.getMessage(this.getClass(), "KeywordSearchConfigurationPanel1.customizeComponents.body" ) - , KeywordSearchUtil.DIALOG_MESSAGE_TYPE.WARN) ) { + if (KeywordSearchUtil.displayConfirmDialog(NbBundle.getMessage(this.getClass(), + "KeywordSearchConfigurationPanel1.customizeComponents.title") + , NbBundle.getMessage(this.getClass(), + "KeywordSearchConfigurationPanel1.customizeComponents.body") + , KeywordSearchUtil.DIALOG_MESSAGE_TYPE.WARN)) { KeywordSearchListsXML deleter = KeywordSearchListsXML.getCurrent(); String toDelete = editListPanel.getCurrentKeywordList().getName(); @@ -73,9 +78,9 @@ class KeywordSearchConfigurationPanel1 extends javax.swing.JPanel implements Opt } } }); - + editListPanel.addSaveButtonActionPerformed(new ActionListener() { - + @Override public void actionPerformed(ActionEvent e) { final String FEATURE_NAME = "Save Keyword List"; @@ -84,8 +89,9 @@ class KeywordSearchConfigurationPanel1 extends javax.swing.JPanel implements Opt List keywords = currentKeywordList.getKeywords(); if (keywords.isEmpty()) { - KeywordSearchUtil.displayDialog(FEATURE_NAME, NbBundle.getMessage(this.getClass(), "KeywordSearchConfigurationPanel1.customizeComponents.keywordListEmptyErr"), - KeywordSearchUtil.DIALOG_MESSAGE_TYPE.INFO); + KeywordSearchUtil.displayDialog(FEATURE_NAME, NbBundle.getMessage(this.getClass(), + "KeywordSearchConfigurationPanel1.customizeComponents.keywordListEmptyErr"), + KeywordSearchUtil.DIALOG_MESSAGE_TYPE.INFO); return; } @@ -102,13 +108,18 @@ class KeywordSearchConfigurationPanel1 extends javax.swing.JPanel implements Opt } if (writer.listExists(listName) && writer.getList(listName).isLocked()) { - KeywordSearchUtil.displayDialog(FEATURE_NAME, NbBundle.getMessage(this.getClass(), "KeywordSearchConfigurationPanel1.customizeComponents.noOwDefaultMsg"), KeywordSearchUtil.DIALOG_MESSAGE_TYPE.WARN); + KeywordSearchUtil.displayDialog(FEATURE_NAME, NbBundle.getMessage(this.getClass(), + "KeywordSearchConfigurationPanel1.customizeComponents.noOwDefaultMsg"), + KeywordSearchUtil.DIALOG_MESSAGE_TYPE.WARN); return; } boolean shouldAdd = false; if (writer.listExists(listName)) { - boolean replace = KeywordSearchUtil.displayConfirmDialog(FEATURE_NAME, NbBundle.getMessage(this.getClass(), "KeywordSearchConfigurationPanel1.customizeComponents.kwListExistMsg", listName), - KeywordSearchUtil.DIALOG_MESSAGE_TYPE.WARN); + boolean replace = KeywordSearchUtil.displayConfirmDialog(FEATURE_NAME, + NbBundle.getMessage(this.getClass(), + "KeywordSearchConfigurationPanel1.customizeComponents.kwListExistMsg", + listName), + KeywordSearchUtil.DIALOG_MESSAGE_TYPE.WARN); if (replace) { shouldAdd = true; } @@ -119,34 +130,38 @@ class KeywordSearchConfigurationPanel1 extends javax.swing.JPanel implements Opt if (shouldAdd) { writer.addList(listName, keywords); - KeywordSearchUtil.displayDialog(FEATURE_NAME, NbBundle.getMessage(this.getClass(), "KeywordSearchConfigurationPanel1.customizeComponents.kwListSavedMsg", listName), KeywordSearchUtil.DIALOG_MESSAGE_TYPE.INFO); + KeywordSearchUtil.displayDialog(FEATURE_NAME, NbBundle.getMessage(this.getClass(), + "KeywordSearchConfigurationPanel1.customizeComponents.kwListSavedMsg", + listName), + KeywordSearchUtil.DIALOG_MESSAGE_TYPE.INFO); } //currentKeywordList = writer.getList(listName); - + listsManagementPanel.resync(); } }); - + mainSplitPane.setLeftComponent(listsManagementPanel); mainSplitPane.setRightComponent(editListPanel); mainSplitPane.revalidate(); mainSplitPane.repaint(); } - + @Override public void store() { KeywordSearchListsXML.getCurrent().save(false); //refresh the list viewer/searcher panel KeywordSearchListsViewerPanel.getDefault().resync(); } - + @Override public void load() { listsManagementPanel.load(); } - /** This method is called from within the constructor to + /** + * This method is called from within the constructor to * initialize the form. * WARNING: Do NOT modify this code. The content of this method is * always regenerated by the Form Editor. @@ -165,12 +180,12 @@ class KeywordSearchConfigurationPanel1 extends javax.swing.JPanel implements Opt javax.swing.GroupLayout leftPanelLayout = new javax.swing.GroupLayout(leftPanel); leftPanel.setLayout(leftPanelLayout); leftPanelLayout.setHorizontalGroup( - leftPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGap(0, 275, Short.MAX_VALUE) + leftPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGap(0, 275, Short.MAX_VALUE) ); leftPanelLayout.setVerticalGroup( - leftPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGap(0, 327, Short.MAX_VALUE) + leftPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGap(0, 327, Short.MAX_VALUE) ); mainSplitPane.setLeftComponent(leftPanel); @@ -178,12 +193,12 @@ class KeywordSearchConfigurationPanel1 extends javax.swing.JPanel implements Opt javax.swing.GroupLayout rightPanelLayout = new javax.swing.GroupLayout(rightPanel); rightPanel.setLayout(rightPanelLayout); rightPanelLayout.setHorizontalGroup( - rightPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGap(0, 318, Short.MAX_VALUE) + rightPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGap(0, 318, Short.MAX_VALUE) ); rightPanelLayout.setVerticalGroup( - rightPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGap(0, 327, Short.MAX_VALUE) + rightPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGap(0, 327, Short.MAX_VALUE) ); mainSplitPane.setRightComponent(rightPanel); @@ -191,12 +206,12 @@ class KeywordSearchConfigurationPanel1 extends javax.swing.JPanel implements Opt javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this); this.setLayout(layout); layout.setHorizontalGroup( - layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(mainSplitPane) + layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addComponent(mainSplitPane) ); layout.setVerticalGroup( - layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(mainSplitPane) + layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addComponent(mainSplitPane) ); }// //GEN-END:initComponents @@ -205,5 +220,5 @@ class KeywordSearchConfigurationPanel1 extends javax.swing.JPanel implements Opt private javax.swing.JSplitPane mainSplitPane; private javax.swing.JPanel rightPanel; // End of variables declaration//GEN-END:variables - + } diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchConfigurationPanel2.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchConfigurationPanel2.java index e0b4dc0d89..ea7e4ee49e 100644 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchConfigurationPanel2.java +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchConfigurationPanel2.java @@ -21,6 +21,7 @@ package org.sleuthkit.autopsy.keywordsearch; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.util.logging.Level; + import org.sleuthkit.autopsy.coreutils.Logger; import org.apache.solr.client.solrj.SolrServerException; import org.sleuthkit.autopsy.corecomponents.OptionsPanel; @@ -97,35 +98,52 @@ class KeywordSearchConfigurationPanel2 extends javax.swing.JPanel implements Opt timeRadioButton3 = new javax.swing.JRadioButton(); timeRadioButton4 = new javax.swing.JRadioButton(); - skipNSRLCheckBox.setText(org.openide.util.NbBundle.getMessage(KeywordSearchConfigurationPanel2.class, "KeywordSearchConfigurationPanel2.skipNSRLCheckBox.text")); // NOI18N - skipNSRLCheckBox.setToolTipText(org.openide.util.NbBundle.getMessage(KeywordSearchConfigurationPanel2.class, "KeywordSearchConfigurationPanel2.skipNSRLCheckBox.toolTipText")); // NOI18N + skipNSRLCheckBox.setText(org.openide.util.NbBundle.getMessage(KeywordSearchConfigurationPanel2.class, + "KeywordSearchConfigurationPanel2.skipNSRLCheckBox.text")); // NOI18N + skipNSRLCheckBox.setToolTipText(org.openide.util.NbBundle.getMessage(KeywordSearchConfigurationPanel2.class, + "KeywordSearchConfigurationPanel2.skipNSRLCheckBox.toolTipText")); // NOI18N - filesIndexedLabel.setText(org.openide.util.NbBundle.getMessage(KeywordSearchConfigurationPanel2.class, "KeywordSearchConfigurationPanel2.filesIndexedLabel.text")); // NOI18N + filesIndexedLabel.setText(org.openide.util.NbBundle.getMessage(KeywordSearchConfigurationPanel2.class, + "KeywordSearchConfigurationPanel2.filesIndexedLabel.text")); // NOI18N - filesIndexedValue.setText(org.openide.util.NbBundle.getMessage(KeywordSearchConfigurationPanel2.class, "KeywordSearchConfigurationPanel2.filesIndexedValue.text")); // NOI18N + filesIndexedValue.setText(org.openide.util.NbBundle.getMessage(KeywordSearchConfigurationPanel2.class, + "KeywordSearchConfigurationPanel2.filesIndexedValue.text")); // NOI18N filesIndexedValue.setMaximumSize(null); - chunksLabel.setText(org.openide.util.NbBundle.getMessage(KeywordSearchConfigurationPanel2.class, "KeywordSearchConfigurationPanel2.chunksLabel.text")); // NOI18N + chunksLabel.setText(org.openide.util.NbBundle.getMessage(KeywordSearchConfigurationPanel2.class, + "KeywordSearchConfigurationPanel2.chunksLabel.text")); // NOI18N - chunksValLabel.setText(org.openide.util.NbBundle.getMessage(KeywordSearchConfigurationPanel2.class, "KeywordSearchConfigurationPanel2.chunksValLabel.text")); // NOI18N + chunksValLabel.setText(org.openide.util.NbBundle.getMessage(KeywordSearchConfigurationPanel2.class, + "KeywordSearchConfigurationPanel2.chunksValLabel.text")); // NOI18N - settingsLabel.setText(org.openide.util.NbBundle.getMessage(KeywordSearchConfigurationPanel2.class, "KeywordSearchConfigurationPanel2.settingsLabel.text")); // NOI18N + settingsLabel.setText(org.openide.util.NbBundle.getMessage(KeywordSearchConfigurationPanel2.class, + "KeywordSearchConfigurationPanel2.settingsLabel.text")); // NOI18N - informationLabel.setText(org.openide.util.NbBundle.getMessage(KeywordSearchConfigurationPanel2.class, "KeywordSearchConfigurationPanel2.informationLabel.text")); // NOI18N + informationLabel.setText(org.openide.util.NbBundle.getMessage(KeywordSearchConfigurationPanel2.class, + "KeywordSearchConfigurationPanel2.informationLabel.text")); // NOI18N - frequencyLabel.setText(org.openide.util.NbBundle.getMessage(KeywordSearchConfigurationPanel2.class, "KeywordSearchConfigurationPanel2.frequencyLabel.text")); // NOI18N + frequencyLabel.setText(org.openide.util.NbBundle.getMessage(KeywordSearchConfigurationPanel2.class, + "KeywordSearchConfigurationPanel2.frequencyLabel.text")); // NOI18N - timeRadioButton1.setText(org.openide.util.NbBundle.getMessage(KeywordSearchConfigurationPanel2.class, "KeywordSearchConfigurationPanel2.timeRadioButton1.text")); // NOI18N - timeRadioButton1.setToolTipText(org.openide.util.NbBundle.getMessage(KeywordSearchConfigurationPanel2.class, "KeywordSearchConfigurationPanel2.timeRadioButton1.toolTipText")); // NOI18N + timeRadioButton1.setText(org.openide.util.NbBundle.getMessage(KeywordSearchConfigurationPanel2.class, + "KeywordSearchConfigurationPanel2.timeRadioButton1.text")); // NOI18N + timeRadioButton1.setToolTipText(org.openide.util.NbBundle.getMessage(KeywordSearchConfigurationPanel2.class, + "KeywordSearchConfigurationPanel2.timeRadioButton1.toolTipText")); // NOI18N - timeRadioButton2.setText(org.openide.util.NbBundle.getMessage(KeywordSearchConfigurationPanel2.class, "KeywordSearchConfigurationPanel2.timeRadioButton2.text")); // NOI18N - timeRadioButton2.setToolTipText(org.openide.util.NbBundle.getMessage(KeywordSearchConfigurationPanel2.class, "KeywordSearchConfigurationPanel2.timeRadioButton2.toolTipText")); // NOI18N + timeRadioButton2.setText(org.openide.util.NbBundle.getMessage(KeywordSearchConfigurationPanel2.class, + "KeywordSearchConfigurationPanel2.timeRadioButton2.text")); // NOI18N + timeRadioButton2.setToolTipText(org.openide.util.NbBundle.getMessage(KeywordSearchConfigurationPanel2.class, + "KeywordSearchConfigurationPanel2.timeRadioButton2.toolTipText")); // NOI18N - timeRadioButton3.setText(org.openide.util.NbBundle.getMessage(KeywordSearchConfigurationPanel2.class, "KeywordSearchConfigurationPanel2.timeRadioButton3.text")); // NOI18N - timeRadioButton3.setToolTipText(org.openide.util.NbBundle.getMessage(KeywordSearchConfigurationPanel2.class, "KeywordSearchConfigurationPanel2.timeRadioButton3.toolTipText")); // NOI18N + timeRadioButton3.setText(org.openide.util.NbBundle.getMessage(KeywordSearchConfigurationPanel2.class, + "KeywordSearchConfigurationPanel2.timeRadioButton3.text")); // NOI18N + timeRadioButton3.setToolTipText(org.openide.util.NbBundle.getMessage(KeywordSearchConfigurationPanel2.class, + "KeywordSearchConfigurationPanel2.timeRadioButton3.toolTipText")); // NOI18N - timeRadioButton4.setText(org.openide.util.NbBundle.getMessage(KeywordSearchConfigurationPanel2.class, "KeywordSearchConfigurationPanel2.timeRadioButton4.text_1")); // NOI18N - timeRadioButton4.setToolTipText(org.openide.util.NbBundle.getMessage(KeywordSearchConfigurationPanel2.class, "KeywordSearchConfigurationPanel2.timeRadioButton4.toolTipText")); // NOI18N + timeRadioButton4.setText(org.openide.util.NbBundle.getMessage(KeywordSearchConfigurationPanel2.class, + "KeywordSearchConfigurationPanel2.timeRadioButton4.text_1")); // NOI18N + timeRadioButton4.setToolTipText(org.openide.util.NbBundle.getMessage(KeywordSearchConfigurationPanel2.class, + "KeywordSearchConfigurationPanel2.timeRadioButton4.toolTipText")); // NOI18N javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this); this.setLayout(layout); @@ -239,14 +257,11 @@ class KeywordSearchConfigurationPanel2 extends javax.swing.JPanel implements Opt private UpdateFrequency getSelectedTimeValue() { if (timeRadioButton1.isSelected()) { return UpdateFrequency.FAST; - } - else if (timeRadioButton2.isSelected()) { + } else if (timeRadioButton2.isSelected()) { return UpdateFrequency.AVG; - } - else if (timeRadioButton3.isSelected()) { + } else if (timeRadioButton3.isSelected()) { return UpdateFrequency.SLOW; - } - else if (timeRadioButton4.isSelected()) { + } else if (timeRadioButton4.isSelected()) { return UpdateFrequency.SLOWEST; } return UpdateFrequency.DEFAULT; @@ -282,7 +297,8 @@ class KeywordSearchConfigurationPanel2 extends javax.swing.JPanel implements Opt int newFilesIndexed = ((Integer) newValue).intValue(); filesIndexedValue.setText(Integer.toString(newFilesIndexed)); try { - chunksValLabel.setText(Integer.toString(KeywordSearch.getServer().queryNumIndexedChunks())); + chunksValLabel + .setText(Integer.toString(KeywordSearch.getServer().queryNumIndexedChunks())); } catch (KeywordSearchModuleException ex) { logger.log(Level.WARNING, "Could not get number of indexed chunks"); diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchConfigurationPanel3.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchConfigurationPanel3.java index ff736bfc2e..ae52c60839 100644 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchConfigurationPanel3.java +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchConfigurationPanel3.java @@ -26,8 +26,11 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; + import org.sleuthkit.autopsy.coreutils.Logger; + import javax.swing.JCheckBox; + import org.sleuthkit.autopsy.corecomponents.OptionsPanel; import org.sleuthkit.autopsy.coreutils.StringExtract; import org.sleuthkit.autopsy.coreutils.StringExtract.StringExtractUnicodeTable.SCRIPT; @@ -40,7 +43,8 @@ class KeywordSearchConfigurationPanel3 extends javax.swing.JPanel implements Opt private static KeywordSearchConfigurationPanel3 instance = null; private final Logger logger = Logger.getLogger(KeywordSearchConfigurationPanel3.class.getName()); - private final Map scripts = new HashMap(); + private final Map scripts + = new HashMap(); private ActionListener updateLanguagesAction; private List
Keyword hit").append(EscapeUtil.escapeHtml(attr.getValueString())).append("
Preview").append(EscapeUtil.escapeHtml(attr.getValueString())).append("
File").append(hitFile.getParentPath()).append(hitFile.getName()).append("
List").append(attr.getValueString()).append("
RegEx").append(attr.getValueString()).append("