diff --git a/ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/Bundle.properties b/ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/Bundle.properties
deleted file mode 100644
index 79e5170682ee968be5c960630d87ec60ba68e380..0000000000000000000000000000000000000000
--- a/ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/Bundle.properties
+++ /dev/null
@@ -1,9 +0,0 @@
-OpenIDE-Module-Long-Description=\
- New image and video analyzer that has been designed to make performing image-intensive investigations more efficient. \
- This work has been funded by DHS S&T and this is a beta release. \
- It is not available on the sleuthkit.org site and has been distributed to limited users.
-OpenIDE-Module-Name=ImageAnalyzer
-OpenIDE-Module-Short-Description=Advanced image and video analyzer
-ImageAnalyzerOptionsPanel.enabledForCaseBox.text=Enable Ingest Analyzer for current case.
-ImageAnalyzerOptionsPanel.enabledByDefaultBox.text=Enable Ingest Analyzer for new cases by default.
-ImageAnalyzerOptionsPanel.jLabel1.text=<html>To minimize startup times, Image Analyzer will constantly update its internal database. <br />This can cause ingest to be slower if you do not need the Image Analyzer features. <br />Use these settings to disable Image Analyzer if you do not need it.</html>
diff --git a/ImageAnalyzer/.gitattributes b/ImageGallery/.gitattributes
similarity index 100%
rename from ImageAnalyzer/.gitattributes
rename to ImageGallery/.gitattributes
diff --git a/ImageAnalyzer/.gitignore b/ImageGallery/.gitignore
similarity index 100%
rename from ImageAnalyzer/.gitignore
rename to ImageGallery/.gitignore
diff --git a/ImageAnalyzer/LICENSE-2.0.txt b/ImageGallery/LICENSE-2.0.txt
similarity index 100%
rename from ImageAnalyzer/LICENSE-2.0.txt
rename to ImageGallery/LICENSE-2.0.txt
diff --git a/ImageAnalyzer/build.xml b/ImageGallery/build.xml
similarity index 100%
rename from ImageAnalyzer/build.xml
rename to ImageGallery/build.xml
diff --git a/ImageAnalyzer/manifest.mf b/ImageGallery/manifest.mf
similarity index 100%
rename from ImageAnalyzer/manifest.mf
rename to ImageGallery/manifest.mf
diff --git a/ImageAnalyzer/nbproject/build-impl.xml b/ImageGallery/nbproject/build-impl.xml
similarity index 100%
rename from ImageAnalyzer/nbproject/build-impl.xml
rename to ImageGallery/nbproject/build-impl.xml
diff --git a/ImageAnalyzer/nbproject/genfiles.properties b/ImageGallery/nbproject/genfiles.properties
similarity index 100%
rename from ImageAnalyzer/nbproject/genfiles.properties
rename to ImageGallery/nbproject/genfiles.properties
diff --git a/ImageAnalyzer/nbproject/platform.properties b/ImageGallery/nbproject/platform.properties
similarity index 100%
rename from ImageAnalyzer/nbproject/platform.properties
rename to ImageGallery/nbproject/platform.properties
diff --git a/ImageAnalyzer/nbproject/project.properties b/ImageGallery/nbproject/project.properties
similarity index 100%
rename from ImageAnalyzer/nbproject/project.properties
rename to ImageGallery/nbproject/project.properties
diff --git a/ImageAnalyzer/nbproject/project.xml b/ImageGallery/nbproject/project.xml
similarity index 99%
rename from ImageAnalyzer/nbproject/project.xml
rename to ImageGallery/nbproject/project.xml
index 50614f1807d50e048765b48fa926c4b4e4b2733a..ce3c87ea8ed35b934ee7ec73fe3f0aa63ff1ac7b 100644
--- a/ImageAnalyzer/nbproject/project.xml
+++ b/ImageGallery/nbproject/project.xml
@@ -4,7 +4,7 @@
<configuration>
<data xmlns="http://www.netbeans.org/ns/nb-module-project/3">
<code-name-base>org.sleuthkit.autopsy.imageanalyzer</code-name-base>
- <standalone/>
+ <suite-component/>
<module-dependencies>
<dependency>
<code-name-base>org.netbeans.api.progress</code-name-base>
diff --git a/ImageAnalyzer/release/modules/ext/commons-pool2-2.0-javadoc.jar b/ImageGallery/release/modules/ext/commons-pool2-2.0-javadoc.jar
similarity index 100%
rename from ImageAnalyzer/release/modules/ext/commons-pool2-2.0-javadoc.jar
rename to ImageGallery/release/modules/ext/commons-pool2-2.0-javadoc.jar
diff --git a/ImageAnalyzer/release/modules/ext/commons-pool2-2.0-sources.jar b/ImageGallery/release/modules/ext/commons-pool2-2.0-sources.jar
similarity index 100%
rename from ImageAnalyzer/release/modules/ext/commons-pool2-2.0-sources.jar
rename to ImageGallery/release/modules/ext/commons-pool2-2.0-sources.jar
diff --git a/ImageAnalyzer/release/modules/ext/commons-pool2-2.0.jar b/ImageGallery/release/modules/ext/commons-pool2-2.0.jar
similarity index 100%
rename from ImageAnalyzer/release/modules/ext/commons-pool2-2.0.jar
rename to ImageGallery/release/modules/ext/commons-pool2-2.0.jar
diff --git a/ImageAnalyzer/release/modules/ext/controlsfx-8.0.6.jar b/ImageGallery/release/modules/ext/controlsfx-8.0.6.jar
similarity index 100%
rename from ImageAnalyzer/release/modules/ext/controlsfx-8.0.6.jar
rename to ImageGallery/release/modules/ext/controlsfx-8.0.6.jar
diff --git a/ImageAnalyzer/release/modules/ext/controlsfx-8.0.6_20.jar b/ImageGallery/release/modules/ext/controlsfx-8.0.6_20.jar
similarity index 100%
rename from ImageAnalyzer/release/modules/ext/controlsfx-8.0.6_20.jar
rename to ImageGallery/release/modules/ext/controlsfx-8.0.6_20.jar
diff --git a/ImageAnalyzer/release/modules/ext/jcip-annotations-src.jar b/ImageGallery/release/modules/ext/jcip-annotations-src.jar
similarity index 100%
rename from ImageAnalyzer/release/modules/ext/jcip-annotations-src.jar
rename to ImageGallery/release/modules/ext/jcip-annotations-src.jar
diff --git a/ImageAnalyzer/release/modules/ext/jcip-annotations.jar b/ImageGallery/release/modules/ext/jcip-annotations.jar
similarity index 100%
rename from ImageAnalyzer/release/modules/ext/jcip-annotations.jar
rename to ImageGallery/release/modules/ext/jcip-annotations.jar
diff --git a/ImageAnalyzer/release/modules/ext/sqlite-jdbc-3.7.8-SNAPSHOT.jar b/ImageGallery/release/modules/ext/sqlite-jdbc-3.7.8-SNAPSHOT.jar
similarity index 100%
rename from ImageAnalyzer/release/modules/ext/sqlite-jdbc-3.7.8-SNAPSHOT.jar
rename to ImageGallery/release/modules/ext/sqlite-jdbc-3.7.8-SNAPSHOT.jar
diff --git a/ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/Bundle.properties b/ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/Bundle.properties
new file mode 100644
index 0000000000000000000000000000000000000000..969cf465f6ba9b259bc6180af8d27ab1bf891d30
--- /dev/null
+++ b/ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/Bundle.properties
@@ -0,0 +1,9 @@
+OpenIDE-Module-Long-Description=\
+ New image and video gallery that has been designed to make performing image-intensive investigations more efficient. \
+ This work has been funded by DHS S&T and this is a beta release. \
+ It is not available on the sleuthkit.org site and has been distributed to limited users.
+OpenIDE-Module-Name=ImageGallery
+OpenIDE-Module-Short-Description=Advanced image and video gallery
+ImageGalleryOptionsPanel.jLabel1.text=<html>To minimize startup times, Image Gallery will constantly update its internal database. <br />This can cause ingest to be slower if you do not need the Image Gallery features. <br />Use these settings to disable Image Gallery if you do not need it.</html>
+ImageGalleryOptionsPanel.enabledForCaseBox.text=Enable Ingest Analyzer for current case.
+ImageGalleryOptionsPanel.enabledByDefaultBox.text=Enable Ingest Analyzer for new cases by default.
diff --git a/ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/FXMLConstructor.java b/ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/FXMLConstructor.java
similarity index 100%
rename from ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/FXMLConstructor.java
rename to ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/FXMLConstructor.java
diff --git a/ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/FileIDSelectionModel.java b/ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/FileIDSelectionModel.java
similarity index 100%
rename from ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/FileIDSelectionModel.java
rename to ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/FileIDSelectionModel.java
diff --git a/ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/FileUpdateEvent.java b/ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/FileUpdateEvent.java
similarity index 100%
rename from ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/FileUpdateEvent.java
rename to ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/FileUpdateEvent.java
diff --git a/ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/ImageAnalyzerController.java b/ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/ImageGalleryController.java
similarity index 95%
rename from ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/ImageAnalyzerController.java
rename to ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/ImageGalleryController.java
index f65fe674298b9522330d9229f35a33b769a28f56..bef487203ab12445af974e1cd6009675a537518c 100644
--- a/ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/ImageAnalyzerController.java
+++ b/ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/ImageGalleryController.java
@@ -76,9 +76,9 @@
* Connects different parts of ImageAnalyzer together and is hub for flow of
* control.
*/
-public final class ImageAnalyzerController {
+public final class ImageGalleryController {
- private static final Logger LOGGER = Logger.getLogger(ImageAnalyzerController.class.getName());
+ private static final Logger LOGGER = Logger.getLogger(ImageGalleryController.class.getName());
private final Region infoOverLayBackground = new Region() {
{
@@ -87,11 +87,11 @@ public final class ImageAnalyzerController {
}
};
- private static ImageAnalyzerController instance;
+ private static ImageGalleryController instance;
- public static synchronized ImageAnalyzerController getDefault() {
+ public static synchronized ImageGalleryController getDefault() {
if (instance == null) {
- instance = new ImageAnalyzerController();
+ instance = new ImageGalleryController();
}
return instance;
}
@@ -169,7 +169,7 @@ void setStale(Boolean b) {
stale.set(b);
});
if (Case.isCaseOpen()) {
- new PerCaseProperties(Case.getCurrentCase()).setConfigSetting(ImageAnalyzerModule.MODULE_NAME, PerCaseProperties.STALE, b.toString());
+ new PerCaseProperties(Case.getCurrentCase()).setConfigSetting(ImageGalleryModule.MODULE_NAME, PerCaseProperties.STALE, b.toString());
}
}
@@ -181,10 +181,10 @@ boolean isStale() {
return stale.get();
}
- private ImageAnalyzerController() {
+ private ImageGalleryController() {
listeningEnabled.addListener((ObservableValue<? extends Boolean> observable, Boolean oldValue, Boolean newValue) -> {
- if (newValue && !oldValue && Case.existsCurrentCase() && ImageAnalyzerModule.isCaseStale(Case.getCurrentCase())) {
+ if (newValue && !oldValue && Case.existsCurrentCase() && ImageGalleryModule.isCaseStale(Case.getCurrentCase())) {
queueDBWorkerTask(new CopyAnalyzedFiles());
}
});
@@ -325,8 +325,8 @@ public synchronized void setCase(Case c) {
this.db = DrawableDB.getDrawableDB(c.getCaseDirectory(), this);
- setListeningEnabled(ImageAnalyzerModule.isEnabledforCase(c));
- setStale(ImageAnalyzerModule.isCaseStale(c));
+ setListeningEnabled(ImageGalleryModule.isEnabledforCase(c));
+ setStale(ImageGalleryModule.isCaseStale(c));
// if we add this line icons are made as files are analyzed rather than on demand.
// db.addUpdatedFileListener(IconCache.getDefault());
@@ -414,10 +414,10 @@ void onStart() {
*/
AbstractFile file = (AbstractFile) evt.getNewValue();
if (isListeningEnabled()) {
- if (ImageAnalyzerModule.isSupportedAndNotKnown(file)) {
+ if (ImageGalleryModule.isSupportedAndNotKnown(file)) {
//this file should be included and we don't already know about it from hash sets (NSRL)
queueDBWorkerTask(new UpdateFileTask(file));
- } else if (ImageAnalyzerModule.getAllSupportedExtensions().contains(file.getNameExtension())) {
+ } else if (ImageGalleryModule.getAllSupportedExtensions().contains(file.getNameExtension())) {
//doing this check results in fewer tasks queued up, and faster completion of db update
//this file would have gotten scooped up in initial grab, but actually we don't need it
queueDBWorkerTask(new RemoveFileTask(file));
@@ -436,7 +436,7 @@ void onStart() {
setCase(newCase); //connect db, groupmanager, start worker thread
} else { // case is closing
//close window, reset everything
- SwingUtilities.invokeLater(ImageAnalyzerTopComponent::closeTopComponent);
+ SwingUtilities.invokeLater(ImageGalleryTopComponent::closeTopComponent);
reset();
}
break;
@@ -647,7 +647,7 @@ public void run() {
*/
class CopyAnalyzedFiles extends InnerTask {
- final private String DRAWABLE_QUERY = "name LIKE '%." + StringUtils.join(ImageAnalyzerModule.getAllSupportedExtensions(), "' or name LIKE '%.") + "'";
+ final private String DRAWABLE_QUERY = "name LIKE '%." + StringUtils.join(ImageGalleryModule.getAllSupportedExtensions(), "' or name LIKE '%.") + "'";
private ProgressHandle progressHandle = ProgressHandleFactory.createHandle("populating analyzed image/video database");
@@ -663,7 +663,7 @@ public void run() {
+ " and blackboard_attributes.artifact_id = blackboard_artifacts.artifact_id"
+ " and blackboard_artifacts.artifact_type_id = " + BlackboardArtifact.ARTIFACT_TYPE.TSK_GEN_INFO.getTypeID()
+ " and blackboard_attributes.attribute_type_id = " + BlackboardAttribute.ATTRIBUTE_TYPE.TSK_FILE_TYPE_SIG.getTypeID()
- + " and blackboard_attributes.value_text in ('" + StringUtils.join(ImageAnalyzerModule.getSupportedMimes(), "','") + "'))");
+ + " and blackboard_attributes.value_text in ('" + StringUtils.join(ImageGalleryModule.getSupportedMimes(), "','") + "'))");
progressHandle.switchToDeterminate(files.size());
updateProgress(0.0);
@@ -677,14 +677,14 @@ public void run() {
progressHandle.finish();
break;
}
- final Boolean hasMimeType = ImageAnalyzerModule.hasSupportedMimeType(f);
+ final Boolean hasMimeType = ImageGalleryModule.hasSupportedMimeType(f);
final boolean known = f.getKnown() == TskData.FileKnown.KNOWN;
if (known) {
db.removeFile(f.getId(), tr); //remove known files
} else {
if (hasMimeType == null) {
- if (ImageAnalyzerModule.isSupported(f)) {
+ if (ImageGalleryModule.isSupported(f)) {
//no mime type but supported => add as not analyzed
db.insertFile(DrawableFile.create(f, false), tr);
} else {
@@ -749,7 +749,7 @@ class PrePopulateDataSourceFiles extends InnerTask {
* check for supported images
*/
// (name like '.jpg' or name like '.png' ...)
- private final String DRAWABLE_QUERY = "name LIKE '%." + StringUtils.join(ImageAnalyzerModule.getAllSupportedExtensions(), "' or name LIKE '%.") + "'";
+ private final String DRAWABLE_QUERY = "name LIKE '%." + StringUtils.join(ImageGalleryModule.getAllSupportedExtensions(), "' or name LIKE '%.") + "'";
private ProgressHandle progressHandle = ProgressHandleFactory.createHandle("prepopulating image/video database");
diff --git a/ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/ImageAnalyzerModule.java b/ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/ImageGalleryModule.java
similarity index 92%
rename from ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/ImageAnalyzerModule.java
rename to ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/ImageGalleryModule.java
index fa22220ad7c5f63ee2e24f40ff4a387f9ffd3df1..5029d5cf6e15423b421006bf60dcfa13018fb676 100644
--- a/ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/ImageAnalyzerModule.java
+++ b/ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/ImageGalleryModule.java
@@ -38,11 +38,11 @@
import org.sleuthkit.datamodel.TskData;
/** static definitions and utilities for the ImageAnalyzer module */
-public class ImageAnalyzerModule {
+public class ImageGalleryModule {
- private static final Logger LOGGER = Logger.getLogger(ImageAnalyzerModule.class.getName());
+ private static final Logger LOGGER = Logger.getLogger(ImageGalleryModule.class.getName());
- static final String MODULE_NAME = ImageAnalyzerModule.class.getSimpleName();
+ static final String MODULE_NAME = ImageGalleryModule.class.getSimpleName();
private static final Set<String> videoExtensions
= Sets.newHashSet("aaf", "3gp", "asf", "avi", "m1v", "m2v", "m4v", "mp4",
@@ -65,7 +65,7 @@ public static Set<String> getSupportedMimes() {
}
/** provides static utilities, can not be instantiated */
- private ImageAnalyzerModule() {
+ private ImageGalleryModule() {
}
/** is listening enabled for the given case
@@ -76,8 +76,8 @@ private ImageAnalyzerModule() {
*/
static boolean isEnabledforCase(Case c) {
if (c != null) {
- String enabledforCaseProp = new PerCaseProperties(c).getConfigSetting(ImageAnalyzerModule.MODULE_NAME, PerCaseProperties.ENABLED);
- return StringUtils.isNotBlank(enabledforCaseProp) ? Boolean.valueOf(enabledforCaseProp) : ImageAnalyzerPreferences.isEnabledByDefault();
+ String enabledforCaseProp = new PerCaseProperties(c).getConfigSetting(ImageGalleryModule.MODULE_NAME, PerCaseProperties.ENABLED);
+ return StringUtils.isNotBlank(enabledforCaseProp) ? Boolean.valueOf(enabledforCaseProp) : ImageGalleryPreferences.isEnabledByDefault();
} else {
return false;
}
@@ -92,7 +92,7 @@ static boolean isEnabledforCase(Case c) {
*/
public static boolean isCaseStale(Case c) {
if (c != null) {
- String stale = new PerCaseProperties(c).getConfigSetting(ImageAnalyzerModule.MODULE_NAME, PerCaseProperties.STALE);
+ String stale = new PerCaseProperties(c).getConfigSetting(ImageGalleryModule.MODULE_NAME, PerCaseProperties.STALE);
return StringUtils.isNotBlank(stale) ? Boolean.valueOf(stale) : true;
} else {
return false;
@@ -171,6 +171,6 @@ private static String getFileExtension(AbstractFile file) {
* 'known', else false
*/
static public boolean isSupportedAndNotKnown(AbstractFile abstractFile) {
- return (abstractFile.getKnown() != TskData.FileKnown.KNOWN) && ImageAnalyzerModule.isSupported(abstractFile);
+ return (abstractFile.getKnown() != TskData.FileKnown.KNOWN) && ImageGalleryModule.isSupported(abstractFile);
}
}
diff --git a/ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/ImageAnalyzerOptionsPanel.form b/ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/ImageGalleryOptionsPanel.form
similarity index 88%
rename from ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/ImageAnalyzerOptionsPanel.form
rename to ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/ImageGalleryOptionsPanel.form
index b85a55ef08639031f5e134c8a753c8c262959d81..c9f83b2d11c6fffff4f980400abfc52739c5984a 100644
--- a/ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/ImageAnalyzerOptionsPanel.form
+++ b/ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/ImageGalleryOptionsPanel.form
@@ -52,7 +52,7 @@
<Component class="javax.swing.JCheckBox" name="enabledByDefaultBox">
<Properties>
<Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
- <ResourceString bundle="org/sleuthkit/autopsy/imageanalyzer/Bundle.properties" key="ImageAnalyzerOptionsPanel.enabledByDefaultBox.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, "{key}")"/>
+ <ResourceString bundle="org/sleuthkit/autopsy/imageanalyzer/Bundle.properties" key="ImageGalleryOptionsPanel.enabledByDefaultBox.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, "{key}")"/>
</Property>
</Properties>
<Events>
@@ -62,7 +62,7 @@
<Component class="javax.swing.JCheckBox" name="enabledForCaseBox">
<Properties>
<Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
- <ResourceString bundle="org/sleuthkit/autopsy/imageanalyzer/Bundle.properties" key="ImageAnalyzerOptionsPanel.enabledForCaseBox.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, "{key}")"/>
+ <ResourceString bundle="org/sleuthkit/autopsy/imageanalyzer/Bundle.properties" key="ImageGalleryOptionsPanel.enabledForCaseBox.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, "{key}")"/>
</Property>
</Properties>
<Events>
@@ -72,7 +72,7 @@
<Component class="javax.swing.JLabel" name="jLabel1">
<Properties>
<Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
- <ResourceString bundle="org/sleuthkit/autopsy/imageanalyzer/Bundle.properties" key="ImageAnalyzerOptionsPanel.jLabel1.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, "{key}")"/>
+ <ResourceString bundle="org/sleuthkit/autopsy/imageanalyzer/Bundle.properties" key="ImageGalleryOptionsPanel.jLabel1.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, "{key}")"/>
</Property>
</Properties>
</Component>
diff --git a/ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/ImageAnalyzerOptionsPanel.java b/ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/ImageGalleryOptionsPanel.java
similarity index 83%
rename from ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/ImageAnalyzerOptionsPanel.java
rename to ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/ImageGalleryOptionsPanel.java
index 820aa843252694ba67853fbc7a43620e507d0bad..0eba03cd4debeca083fd141cbeeaeec68b197e80 100644
--- a/ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/ImageAnalyzerOptionsPanel.java
+++ b/ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/ImageGalleryOptionsPanel.java
@@ -22,15 +22,15 @@
import org.sleuthkit.autopsy.casemodule.Case;
import org.sleuthkit.autopsy.ingest.IngestManager;
-/** The Image/Video Analyzer panel in the NetBeans provided Options Dialogs
+/** * The Image/Video Analyzer panel in the NetBeans provided Options Dialogs
* accessed via Tool -> Options
*
- * Uses {@link ImageAnalyzerPreferences} and {@link PerCaseProperties} to
+ * Uses {@link ImageGalleryPreferences} and {@link PerCaseProperties} to
* persist settings
*/
-final class ImageAnalyzerOptionsPanel extends javax.swing.JPanel {
+final class ImageGalleryOptionsPanel extends javax.swing.JPanel {
- ImageAnalyzerOptionsPanel(ImageAnalyzerOptionsPanelController controller) {
+ ImageGalleryOptionsPanel(ImageGalleryOptionsPanelController controller) {
initComponents();
//listen for interactions
@@ -60,21 +60,21 @@ private void initComponents() {
enabledForCaseBox = new javax.swing.JCheckBox();
jLabel1 = new javax.swing.JLabel();
- org.openide.awt.Mnemonics.setLocalizedText(enabledByDefaultBox, org.openide.util.NbBundle.getMessage(ImageAnalyzerOptionsPanel.class, "ImageAnalyzerOptionsPanel.enabledByDefaultBox.text")); // NOI18N
+ org.openide.awt.Mnemonics.setLocalizedText(enabledByDefaultBox, org.openide.util.NbBundle.getMessage(ImageGalleryOptionsPanel.class, "ImageGalleryOptionsPanel.enabledByDefaultBox.text")); // NOI18N
enabledByDefaultBox.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) {
enabledByDefaultBoxActionPerformed(evt);
}
});
- org.openide.awt.Mnemonics.setLocalizedText(enabledForCaseBox, org.openide.util.NbBundle.getMessage(ImageAnalyzerOptionsPanel.class, "ImageAnalyzerOptionsPanel.enabledForCaseBox.text")); // NOI18N
+ org.openide.awt.Mnemonics.setLocalizedText(enabledForCaseBox, org.openide.util.NbBundle.getMessage(ImageGalleryOptionsPanel.class, "ImageGalleryOptionsPanel.enabledForCaseBox.text")); // NOI18N
enabledForCaseBox.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) {
enabledForCaseBoxActionPerformed(evt);
}
});
- org.openide.awt.Mnemonics.setLocalizedText(jLabel1, org.openide.util.NbBundle.getMessage(ImageAnalyzerOptionsPanel.class, "ImageAnalyzerOptionsPanel.jLabel1.text")); // NOI18N
+ org.openide.awt.Mnemonics.setLocalizedText(jLabel1, org.openide.util.NbBundle.getMessage(ImageGalleryOptionsPanel.class, "ImageGalleryOptionsPanel.jLabel1.text")); // NOI18N
javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
this.setLayout(layout);
@@ -115,10 +115,10 @@ private void enabledForCaseBoxActionPerformed(java.awt.event.ActionEvent evt) {/
/** {@inheritDoc} */
void load() {
- enabledByDefaultBox.setSelected(ImageAnalyzerPreferences.isEnabledByDefault());
+ enabledByDefaultBox.setSelected(ImageGalleryPreferences.isEnabledByDefault());
if (Case.isCaseOpen() && IngestManager.getInstance().isIngestRunning() == false) {
enabledForCaseBox.setEnabled(true);
- enabledForCaseBox.setSelected(ImageAnalyzerModule.isEnabledforCase(Case.getCurrentCase()));
+ enabledForCaseBox.setSelected(ImageGalleryModule.isEnabledforCase(Case.getCurrentCase()));
} else {
enabledForCaseBox.setEnabled(false);
enabledForCaseBox.setSelected(enabledByDefaultBox.isSelected());
@@ -127,10 +127,10 @@ void load() {
/** {@inheritDoc } */
void store() {
- ImageAnalyzerPreferences.setEnabledByDefault(enabledByDefaultBox.isSelected());
- ImageAnalyzerController.getDefault().setListeningEnabled(enabledForCaseBox.isSelected());
+ ImageGalleryPreferences.setEnabledByDefault(enabledByDefaultBox.isSelected());
+ ImageGalleryController.getDefault().setListeningEnabled(enabledForCaseBox.isSelected());
if (Case.isCaseOpen()) {
- new PerCaseProperties(Case.getCurrentCase()).setConfigSetting(ImageAnalyzerModule.MODULE_NAME, PerCaseProperties.ENABLED, Boolean.toString(enabledForCaseBox.isSelected()));
+ new PerCaseProperties(Case.getCurrentCase()).setConfigSetting(ImageGalleryModule.MODULE_NAME, PerCaseProperties.ENABLED, Boolean.toString(enabledForCaseBox.isSelected()));
}
}
diff --git a/ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/ImageAnalyzerOptionsPanelController.java b/ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/ImageGalleryOptionsPanelController.java
similarity index 89%
rename from ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/ImageAnalyzerOptionsPanelController.java
rename to ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/ImageGalleryOptionsPanelController.java
index 5d1aa3c66db1e0cacdc6cfca4d063ffd77ffb9d3..b9fd06f757178294e1bb28605fd49409ff3bba24 100644
--- a/ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/ImageAnalyzerOptionsPanelController.java
+++ b/ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/ImageGalleryOptionsPanelController.java
@@ -33,10 +33,10 @@
keywords = "#OptionsCategory_Keywords_Options",
keywordsCategory = "Options"
)
-@org.openide.util.NbBundle.Messages({"OptionsCategory_Name_Options=Image / Video Analzyer", "OptionsCategory_Keywords_Options=image video analyzer category "})
-public final class ImageAnalyzerOptionsPanelController extends OptionsPanelController {
+@org.openide.util.NbBundle.Messages({"OptionsCategory_Name_Options=Image / Video Gallery", "OptionsCategory_Keywords_Options=image video gallery category "})
+public final class ImageGalleryOptionsPanelController extends OptionsPanelController {
- private ImageAnalyzerOptionsPanel panel;
+ private ImageGalleryOptionsPanel panel;
private final PropertyChangeSupport pcs = new PropertyChangeSupport(this);
@@ -91,9 +91,9 @@ public void removePropertyChangeListener(PropertyChangeListener l) {
pcs.removePropertyChangeListener(l);
}
- private ImageAnalyzerOptionsPanel getPanel() {
+ private ImageGalleryOptionsPanel getPanel() {
if (panel == null) {
- panel = new ImageAnalyzerOptionsPanel(this);
+ panel = new ImageGalleryOptionsPanel(this);
}
return panel;
}
diff --git a/ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/ImageAnalyzerPreferences.java b/ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/ImageGalleryPreferences.java
similarity index 96%
rename from ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/ImageAnalyzerPreferences.java
rename to ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/ImageGalleryPreferences.java
index 0fbf886926982e1047666836e5319795c84dfb52..a9fb2780c86b18180dce3cc62bac6eb07b0389ae 100644
--- a/ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/ImageAnalyzerPreferences.java
+++ b/ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/ImageGalleryPreferences.java
@@ -23,10 +23,10 @@
import org.openide.util.NbPreferences;
/** Persists Image Analyzer preference to a per user .properties file */
-class ImageAnalyzerPreferences {
+class ImageGalleryPreferences {
/** NBPreferences object used to persist settings */
- private static final Preferences preferences = NbPreferences.forModule(ImageAnalyzerPreferences.class);
+ private static final Preferences preferences = NbPreferences.forModule(ImageGalleryPreferences.class);
/** key for the listening enabled for new cases setting */
private static final String ENABLED_BY_DEFAULT = "enabled_by_default";
diff --git a/ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/ImageAnalyzerTopComponent.form b/ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/ImageGalleryTopComponent.form
similarity index 100%
rename from ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/ImageAnalyzerTopComponent.form
rename to ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/ImageGalleryTopComponent.form
diff --git a/ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/ImageAnalyzerTopComponent.java b/ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/ImageGalleryTopComponent.java
similarity index 87%
rename from ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/ImageAnalyzerTopComponent.java
rename to ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/ImageGalleryTopComponent.java
index bd72f1137023f01d010eb1a50fd6de747f022bf9..05f53f1b7378658c017c22b13c68dd9fad2abed3 100644
--- a/ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/ImageAnalyzerTopComponent.java
+++ b/ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/ImageGalleryTopComponent.java
@@ -55,19 +55,19 @@
dtd = "-//org.sleuthkit.autopsy.imageanalyzer//ImageAnalyzer//EN",
autostore = false)
@TopComponent.Description(
- preferredID = "ImageAnalyzerTopComponent",
+ preferredID = "ImageGalleryTopComponent",
//iconBase = "org/sleuthkit/autopsy/imageanalyzer/images/lightbulb.png" use this to put icon in window title area,
persistenceType = TopComponent.PERSISTENCE_NEVER)
@TopComponent.Registration(mode = "timeline", openAtStartup = false)
@Messages({
- "CTL_ImageAnalyzerAction=Image/Video Analysis",
- "CTL_ImageAnalyzerTopComponent=Image/Video Analysis",
- "HINT_ImageAnalyzerTopComponent=This is a Image/Video Analysis window"
+ "CTL_ImageGalleryAction=Image/Video Gallery",
+ "CTL_ImageGalleryTopComponent=Image/Video Gallery",
+ "HINT_ImageGalleryTopComponent=This is a Image/Video Gallery window"
})
-public final class ImageAnalyzerTopComponent extends TopComponent implements ExplorerManager.Provider, Lookup.Provider {
+public final class ImageGalleryTopComponent extends TopComponent implements ExplorerManager.Provider, Lookup.Provider {
- public final static String PREFERRED_ID = "ImageAnalyzerTopComponent";
- private static final Logger LOGGER = Logger.getLogger(ImageAnalyzerTopComponent.class.getName());
+ public final static String PREFERRED_ID = "ImageGalleryTopComponent";
+ private static final Logger LOGGER = Logger.getLogger(ImageGalleryTopComponent.class.getName());
private static boolean topComponentInitialized = false;
public static void openTopComponent() {
@@ -79,7 +79,7 @@ public static void openTopComponent() {
// }
// }
// timeLineController.openTimeLine();
- final ImageAnalyzerTopComponent tc = (ImageAnalyzerTopComponent) WindowManager.getDefault().findTopComponent("ImageAnalyzerTopComponent");
+ final ImageGalleryTopComponent tc = (ImageGalleryTopComponent) WindowManager.getDefault().findTopComponent("ImageGalleryTopComponent");
if (tc != null) {
topComponentInitialized = true;
WindowManager.getDefault().isTopComponentFloating(tc);
@@ -94,12 +94,12 @@ public static void openTopComponent() {
public static void closeTopComponent() {
if(topComponentInitialized){
- final TopComponent etc = WindowManager.getDefault().findTopComponent("ImageAnalyzerTopComponent");
+ final TopComponent etc = WindowManager.getDefault().findTopComponent("ImageGalleryTopComponent");
if (etc != null) {
try {
etc.close();
} catch (Exception e) {
- LOGGER.log(Level.SEVERE, "failed to close ImageAnalyzerTopComponent", e);
+ LOGGER.log(Level.SEVERE, "failed to close ImageGalleryTopComponent", e);
}
}
}
@@ -109,7 +109,7 @@ public static void closeTopComponent() {
private final Lookup lookup = (ExplorerUtils.createLookup(em, getActionMap()));
- private final ImageAnalyzerController controller = ImageAnalyzerController.getDefault();
+ private final ImageGalleryController controller = ImageGalleryController.getDefault();
private SplitPane splitPane;
@@ -129,10 +129,10 @@ public static void closeTopComponent() {
private Scene myScene;
- public ImageAnalyzerTopComponent() {
+ public ImageGalleryTopComponent() {
- setName(Bundle.CTL_ImageAnalyzerTopComponent());
- setToolTipText(Bundle.HINT_ImageAnalyzerTopComponent());
+ setName(Bundle.CTL_ImageGalleryTopComponent());
+ setToolTipText(Bundle.HINT_ImageGalleryTopComponent());
initComponents();
@@ -158,7 +158,7 @@ public ImageAnalyzerTopComponent() {
splitPane.getItems().addAll(leftPane, centralStack, metaDataTable);
splitPane.setDividerPositions(0.0, 1.0);
- ImageAnalyzerController.getDefault().setStacks(fullUIStack, centralStack);
+ ImageGalleryController.getDefault().setStacks(fullUIStack, centralStack);
});
}
diff --git a/ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/OnStart.java b/ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/OnStart.java
similarity index 95%
rename from ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/OnStart.java
rename to ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/OnStart.java
index b68372d6b5971d615e88e2ab34ed78b83fb7225a..96f92bf07651e7690a432ab1fb95bdab623c71f2 100644
--- a/ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/OnStart.java
+++ b/ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/OnStart.java
@@ -38,6 +38,6 @@ public class OnStart implements Runnable {
*/
@Override
public void run() {
- ImageAnalyzerController.getDefault().onStart();
+ ImageGalleryController.getDefault().onStart();
}
}
diff --git a/ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/PerCaseProperties.java b/ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/PerCaseProperties.java
similarity index 100%
rename from ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/PerCaseProperties.java
rename to ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/PerCaseProperties.java
diff --git a/ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/TagUtils.java b/ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/TagUtils.java
similarity index 100%
rename from ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/TagUtils.java
rename to ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/TagUtils.java
diff --git a/ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/ThumbnailCache.java b/ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/ThumbnailCache.java
similarity index 99%
rename from ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/ThumbnailCache.java
rename to ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/ThumbnailCache.java
index 22f3b42275c49acccfbb3bfbad16627acb85d7af..1d8c1351ed08080cdb636a53b4db809ca57d7c54 100644
--- a/ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/ThumbnailCache.java
+++ b/ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/ThumbnailCache.java
@@ -102,7 +102,7 @@ public Image get(DrawableFile<?> file) {
public Image get(Long fileID) {
try {
- return get(ImageAnalyzerController.getDefault().getFileFromId(fileID));
+ return get(ImageGalleryController.getDefault().getFileFromId(fileID));
} catch (TskCoreException ex) {
Exceptions.printStackTrace(ex);
return null;
diff --git a/ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/actions/AddDrawableTagAction.java b/ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/actions/AddDrawableTagAction.java
similarity index 92%
rename from ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/actions/AddDrawableTagAction.java
rename to ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/actions/AddDrawableTagAction.java
index 9627d3b3d8a7e1a69be51797d3a9f8e40670d835..c08d925b9ae45834d93604fc6d28d3fa8b452f75 100644
--- a/ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/actions/AddDrawableTagAction.java
+++ b/ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/actions/AddDrawableTagAction.java
@@ -31,7 +31,7 @@
import org.sleuthkit.autopsy.coreutils.Logger;
import org.sleuthkit.autopsy.imageanalyzer.FileIDSelectionModel;
import org.sleuthkit.autopsy.imageanalyzer.FileUpdateEvent;
-import org.sleuthkit.autopsy.imageanalyzer.ImageAnalyzerController;
+import org.sleuthkit.autopsy.imageanalyzer.ImageGalleryController;
import org.sleuthkit.autopsy.imageanalyzer.datamodel.DrawableAttribute;
import org.sleuthkit.autopsy.imageanalyzer.datamodel.DrawableFile;
import org.sleuthkit.datamodel.AbstractFile;
@@ -82,7 +82,7 @@ public void addTag(TagName tagName, String comment) {
protected Void doInBackground() throws Exception {
for (Long fileID : selectedFiles) {
try {
- DrawableFile<?> file = ImageAnalyzerController.getDefault().getFileFromId(fileID);
+ DrawableFile<?> file = ImageGalleryController.getDefault().getFileFromId(fileID);
LOGGER.log(Level.INFO, "tagging {0} with {1} and comment {2}", new Object[]{file.getName(), tagName.getDisplayName(), comment});
Case.getCurrentCase().getServices().getTagsManager().addContentTag(file, tagName, comment);
} catch (IllegalStateException ex) {
@@ -93,7 +93,7 @@ protected Void doInBackground() throws Exception {
}
//make sure rest of ui hears category change.
- ImageAnalyzerController.getDefault().getGroupManager().handleFileUpdate(FileUpdateEvent.newUpdateEvent(Collections.singleton(fileID), DrawableAttribute.TAGS));
+ ImageGalleryController.getDefault().getGroupManager().handleFileUpdate(FileUpdateEvent.newUpdateEvent(Collections.singleton(fileID), DrawableAttribute.TAGS));
}
diff --git a/ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/actions/AddTagAction.java b/ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/actions/AddTagAction.java
similarity index 100%
rename from ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/actions/AddTagAction.java
rename to ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/actions/AddTagAction.java
diff --git a/ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/actions/Back.java b/ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/actions/Back.java
similarity index 90%
rename from ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/actions/Back.java
rename to ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/actions/Back.java
index ab00eddd7fc4684de7f196e25faa2c72b094b8c4..5c4cdfcee1dca0b091dd245b9c3a60a99fb723b1 100644
--- a/ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/actions/Back.java
+++ b/ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/actions/Back.java
@@ -24,7 +24,7 @@
import javafx.scene.input.KeyCode;
import javafx.scene.input.KeyCodeCombination;
import org.controlsfx.control.action.Action;
-import org.sleuthkit.autopsy.imageanalyzer.ImageAnalyzerController;
+import org.sleuthkit.autopsy.imageanalyzer.ImageGalleryController;
/**
*
@@ -34,9 +34,9 @@ public class Back extends Action {
private static final Image BACK_IMAGE = new Image("/org/sleuthkit/autopsy/imageanalyzer/images/arrow-180.png", 16, 16, true, true, true);
- private final ImageAnalyzerController controller;
+ private final ImageGalleryController controller;
- public Back(ImageAnalyzerController controller) {
+ public Back(ImageGalleryController controller) {
super("Back");
setGraphic(new ImageView(BACK_IMAGE));
setAccelerator(new KeyCodeCombination(KeyCode.LEFT, KeyCodeCombination.ALT_DOWN));
diff --git a/ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/actions/CategorizeAction.java b/ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/actions/CategorizeAction.java
similarity index 97%
rename from ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/actions/CategorizeAction.java
rename to ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/actions/CategorizeAction.java
index 0da896df021d514411506a3cdbde4e216099ff42..b26368d4725f0639764978ab31f0e07458854f87 100644
--- a/ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/actions/CategorizeAction.java
+++ b/ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/actions/CategorizeAction.java
@@ -34,7 +34,7 @@
import org.sleuthkit.autopsy.coreutils.Logger;
import org.sleuthkit.autopsy.imageanalyzer.FileIDSelectionModel;
import org.sleuthkit.autopsy.imageanalyzer.FileUpdateEvent;
-import org.sleuthkit.autopsy.imageanalyzer.ImageAnalyzerController;
+import org.sleuthkit.autopsy.imageanalyzer.ImageGalleryController;
import org.sleuthkit.autopsy.imageanalyzer.datamodel.Category;
import org.sleuthkit.autopsy.imageanalyzer.datamodel.DrawableAttribute;
import org.sleuthkit.autopsy.imageanalyzer.datamodel.DrawableFile;
@@ -53,11 +53,11 @@ public class CategorizeAction extends AddTagAction {
private static final Logger LOGGER = Logger.getLogger(CategorizeAction.class.getName());
- private final ImageAnalyzerController controller;
+ private final ImageGalleryController controller;
public CategorizeAction() {
super();
- this.controller = ImageAnalyzerController.getDefault();
+ this.controller = ImageGalleryController.getDefault();
}
static public Menu getPopupMenu() {
diff --git a/ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/actions/Forward.java b/ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/actions/Forward.java
similarity index 90%
rename from ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/actions/Forward.java
rename to ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/actions/Forward.java
index 2a2532fa232d4497675fe710e093f57bf72151e0..31f3b98b477ba1507aa1171842559472825375d8 100644
--- a/ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/actions/Forward.java
+++ b/ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/actions/Forward.java
@@ -24,7 +24,7 @@
import javafx.scene.input.KeyCode;
import javafx.scene.input.KeyCodeCombination;
import org.controlsfx.control.action.Action;
-import org.sleuthkit.autopsy.imageanalyzer.ImageAnalyzerController;
+import org.sleuthkit.autopsy.imageanalyzer.ImageGalleryController;
/**
*
@@ -34,9 +34,9 @@ public class Forward extends Action {
private static final Image BACK_IMAGE = new Image("/org/sleuthkit/autopsy/imageanalyzer/images/arrow.png", 16, 16, true, true, true);
- private final ImageAnalyzerController controller;
+ private final ImageGalleryController controller;
- public Forward(ImageAnalyzerController controller) {
+ public Forward(ImageGalleryController controller) {
super("Forward");
setGraphic(new ImageView(BACK_IMAGE));
setAccelerator(new KeyCodeCombination(KeyCode.RIGHT, KeyCodeCombination.ALT_DOWN));
diff --git a/ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/actions/NextUnseenGroup.java b/ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/actions/NextUnseenGroup.java
similarity index 91%
rename from ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/actions/NextUnseenGroup.java
rename to ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/actions/NextUnseenGroup.java
index 21780cba97aa318b25673c0b7f2ee6d42be41604..423c8a201c32b13c5c7a205c074566d558f1ccee 100644
--- a/ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/actions/NextUnseenGroup.java
+++ b/ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/actions/NextUnseenGroup.java
@@ -22,7 +22,7 @@
import javafx.event.ActionEvent;
import javafx.scene.image.ImageView;
import org.controlsfx.control.action.Action;
-import org.sleuthkit.autopsy.imageanalyzer.ImageAnalyzerController;
+import org.sleuthkit.autopsy.imageanalyzer.ImageGalleryController;
import org.sleuthkit.autopsy.imageanalyzer.grouping.GroupViewState;
/**
@@ -30,9 +30,9 @@
*/
public class NextUnseenGroup extends Action {
- private final ImageAnalyzerController controller;
+ private final ImageGalleryController controller;
- public NextUnseenGroup(ImageAnalyzerController controller) {
+ public NextUnseenGroup(ImageGalleryController controller) {
super("Next Unseen group");
this.controller = controller;
setGraphic(new ImageView("/org/sleuthkit/autopsy/imageanalyzer/images/control-double.png"));
diff --git a/ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/actions/OpenAction.java b/ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/actions/OpenAction.java
similarity index 83%
rename from ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/actions/OpenAction.java
rename to ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/actions/OpenAction.java
index 231df76c292fc3f0aefdf8c6fb3d4faf2802e9bc..d0c654a334e45d52cea2208cbc4d5b3b69958c8c 100644
--- a/ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/actions/OpenAction.java
+++ b/ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/actions/OpenAction.java
@@ -31,9 +31,9 @@
import org.sleuthkit.autopsy.casemodule.Case;
import org.sleuthkit.autopsy.core.Installer;
import org.sleuthkit.autopsy.coreutils.Logger;
-import org.sleuthkit.autopsy.imageanalyzer.ImageAnalyzerController;
-import org.sleuthkit.autopsy.imageanalyzer.ImageAnalyzerModule;
-import org.sleuthkit.autopsy.imageanalyzer.ImageAnalyzerTopComponent;
+import org.sleuthkit.autopsy.imageanalyzer.ImageGalleryController;
+import org.sleuthkit.autopsy.imageanalyzer.ImageGalleryModule;
+import org.sleuthkit.autopsy.imageanalyzer.ImageGalleryTopComponent;
@ActionID(category = "Tools",
id = "org.sleuthkit.autopsy.imageanalyzer.OpenAction")
@@ -41,10 +41,10 @@
@ActionRegistration( // iconBase = "org/sleuthkit/autopsy/imageanalyzer/images/lightbulb.png",
lazy = false,
displayName = "#CTL_OpenAction")
-@Messages("CTL_OpenAction=Analyze Images/Videos")
+@Messages("CTL_OpenAction=View Images/Videos")
public final class OpenAction extends CallableSystemAction {
- private final String Analyze_Images_Videos = "Analyze Images/Videos";
+ private final String Analyze_Images_Videos = "View Images/Videos";
private static final boolean fxInited = Installer.isJavaFxInited();
@@ -81,27 +81,27 @@ public void performAction() {
}
final Case currentCase = Case.getCurrentCase();
- if (ImageAnalyzerModule.isCaseStale(currentCase)) {
+ if (ImageGalleryModule.isCaseStale(currentCase)) {
//case is stale, ask what to do
int answer = JOptionPane.showConfirmDialog(WindowManager.getDefault().getMainWindow(), "The image / video databse may be out of date. "
+ "Do you want to update and listen for further ingest results?\n"
+ " Choosing 'no' will display the out of date results."
- + " Choosing 'cancel' will close the image /video analyzer",
- "The image / video databse may be out of date. ", JOptionPane.YES_NO_CANCEL_OPTION, JOptionPane.WARNING_MESSAGE);
+ + " Choosing 'cancel' will close the image /video gallery",
+ "The image / video database may be out of date. ", JOptionPane.YES_NO_CANCEL_OPTION, JOptionPane.WARNING_MESSAGE);
switch (answer) {
case JOptionPane.YES_OPTION:
- ImageAnalyzerController.getDefault().setListeningEnabled(true);
+ ImageGalleryController.getDefault().setListeningEnabled(true);
//fall through
case JOptionPane.NO_OPTION:
- ImageAnalyzerTopComponent.openTopComponent();
+ ImageGalleryTopComponent.openTopComponent();
break;
case JOptionPane.CANCEL_OPTION:
break; //do nothing
}
} else {
//case is not stale, just open it
- ImageAnalyzerTopComponent.openTopComponent();
+ ImageGalleryTopComponent.openTopComponent();
}
}
diff --git a/ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/actions/OpenHelpAction.java b/ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/actions/OpenHelpAction.java
similarity index 96%
rename from ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/actions/OpenHelpAction.java
rename to ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/actions/OpenHelpAction.java
index 9fce64faf7980f07afefbee236ba8e6570692cea..bb72656be92e4cc8a36489f91010ed14b9e9aef0 100644
--- a/ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/actions/OpenHelpAction.java
+++ b/ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/actions/OpenHelpAction.java
@@ -37,7 +37,7 @@
displayName = "#CTL_OpenHelpAction"
)
@ActionReference(path = "Menu/Help", position = 350)
-@Messages("CTL_OpenHelpAction=Image / Video Analyzer Help")
+@Messages("CTL_OpenHelpAction=Image / Video Gallery Help")
public final class OpenHelpAction implements ActionListener {
@Override
diff --git a/ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/actions/SwingMenuItemAdapter.java b/ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/actions/SwingMenuItemAdapter.java
similarity index 100%
rename from ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/actions/SwingMenuItemAdapter.java
rename to ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/actions/SwingMenuItemAdapter.java
diff --git a/ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/datamodel/Category.java b/ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/datamodel/Category.java
similarity index 100%
rename from ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/datamodel/Category.java
rename to ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/datamodel/Category.java
diff --git a/ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/datamodel/DrawableAttribute.java b/ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/datamodel/DrawableAttribute.java
similarity index 100%
rename from ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/datamodel/DrawableAttribute.java
rename to ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/datamodel/DrawableAttribute.java
diff --git a/ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/datamodel/DrawableDB.java b/ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/datamodel/DrawableDB.java
similarity index 99%
rename from ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/datamodel/DrawableDB.java
rename to ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/datamodel/DrawableDB.java
index 034ef6b3567f16a61dab645ffbf0c8b301a77c56..398bdd24f7aa449de9757af4deb1b402591a50a3 100644
--- a/ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/datamodel/DrawableDB.java
+++ b/ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/datamodel/DrawableDB.java
@@ -42,7 +42,7 @@
import org.sleuthkit.autopsy.casemodule.Case;
import org.sleuthkit.autopsy.coreutils.Logger;
import org.sleuthkit.autopsy.imageanalyzer.FileUpdateEvent;
-import org.sleuthkit.autopsy.imageanalyzer.ImageAnalyzerController;
+import org.sleuthkit.autopsy.imageanalyzer.ImageGalleryController;
import org.sleuthkit.autopsy.imageanalyzer.grouping.GroupKey;
import org.sleuthkit.autopsy.imageanalyzer.grouping.GroupManager;
import org.sleuthkit.autopsy.imageanalyzer.grouping.GroupSortBy;
@@ -123,7 +123,7 @@ public class DrawableDB {
private GroupManager manager;
- private ImageAnalyzerController controller;
+ private ImageGalleryController controller;
private final String dbPath;
@@ -273,7 +273,7 @@ private PreparedStatement prepareStatement(String stmtString, DrawableAttribute<
*
* @return
*/
- public static DrawableDB getDrawableDB(String dbPath, ImageAnalyzerController controller) {
+ public static DrawableDB getDrawableDB(String dbPath, ImageGalleryController controller) {
try {
DrawableDB drawableDB = new DrawableDB(dbPath + File.separator + "drawable.db");
diff --git a/ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/datamodel/DrawableFile.java b/ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/datamodel/DrawableFile.java
similarity index 98%
rename from ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/datamodel/DrawableFile.java
rename to ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/datamodel/DrawableFile.java
index 79525db452546cede0c190deaf41993f3dce6e19..7b6fbb79d06351a2a0849c086ccf2074c2997d70 100644
--- a/ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/datamodel/DrawableFile.java
+++ b/ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/datamodel/DrawableFile.java
@@ -35,7 +35,7 @@
import org.apache.commons.lang3.text.WordUtils;
import org.sleuthkit.autopsy.casemodule.Case;
import org.sleuthkit.autopsy.coreutils.Logger;
-import org.sleuthkit.autopsy.imageanalyzer.ImageAnalyzerModule;
+import org.sleuthkit.autopsy.imageanalyzer.ImageGalleryModule;
import org.sleuthkit.datamodel.AbstractFile;
import org.sleuthkit.datamodel.BlackboardArtifact;
import org.sleuthkit.datamodel.BlackboardAttribute;
@@ -61,7 +61,7 @@
public abstract class DrawableFile<T extends AbstractFile> extends AbstractFile {
public static DrawableFile<?> create(AbstractFile abstractFileById, boolean analyzed) {
- if (ImageAnalyzerModule.isVideoFile(abstractFileById)) {
+ if (ImageGalleryModule.isVideoFile(abstractFileById)) {
return new VideoFile<>(abstractFileById, analyzed);
} else {
return new ImageFile<>(abstractFileById, analyzed);
@@ -71,7 +71,7 @@ public static DrawableFile<?> create(AbstractFile abstractFileById, boolean anal
public static DrawableFile<?> create(Long id, boolean analyzed) throws TskCoreException, IllegalStateException {
AbstractFile abstractFileById = Case.getCurrentCase().getSleuthkitCase().getAbstractFileById(id);
- if (ImageAnalyzerModule.isVideoFile(abstractFileById)) {
+ if (ImageGalleryModule.isVideoFile(abstractFileById)) {
return new VideoFile<>(abstractFileById, analyzed);
} else {
return new ImageFile<>(abstractFileById, analyzed);
diff --git a/ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/datamodel/ImageFile.java b/ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/datamodel/ImageFile.java
similarity index 100%
rename from ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/datamodel/ImageFile.java
rename to ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/datamodel/ImageFile.java
diff --git a/ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/datamodel/VideoFile.java b/ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/datamodel/VideoFile.java
similarity index 100%
rename from ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/datamodel/VideoFile.java
rename to ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/datamodel/VideoFile.java
diff --git a/ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/grouping/DrawableGroup.java b/ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/grouping/DrawableGroup.java
similarity index 93%
rename from ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/grouping/DrawableGroup.java
rename to ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/grouping/DrawableGroup.java
index 5f3143a861f43a8c3eeb7a4b34c413276a498a7e..cd73293563d1880c21537fe1ea97d8df04d21997 100644
--- a/ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/grouping/DrawableGroup.java
+++ b/ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/grouping/DrawableGroup.java
@@ -24,7 +24,7 @@
import javafx.collections.FXCollections;
import javafx.collections.ObservableList;
import org.sleuthkit.autopsy.coreutils.Logger;
-import org.sleuthkit.autopsy.imageanalyzer.ImageAnalyzerController;
+import org.sleuthkit.autopsy.imageanalyzer.ImageGalleryController;
import org.sleuthkit.datamodel.BlackboardArtifact;
import org.sleuthkit.datamodel.TskCoreException;
@@ -71,7 +71,7 @@ synchronized public int getFilesWithHashSetHitsCount() {
filesWithHashSetHitsCount = 0;
for (Long fileID : fileIds()) {
try {
- long artcount = ImageAnalyzerController.getDefault().getSleuthKitCase().getBlackboardArtifactsCount(BlackboardArtifact.ARTIFACT_TYPE.TSK_HASHSET_HIT, fileID);
+ long artcount = ImageGalleryController.getDefault().getSleuthKitCase().getBlackboardArtifactsCount(BlackboardArtifact.ARTIFACT_TYPE.TSK_HASHSET_HIT, fileID);
if (artcount > 0) {
filesWithHashSetHitsCount++;
}
diff --git a/ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/grouping/GroupKey.java b/ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/grouping/GroupKey.java
similarity index 100%
rename from ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/grouping/GroupKey.java
rename to ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/grouping/GroupKey.java
diff --git a/ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/grouping/GroupManager.java b/ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/grouping/GroupManager.java
similarity index 97%
rename from ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/grouping/GroupManager.java
rename to ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/grouping/GroupManager.java
index e86d9c1fd03e075c3400626bab8e410b06929440..f1ea74c1b15b35139b6aa721d5669d2865a42011 100644
--- a/ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/grouping/GroupManager.java
+++ b/ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/grouping/GroupManager.java
@@ -51,8 +51,8 @@
import org.sleuthkit.autopsy.coreutils.ThreadConfined;
import org.sleuthkit.autopsy.coreutils.ThreadConfined.ThreadType;
import org.sleuthkit.autopsy.imageanalyzer.FileUpdateEvent;
-import org.sleuthkit.autopsy.imageanalyzer.ImageAnalyzerController;
-import org.sleuthkit.autopsy.imageanalyzer.ImageAnalyzerModule;
+import org.sleuthkit.autopsy.imageanalyzer.ImageGalleryController;
+import org.sleuthkit.autopsy.imageanalyzer.ImageGalleryModule;
import org.sleuthkit.autopsy.imageanalyzer.TagUtils;
import org.sleuthkit.autopsy.imageanalyzer.datamodel.Category;
import org.sleuthkit.autopsy.imageanalyzer.datamodel.DrawableAttribute;
@@ -77,7 +77,7 @@ public class GroupManager implements FileUpdateEvent.FileUpdateListener {
private DrawableDB db;
- private final ImageAnalyzerController controller;
+ private final ImageGalleryController controller;
/**
* map from {@link GroupKey}s to {@link DrawableGroup}s. All groups (even
@@ -133,7 +133,7 @@ public ObservableList<DrawableGroup> getUnSeenGroups() {
* @param db
* @param controller
*/
- public GroupManager(ImageAnalyzerController controller) {
+ public GroupManager(ImageGalleryController controller) {
this.controller = controller;
}
@@ -371,7 +371,7 @@ private List<Long> getFileIDsWithHashSetName(String hashDbName) {
List<Long> files = new ArrayList<>();
try {
- final SleuthkitCase sleuthkitCase = ImageAnalyzerController.getDefault().getSleuthKitCase();
+ final SleuthkitCase sleuthkitCase = ImageGalleryController.getDefault().getSleuthKitCase();
String query = "SELECT obj_id FROM blackboard_attributes,blackboard_artifacts WHERE "
+ "attribute_type_id=" + BlackboardAttribute.ATTRIBUTE_TYPE.TSK_SET_NAME.getTypeID()
+ " AND blackboard_attributes.artifact_id=blackboard_artifacts.artifact_id"
@@ -384,7 +384,7 @@ private List<Long> getFileIDsWithHashSetName(String hashDbName) {
while (rs.next()) {
long id = rs.getLong("obj_id");
try {
- if (ImageAnalyzerModule.isSupportedAndNotKnown(Case.getCurrentCase().getSleuthkitCase().getAbstractFileById(id))) {
+ if (ImageGalleryModule.isSupportedAndNotKnown(Case.getCurrentCase().getSleuthkitCase().getAbstractFileById(id))) {
files.add(id);
}
} catch (TskCoreException ex) {
@@ -497,7 +497,7 @@ public List<Long> getFileIDsWithCategory(Category category) throws TskCoreExcept
for (TagName tn : tns) {
List<ContentTag> contentTags = Case.getCurrentCase().getServices().getTagsManager().getContentTagsByTagName(tn);
for (ContentTag ct : contentTags) {
- if (ct.getContent() instanceof AbstractFile && ImageAnalyzerModule.isSupportedAndNotKnown((AbstractFile) ct.getContent())) {
+ if (ct.getContent() instanceof AbstractFile && ImageGalleryModule.isSupportedAndNotKnown((AbstractFile) ct.getContent())) {
files.add(ct.getContent().getId());
}
}
@@ -509,7 +509,7 @@ public List<Long> getFileIDsWithCategory(Category category) throws TskCoreExcept
List<Long> files = new ArrayList<>();
List<ContentTag> contentTags = Case.getCurrentCase().getServices().getTagsManager().getContentTagsByTagName(category.getTagName());
for (ContentTag ct : contentTags) {
- if (ct.getContent() instanceof AbstractFile && ImageAnalyzerModule.isSupportedAndNotKnown((AbstractFile) ct.getContent())) {
+ if (ct.getContent() instanceof AbstractFile && ImageGalleryModule.isSupportedAndNotKnown((AbstractFile) ct.getContent())) {
files.add(ct.getContent().getId());
}
}
@@ -542,7 +542,7 @@ public int countFilesWithCategory(Category category) throws TskCoreException {
for (TagName tn : tns) {
List<ContentTag> contentTags = Case.getCurrentCase().getServices().getTagsManager().getContentTagsByTagName(tn);
for (ContentTag ct : contentTags) {
- if (ct.getContent() instanceof AbstractFile && ImageAnalyzerModule.isSupportedAndNotKnown((AbstractFile) ct.getContent())) {
+ if (ct.getContent() instanceof AbstractFile && ImageGalleryModule.isSupportedAndNotKnown((AbstractFile) ct.getContent())) {
allOtherCatCount++;
}
}
@@ -553,7 +553,7 @@ public int countFilesWithCategory(Category category) throws TskCoreException {
int fileCount = 0;
List<ContentTag> contentTags = Case.getCurrentCase().getServices().getTagsManager().getContentTagsByTagName(category.getTagName());
for (ContentTag ct : contentTags) {
- if (ct.getContent() instanceof AbstractFile && ImageAnalyzerModule.isSupportedAndNotKnown((AbstractFile) ct.getContent())) {
+ if (ct.getContent() instanceof AbstractFile && ImageGalleryModule.isSupportedAndNotKnown((AbstractFile) ct.getContent())) {
fileCount++;
}
}
@@ -572,7 +572,7 @@ public List<Long> getFileIDsWithTag(TagName tagName) throws TskCoreException {
List<Long> files = new ArrayList<>();
List<ContentTag> contentTags = Case.getCurrentCase().getServices().getTagsManager().getContentTagsByTagName(tagName);
for (ContentTag ct : contentTags) {
- if (ct.getContent() instanceof AbstractFile && ImageAnalyzerModule.isSupportedAndNotKnown((AbstractFile) ct.getContent())) {
+ if (ct.getContent() instanceof AbstractFile && ImageGalleryModule.isSupportedAndNotKnown((AbstractFile) ct.getContent())) {
files.add(ct.getContent().getId());
}
}
diff --git a/ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/grouping/GroupSortBy.java b/ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/grouping/GroupSortBy.java
similarity index 90%
rename from ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/grouping/GroupSortBy.java
rename to ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/grouping/GroupSortBy.java
index ee7010d07e9a22cd1307868d7b4593ceaae9cd38..3614dd742444d2515c9435c97f8e00dfbb7d9765 100644
--- a/ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/grouping/GroupSortBy.java
+++ b/ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/grouping/GroupSortBy.java
@@ -27,7 +27,7 @@
import static javax.swing.SortOrder.ASCENDING;
import static javax.swing.SortOrder.DESCENDING;
import org.apache.commons.lang3.StringUtils;
-import org.sleuthkit.autopsy.imageanalyzer.ImageAnalyzerController;
+import org.sleuthkit.autopsy.imageanalyzer.ImageGalleryController;
import org.sleuthkit.autopsy.imageanalyzer.datamodel.DrawableAttribute;
/**
@@ -50,8 +50,8 @@ public Comparator<DrawableGroup> getGrpComparator(final SortOrder sortOrder) {
@Override
public <A extends Comparable<A>> Comparator<A> getValueComparator(final DrawableAttribute<A> attr, final SortOrder sortOrder) {
return (A v1, A v2) -> {
- DrawableGroup g1 = ImageAnalyzerController.getDefault().getGroupManager().getGroupForKey(new GroupKey<A>(attr, v1));
- DrawableGroup g2 = ImageAnalyzerController.getDefault().getGroupManager().getGroupForKey(new GroupKey<A>(attr, v2));
+ DrawableGroup g1 = ImageGalleryController.getDefault().getGroupManager().getGroupForKey(new GroupKey<A>(attr, v1));
+ DrawableGroup g2 = ImageGalleryController.getDefault().getGroupManager().getGroupForKey(new GroupKey<A>(attr, v2));
return getGrpComparator(sortOrder).compare(g1, g2);
};
}
@@ -102,8 +102,8 @@ public Comparator<DrawableGroup> getGrpComparator(SortOrder sortOrder) {
@Override
public <A extends Comparable<A>> Comparator<A> getValueComparator(DrawableAttribute<A> attr, SortOrder sortOrder) {
return (A v1, A v2) -> {
- DrawableGroup g1 = ImageAnalyzerController.getDefault().getGroupManager().getGroupForKey(new GroupKey<A>(attr, v1));
- DrawableGroup g2 = ImageAnalyzerController.getDefault().getGroupManager().getGroupForKey(new GroupKey<A>(attr, v2));
+ DrawableGroup g1 = ImageGalleryController.getDefault().getGroupManager().getGroupForKey(new GroupKey<A>(attr, v1));
+ DrawableGroup g2 = ImageGalleryController.getDefault().getGroupManager().getGroupForKey(new GroupKey<A>(attr, v2));
return getGrpComparator(sortOrder).compare(g1, g2);
};
diff --git a/ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/grouping/GroupViewMode.java b/ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/grouping/GroupViewMode.java
similarity index 100%
rename from ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/grouping/GroupViewMode.java
rename to ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/grouping/GroupViewMode.java
diff --git a/ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/grouping/GroupViewState.java b/ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/grouping/GroupViewState.java
similarity index 100%
rename from ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/grouping/GroupViewState.java
rename to ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/grouping/GroupViewState.java
diff --git a/ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/gui/AttributeListCell.java b/ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/gui/AttributeListCell.java
similarity index 100%
rename from ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/gui/AttributeListCell.java
rename to ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/gui/AttributeListCell.java
diff --git a/ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/gui/DrawableTile.fxml b/ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/gui/DrawableTile.fxml
similarity index 100%
rename from ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/gui/DrawableTile.fxml
rename to ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/gui/DrawableTile.fxml
diff --git a/ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/gui/DrawableTile.java b/ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/gui/DrawableTile.java
similarity index 100%
rename from ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/gui/DrawableTile.java
rename to ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/gui/DrawableTile.java
diff --git a/ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/gui/DrawableView.java b/ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/gui/DrawableView.java
similarity index 100%
rename from ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/gui/DrawableView.java
rename to ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/gui/DrawableView.java
diff --git a/ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/gui/GroupPane.fxml b/ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/gui/GroupPane.fxml
similarity index 100%
rename from ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/gui/GroupPane.fxml
rename to ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/gui/GroupPane.fxml
diff --git a/ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/gui/GroupPane.java b/ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/gui/GroupPane.java
similarity index 99%
rename from ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/gui/GroupPane.java
rename to ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/gui/GroupPane.java
index 5438ead955f5573962c2d6edbd9cd49a23015013..ce217a8db43b3e76cf2ec2aceeb43a9efd8d9b23 100644
--- a/ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/gui/GroupPane.java
+++ b/ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/gui/GroupPane.java
@@ -101,8 +101,8 @@
import org.sleuthkit.autopsy.directorytree.ExtractAction;
import org.sleuthkit.autopsy.imageanalyzer.FXMLConstructor;
import org.sleuthkit.autopsy.imageanalyzer.FileIDSelectionModel;
-import org.sleuthkit.autopsy.imageanalyzer.ImageAnalyzerController;
-import org.sleuthkit.autopsy.imageanalyzer.ImageAnalyzerTopComponent;
+import org.sleuthkit.autopsy.imageanalyzer.ImageGalleryController;
+import org.sleuthkit.autopsy.imageanalyzer.ImageGalleryTopComponent;
import org.sleuthkit.autopsy.imageanalyzer.TagUtils;
import org.sleuthkit.autopsy.imageanalyzer.actions.AddDrawableTagAction;
import org.sleuthkit.autopsy.imageanalyzer.actions.Back;
@@ -190,7 +190,7 @@ public class GroupPane extends BorderPane implements GroupView {
private final NextUnseenGroup nextGroupAction;
- private final ImageAnalyzerController controller;
+ private final ImageGalleryController controller;
private ContextMenu contextMenu;
@@ -215,7 +215,7 @@ public class GroupPane extends BorderPane implements GroupView {
@ThreadConfined(type = ThreadType.UI)
private final Map<Long, DrawableCell> cellMap = new HashMap<>();
- public GroupPane(ImageAnalyzerController controller) {
+ public GroupPane(ImageGalleryController controller) {
this.controller = controller;
nextGroupAction = new NextUnseenGroup(controller);
backAction = new Back(controller);
@@ -483,7 +483,7 @@ private ContextMenu buildContextMenu() {
final MenuItem extractMenuItem = new MenuItem("Extract File(s)");
extractMenuItem.setOnAction((ActionEvent t) -> {
SwingUtilities.invokeLater(() -> {
- TopComponent etc = WindowManager.getDefault().findTopComponent(ImageAnalyzerTopComponent.PREFERRED_ID);
+ TopComponent etc = WindowManager.getDefault().findTopComponent(ImageGalleryTopComponent.PREFERRED_ID);
ExtractAction.getInstance().actionPerformed(new java.awt.event.ActionEvent(etc, 0, null));
});
});
diff --git a/ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/gui/GroupView.java b/ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/gui/GroupView.java
similarity index 100%
rename from ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/gui/GroupView.java
rename to ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/gui/GroupView.java
diff --git a/ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/gui/MediaControl.fxml b/ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/gui/MediaControl.fxml
similarity index 100%
rename from ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/gui/MediaControl.fxml
rename to ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/gui/MediaControl.fxml
diff --git a/ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/gui/MediaControl.java b/ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/gui/MediaControl.java
similarity index 100%
rename from ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/gui/MediaControl.java
rename to ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/gui/MediaControl.java
diff --git a/ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/gui/MetaDataPane.fxml b/ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/gui/MetaDataPane.fxml
similarity index 100%
rename from ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/gui/MetaDataPane.fxml
rename to ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/gui/MetaDataPane.fxml
diff --git a/ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/gui/MetaDataPane.java b/ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/gui/MetaDataPane.java
similarity index 97%
rename from ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/gui/MetaDataPane.java
rename to ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/gui/MetaDataPane.java
index a062ce00ffe9d0878b5e86ac39e378401829f030..316b77006bf57a000ffc352e23b2beef1f5b5eb5 100644
--- a/ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/gui/MetaDataPane.java
+++ b/ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/gui/MetaDataPane.java
@@ -48,7 +48,7 @@
import org.apache.commons.lang3.StringUtils;
import org.openide.util.Exceptions;
import org.sleuthkit.autopsy.coreutils.Logger;
-import org.sleuthkit.autopsy.imageanalyzer.ImageAnalyzerController;
+import org.sleuthkit.autopsy.imageanalyzer.ImageGalleryController;
import org.sleuthkit.autopsy.imageanalyzer.TagUtils;
import org.sleuthkit.autopsy.imageanalyzer.datamodel.Category;
import org.sleuthkit.autopsy.imageanalyzer.datamodel.DrawableAttribute;
@@ -63,7 +63,7 @@ public class MetaDataPane extends AnchorPane implements Category.CategoryListene
private static final Logger LOGGER = Logger.getLogger(MetaDataPane.class.getName());
- private final ImageAnalyzerController controller;
+ private final ImageGalleryController controller;
private Long fileID;
@@ -205,7 +205,7 @@ public void changed(ObservableValue<? extends Category> ov, Category t, final Ca
}
}
- public MetaDataPane(ImageAnalyzerController controller) {
+ public MetaDataPane(ImageGalleryController controller) {
this.controller = controller;
FXMLLoader fxmlLoader = new FXMLLoader(getClass().getResource("MetaDataPane.fxml"));
diff --git a/ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/gui/NoGroupsDialog.fxml b/ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/gui/NoGroupsDialog.fxml
similarity index 100%
rename from ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/gui/NoGroupsDialog.fxml
rename to ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/gui/NoGroupsDialog.fxml
diff --git a/ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/gui/NoGroupsDialog.java b/ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/gui/NoGroupsDialog.java
similarity index 100%
rename from ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/gui/NoGroupsDialog.java
rename to ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/gui/NoGroupsDialog.java
diff --git a/ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/gui/SingleDrawableViewBase.java b/ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/gui/SingleDrawableViewBase.java
similarity index 97%
rename from ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/gui/SingleDrawableViewBase.java
rename to ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/gui/SingleDrawableViewBase.java
index dd08e1d2dd45e3464fca0a699c2bc7ce941af517..bc9caf2888533035012b6ebf2d987a4e0d3da33f 100644
--- a/ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/gui/SingleDrawableViewBase.java
+++ b/ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/gui/SingleDrawableViewBase.java
@@ -66,8 +66,8 @@
import org.sleuthkit.autopsy.directorytree.NewWindowViewAction;
import org.sleuthkit.autopsy.imageanalyzer.FileIDSelectionModel;
import org.sleuthkit.autopsy.imageanalyzer.FileUpdateEvent;
-import org.sleuthkit.autopsy.imageanalyzer.ImageAnalyzerController;
-import org.sleuthkit.autopsy.imageanalyzer.ImageAnalyzerTopComponent;
+import org.sleuthkit.autopsy.imageanalyzer.ImageGalleryController;
+import org.sleuthkit.autopsy.imageanalyzer.ImageGalleryTopComponent;
import org.sleuthkit.autopsy.imageanalyzer.TagUtils;
import org.sleuthkit.autopsy.imageanalyzer.actions.AddDrawableTagAction;
import org.sleuthkit.autopsy.imageanalyzer.actions.CategorizeAction;
@@ -204,7 +204,7 @@ private ContextMenu buildContextMenu() {
final MenuItem extractMenuItem = new MenuItem("Extract File(s)");
extractMenuItem.setOnAction((ActionEvent t) -> {
SwingUtilities.invokeLater(() -> {
- TopComponent etc = WindowManager.getDefault().findTopComponent(ImageAnalyzerTopComponent.PREFERRED_ID);
+ TopComponent etc = WindowManager.getDefault().findTopComponent(ImageGalleryTopComponent.PREFERRED_ID);
ExtractAction.getInstance().actionPerformed(new java.awt.event.ActionEvent(etc, 0, null));
});
});
@@ -267,7 +267,7 @@ protected void initialize() {
}
} else {
//TODO: convert this to an action!
- final ImageAnalyzerController controller = ImageAnalyzerController.getDefault();
+ final ImageGalleryController controller = ImageGalleryController.getDefault();
try {
// remove file from old category group
controller.getGroupManager().removeFromGroup(new GroupKey<TagName>(DrawableAttribute.TAGS, TagUtils.getFollowUpTagName()), fileID);
@@ -293,7 +293,7 @@ public DrawableFile<?> getFile() {
if (fileID != null) {
if (file == null || file.getId() != fileID) {
try {
- file = ImageAnalyzerController.getDefault().getFileFromId(fileID);
+ file = ImageGalleryController.getDefault().getFileFromId(fileID);
} catch (TskCoreException ex) {
LOGGER.log(Level.WARNING, "failed to get DrawableFile for obj_id" + fileID, ex);
return null;
diff --git a/ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/gui/SlideShow.fxml b/ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/gui/SlideShow.fxml
similarity index 100%
rename from ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/gui/SlideShow.fxml
rename to ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/gui/SlideShow.fxml
diff --git a/ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/gui/SlideShowView.java b/ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/gui/SlideShowView.java
similarity index 100%
rename from ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/gui/SlideShowView.java
rename to ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/gui/SlideShowView.java
diff --git a/ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/gui/SortByListCell.java b/ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/gui/SortByListCell.java
similarity index 100%
rename from ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/gui/SortByListCell.java
rename to ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/gui/SortByListCell.java
diff --git a/ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/gui/StatusBar.fxml b/ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/gui/StatusBar.fxml
similarity index 100%
rename from ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/gui/StatusBar.fxml
rename to ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/gui/StatusBar.fxml
diff --git a/ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/gui/StatusBar.java b/ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/gui/StatusBar.java
similarity index 93%
rename from ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/gui/StatusBar.java
rename to ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/gui/StatusBar.java
index 1c2642455112aa90165ef086c54d60cb59add0cd..fbe26df979bbafdd32ae381103979c8ffb329de8 100644
--- a/ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/gui/StatusBar.java
+++ b/ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/gui/StatusBar.java
@@ -28,14 +28,14 @@
import javafx.scene.control.ProgressBar;
import javafx.scene.control.Tooltip;
import javafx.scene.layout.AnchorPane;
-import org.sleuthkit.autopsy.imageanalyzer.ImageAnalyzerController;
+import org.sleuthkit.autopsy.imageanalyzer.ImageGalleryController;
/**
*
*/
public class StatusBar extends AnchorPane {
- private final ImageAnalyzerController controller;
+ private final ImageGalleryController controller;
@FXML
private ResourceBundle resources;
@@ -81,12 +81,12 @@ void initialize() {
bgTaskProgressBar.progressProperty().bind(controller.regroupProgress());
Platform.runLater(() -> {
- staleLabel.setTooltip(new Tooltip("Some data may be out of date. Enable listening to ingest in Tools | Options | Image /Video Analyzer , after ingest is complete to update."));
+ staleLabel.setTooltip(new Tooltip("Some data may be out of date. Enable listening to ingest in Tools | Options | Image /Video Gallery , after ingest is complete to update."));
});
staleLabel.visibleProperty().bind(controller.stale());
}
- public StatusBar(ImageAnalyzerController controller) {
+ public StatusBar(ImageGalleryController controller) {
this.controller = controller;
FXMLLoader fxmlLoader = new FXMLLoader(getClass().getResource("StatusBar.fxml"));
fxmlLoader.setRoot(this);
diff --git a/ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/gui/SummaryTablePane.fxml b/ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/gui/SummaryTablePane.fxml
similarity index 100%
rename from ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/gui/SummaryTablePane.fxml
rename to ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/gui/SummaryTablePane.fxml
diff --git a/ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/gui/SummaryTablePane.java b/ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/gui/SummaryTablePane.java
similarity index 95%
rename from ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/gui/SummaryTablePane.java
rename to ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/gui/SummaryTablePane.java
index d08cfff79eaef7ad54642055ab6b1d2690a5ff0d..7162a448544459f9382998c52579e846cb7ae44d 100644
--- a/ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/gui/SummaryTablePane.java
+++ b/ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/gui/SummaryTablePane.java
@@ -37,7 +37,7 @@
import org.openide.util.Exceptions;
import org.sleuthkit.autopsy.casemodule.Case;
import org.sleuthkit.autopsy.imageanalyzer.FXMLConstructor;
-import org.sleuthkit.autopsy.imageanalyzer.ImageAnalyzerController;
+import org.sleuthkit.autopsy.imageanalyzer.ImageGalleryController;
import org.sleuthkit.autopsy.imageanalyzer.datamodel.Category;
import org.sleuthkit.datamodel.TskCoreException;
@@ -109,7 +109,7 @@ public void handleCategoryChanged(Collection<Long> ids) {
for (Category cat : Category.values()) {
try {
- data.add(new Pair<>(cat, ImageAnalyzerController.getDefault().getGroupManager().countFilesWithCategory(cat)));
+ data.add(new Pair<>(cat, ImageGalleryController.getDefault().getGroupManager().countFilesWithCategory(cat)));
} catch (TskCoreException ex) {
Exceptions.printStackTrace(ex);
}
diff --git a/ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/gui/Toolbar.fxml b/ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/gui/Toolbar.fxml
similarity index 100%
rename from ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/gui/Toolbar.fxml
rename to ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/gui/Toolbar.fxml
diff --git a/ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/gui/Toolbar.java b/ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/gui/Toolbar.java
similarity index 96%
rename from ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/gui/Toolbar.java
rename to ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/gui/Toolbar.java
index 88630a926738e40604e3a555f3c6b43e7d349b57..82440db86693c3f4410ab7b2cd86f0720b328d97 100644
--- a/ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/gui/Toolbar.java
+++ b/ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/gui/Toolbar.java
@@ -45,7 +45,7 @@
import org.sleuthkit.autopsy.imageanalyzer.FXMLConstructor;
import org.sleuthkit.autopsy.imageanalyzer.FileIDSelectionModel;
import org.sleuthkit.autopsy.imageanalyzer.ThumbnailCache;
-import org.sleuthkit.autopsy.imageanalyzer.ImageAnalyzerController;
+import org.sleuthkit.autopsy.imageanalyzer.ImageGalleryController;
import org.sleuthkit.autopsy.imageanalyzer.TagUtils;
import org.sleuthkit.autopsy.imageanalyzer.datamodel.Category;
import org.sleuthkit.autopsy.imageanalyzer.datamodel.DrawableAttribute;
@@ -109,7 +109,7 @@ public class Toolbar extends ToolBar {
orderProperty.set(SortOrder.DESCENDING);
}
- ImageAnalyzerController.getDefault().getGroupManager().regroup(groupByBox.getSelectionModel().getSelectedItem(), sortByBox.getSelectionModel().getSelectedItem(), getSortOrder(), false);
+ ImageGalleryController.getDefault().getGroupManager().regroup(groupByBox.getSelectionModel().getSelectedItem(), sortByBox.getSelectionModel().getSelectedItem(), getSortOrder(), false);
};
synchronized public SortOrder getSortOrder() {
@@ -192,7 +192,7 @@ void initialize() {
groupByBox.setItems(FXCollections.observableList(DrawableAttribute.getGroupableAttrs()));
groupByBox.getSelectionModel().select(DrawableAttribute.PATH);
groupByBox.getSelectionModel().selectedItemProperty().addListener(queryInvalidationListener);
- groupByBox.disableProperty().bind(ImageAnalyzerController.getDefault().regroupDisabled());
+ groupByBox.disableProperty().bind(ImageGalleryController.getDefault().regroupDisabled());
groupByBox.setCellFactory((listView) -> new AttributeListCell());
groupByBox.setButtonCell(new AttributeListCell());
diff --git a/ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/gui/navpanel/GroupTreeCell.java b/ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/gui/navpanel/GroupTreeCell.java
similarity index 100%
rename from ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/gui/navpanel/GroupTreeCell.java
rename to ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/gui/navpanel/GroupTreeCell.java
diff --git a/ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/gui/navpanel/GroupTreeItem.java b/ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/gui/navpanel/GroupTreeItem.java
similarity index 100%
rename from ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/gui/navpanel/GroupTreeItem.java
rename to ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/gui/navpanel/GroupTreeItem.java
diff --git a/ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/gui/navpanel/NavPanel.fxml b/ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/gui/navpanel/NavPanel.fxml
similarity index 100%
rename from ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/gui/navpanel/NavPanel.fxml
rename to ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/gui/navpanel/NavPanel.fxml
diff --git a/ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/gui/navpanel/NavPanel.java b/ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/gui/navpanel/NavPanel.java
similarity index 98%
rename from ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/gui/navpanel/NavPanel.java
rename to ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/gui/navpanel/NavPanel.java
index 86300211f15d600ea2cac91098edb79ef06c1c1f..a18b7617f1d1d273ede9a1d4e2140456280fa0a9 100644
--- a/ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/gui/navpanel/NavPanel.java
+++ b/ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/gui/navpanel/NavPanel.java
@@ -43,7 +43,7 @@
import org.apache.commons.lang3.StringUtils;
import org.openide.util.Exceptions;
import org.sleuthkit.autopsy.imageanalyzer.FXMLConstructor;
-import org.sleuthkit.autopsy.imageanalyzer.ImageAnalyzerController;
+import org.sleuthkit.autopsy.imageanalyzer.ImageGalleryController;
import org.sleuthkit.autopsy.imageanalyzer.datamodel.DrawableAttribute;
import org.sleuthkit.autopsy.imageanalyzer.datamodel.DrawableFile;
import org.sleuthkit.autopsy.imageanalyzer.grouping.DrawableGroup;
@@ -98,9 +98,9 @@ public class NavPanel extends TabPane {
private GroupTreeItem hashTreeRoot;
- private final ImageAnalyzerController controller;
+ private final ImageGalleryController controller;
- public NavPanel(ImageAnalyzerController controller) {
+ public NavPanel(ImageGalleryController controller) {
this.controller = controller;
FXMLConstructor.construct(this, "NavPanel.fxml");
}
diff --git a/ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/gui/navpanel/TreeNode.java b/ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/gui/navpanel/TreeNode.java
similarity index 100%
rename from ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/gui/navpanel/TreeNode.java
rename to ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/gui/navpanel/TreeNode.java
diff --git a/ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/gui/navpanel/TreeNodeComparators.java b/ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/gui/navpanel/TreeNodeComparators.java
similarity index 100%
rename from ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/gui/navpanel/TreeNodeComparators.java
rename to ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/gui/navpanel/TreeNodeComparators.java
diff --git a/ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/images/Clapperboard.png b/ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/images/Clapperboard.png
similarity index 100%
rename from ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/images/Clapperboard.png
rename to ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/images/Clapperboard.png
diff --git a/ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/images/Folder-icon.png b/ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/images/Folder-icon.png
similarity index 100%
rename from ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/images/Folder-icon.png
rename to ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/images/Folder-icon.png
diff --git a/ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/images/TriangleDown.png b/ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/images/TriangleDown.png
similarity index 100%
rename from ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/images/TriangleDown.png
rename to ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/images/TriangleDown.png
diff --git a/ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/images/application_view_tile.png b/ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/images/application_view_tile.png
similarity index 100%
rename from ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/images/application_view_tile.png
rename to ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/images/application_view_tile.png
diff --git a/ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/images/arrow-090.png b/ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/images/arrow-090.png
similarity index 100%
rename from ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/images/arrow-090.png
rename to ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/images/arrow-090.png
diff --git a/ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/images/arrow-180.png b/ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/images/arrow-180.png
similarity index 100%
rename from ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/images/arrow-180.png
rename to ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/images/arrow-180.png
diff --git a/ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/images/arrow-270.png b/ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/images/arrow-270.png
similarity index 100%
rename from ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/images/arrow-270.png
rename to ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/images/arrow-270.png
diff --git a/ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/images/arrow-circle-double-135.png b/ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/images/arrow-circle-double-135.png
similarity index 100%
rename from ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/images/arrow-circle-double-135.png
rename to ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/images/arrow-circle-double-135.png
diff --git a/ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/images/arrow-circle-double.png b/ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/images/arrow-circle-double.png
similarity index 100%
rename from ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/images/arrow-circle-double.png
rename to ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/images/arrow-circle-double.png
diff --git a/ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/images/arrow-resize-090.png b/ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/images/arrow-resize-090.png
similarity index 100%
rename from ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/images/arrow-resize-090.png
rename to ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/images/arrow-resize-090.png
diff --git a/ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/images/arrow-resize.png b/ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/images/arrow-resize.png
similarity index 100%
rename from ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/images/arrow-resize.png
rename to ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/images/arrow-resize.png
diff --git a/ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/images/arrow.png b/ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/images/arrow.png
similarity index 100%
rename from ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/images/arrow.png
rename to ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/images/arrow.png
diff --git a/ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/images/arrow_down.png b/ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/images/arrow_down.png
similarity index 100%
rename from ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/images/arrow_down.png
rename to ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/images/arrow_down.png
diff --git a/ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/images/arrow_up.png b/ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/images/arrow_up.png
similarity index 100%
rename from ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/images/arrow_up.png
rename to ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/images/arrow_up.png
diff --git a/ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/images/border-bottom-double.png b/ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/images/border-bottom-double.png
similarity index 100%
rename from ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/images/border-bottom-double.png
rename to ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/images/border-bottom-double.png
diff --git a/ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/images/border-top-bottom-double.png b/ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/images/border-top-bottom-double.png
similarity index 100%
rename from ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/images/border-top-bottom-double.png
rename to ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/images/border-top-bottom-double.png
diff --git a/ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/images/bullet_arrow_down.png b/ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/images/bullet_arrow_down.png
similarity index 100%
rename from ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/images/bullet_arrow_down.png
rename to ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/images/bullet_arrow_down.png
diff --git a/ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/images/camera.png b/ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/images/camera.png
similarity index 100%
rename from ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/images/camera.png
rename to ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/images/camera.png
diff --git a/ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/images/category-icon.png b/ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/images/category-icon.png
similarity index 100%
rename from ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/images/category-icon.png
rename to ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/images/category-icon.png
diff --git a/ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/images/clock--minus.png b/ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/images/clock--minus.png
similarity index 100%
rename from ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/images/clock--minus.png
rename to ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/images/clock--minus.png
diff --git a/ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/images/clock--pencil.png b/ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/images/clock--pencil.png
similarity index 100%
rename from ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/images/clock--pencil.png
rename to ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/images/clock--pencil.png
diff --git a/ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/images/clock--plus.png b/ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/images/clock--plus.png
similarity index 100%
rename from ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/images/clock--plus.png
rename to ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/images/clock--plus.png
diff --git a/ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/images/control-double-000-small.png b/ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/images/control-double-000-small.png
similarity index 100%
rename from ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/images/control-double-000-small.png
rename to ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/images/control-double-000-small.png
diff --git a/ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/images/control-double-090-small.png b/ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/images/control-double-090-small.png
similarity index 100%
rename from ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/images/control-double-090-small.png
rename to ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/images/control-double-090-small.png
diff --git a/ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/images/control-double-090.png b/ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/images/control-double-090.png
similarity index 100%
rename from ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/images/control-double-090.png
rename to ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/images/control-double-090.png
diff --git a/ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/images/control-double-180-small.png b/ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/images/control-double-180-small.png
similarity index 100%
rename from ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/images/control-double-180-small.png
rename to ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/images/control-double-180-small.png
diff --git a/ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/images/control-double-180.png b/ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/images/control-double-180.png
similarity index 100%
rename from ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/images/control-double-180.png
rename to ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/images/control-double-180.png
diff --git a/ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/images/control-double-270-small.png b/ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/images/control-double-270-small.png
similarity index 100%
rename from ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/images/control-double-270-small.png
rename to ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/images/control-double-270-small.png
diff --git a/ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/images/control-double-270.png b/ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/images/control-double-270.png
similarity index 100%
rename from ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/images/control-double-270.png
rename to ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/images/control-double-270.png
diff --git a/ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/images/control-double.png b/ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/images/control-double.png
similarity index 100%
rename from ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/images/control-double.png
rename to ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/images/control-double.png
diff --git a/ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/images/film.png b/ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/images/film.png
similarity index 100%
rename from ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/images/film.png
rename to ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/images/film.png
diff --git a/ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/images/flag_gray.png b/ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/images/flag_gray.png
similarity index 100%
rename from ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/images/flag_gray.png
rename to ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/images/flag_gray.png
diff --git a/ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/images/flag_red.png b/ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/images/flag_red.png
similarity index 100%
rename from ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/images/flag_red.png
rename to ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/images/flag_red.png
diff --git a/ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/images/folder-open-image.png b/ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/images/folder-open-image.png
similarity index 100%
rename from ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/images/folder-open-image.png
rename to ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/images/folder-open-image.png
diff --git a/ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/images/folder-rename.png b/ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/images/folder-rename.png
similarity index 100%
rename from ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/images/folder-rename.png
rename to ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/images/folder-rename.png
diff --git a/ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/images/folder-tree.png b/ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/images/folder-tree.png
similarity index 100%
rename from ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/images/folder-tree.png
rename to ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/images/folder-tree.png
diff --git a/ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/images/folder.png b/ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/images/folder.png
similarity index 100%
rename from ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/images/folder.png
rename to ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/images/folder.png
diff --git a/ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/images/folder_picture.png b/ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/images/folder_picture.png
similarity index 100%
rename from ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/images/folder_picture.png
rename to ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/images/folder_picture.png
diff --git a/ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/images/folders-path.png b/ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/images/folders-path.png
similarity index 100%
rename from ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/images/folders-path.png
rename to ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/images/folders-path.png
diff --git a/ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/images/funnel.png b/ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/images/funnel.png
similarity index 100%
rename from ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/images/funnel.png
rename to ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/images/funnel.png
diff --git a/ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/images/group.png b/ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/images/group.png
similarity index 100%
rename from ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/images/group.png
rename to ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/images/group.png
diff --git a/ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/images/hashset_hits.png b/ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/images/hashset_hits.png
similarity index 100%
rename from ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/images/hashset_hits.png
rename to ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/images/hashset_hits.png
diff --git a/ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/images/information.png b/ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/images/information.png
similarity index 100%
rename from ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/images/information.png
rename to ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/images/information.png
diff --git a/ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/images/lightbulb.png b/ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/images/lightbulb.png
similarity index 100%
rename from ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/images/lightbulb.png
rename to ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/images/lightbulb.png
diff --git a/ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/images/media_controls_first_small.png b/ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/images/media_controls_first_small.png
similarity index 100%
rename from ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/images/media_controls_first_small.png
rename to ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/images/media_controls_first_small.png
diff --git a/ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/images/media_controls_forward_small.png b/ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/images/media_controls_forward_small.png
similarity index 100%
rename from ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/images/media_controls_forward_small.png
rename to ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/images/media_controls_forward_small.png
diff --git a/ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/images/media_controls_last_small.png b/ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/images/media_controls_last_small.png
similarity index 100%
rename from ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/images/media_controls_last_small.png
rename to ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/images/media_controls_last_small.png
diff --git a/ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/images/media_controls_pause_small.png b/ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/images/media_controls_pause_small.png
similarity index 100%
rename from ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/images/media_controls_pause_small.png
rename to ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/images/media_controls_pause_small.png
diff --git a/ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/images/media_controls_play_small.png b/ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/images/media_controls_play_small.png
similarity index 100%
rename from ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/images/media_controls_play_small.png
rename to ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/images/media_controls_play_small.png
diff --git a/ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/images/media_controls_rewind_small.png b/ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/images/media_controls_rewind_small.png
similarity index 100%
rename from ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/images/media_controls_rewind_small.png
rename to ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/images/media_controls_rewind_small.png
diff --git a/ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/images/media_controls_stop_small.png b/ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/images/media_controls_stop_small.png
similarity index 100%
rename from ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/images/media_controls_stop_small.png
rename to ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/images/media_controls_stop_small.png
diff --git a/ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/images/page_white_stack.png b/ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/images/page_white_stack.png
similarity index 100%
rename from ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/images/page_white_stack.png
rename to ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/images/page_white_stack.png
diff --git a/ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/images/polaroid_48_silhouette.png b/ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/images/polaroid_48_silhouette.png
similarity index 100%
rename from ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/images/polaroid_48_silhouette.png
rename to ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/images/polaroid_48_silhouette.png
diff --git a/ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/images/polaroid_green_48.png b/ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/images/polaroid_green_48.png
similarity index 100%
rename from ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/images/polaroid_green_48.png
rename to ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/images/polaroid_green_48.png
diff --git a/ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/images/polaroid_green_48_silhouette.png b/ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/images/polaroid_green_48_silhouette.png
similarity index 100%
rename from ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/images/polaroid_green_48_silhouette.png
rename to ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/images/polaroid_green_48_silhouette.png
diff --git a/ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/images/prohibition.png b/ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/images/prohibition.png
similarity index 100%
rename from ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/images/prohibition.png
rename to ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/images/prohibition.png
diff --git a/ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/images/right arrow.png b/ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/images/right arrow.png
similarity index 100%
rename from ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/images/right arrow.png
rename to ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/images/right arrow.png
diff --git a/ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/images/right_arrow_128.png b/ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/images/right_arrow_128.png
similarity index 100%
rename from ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/images/right_arrow_128.png
rename to ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/images/right_arrow_128.png
diff --git a/ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/images/shape_group.png b/ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/images/shape_group.png
similarity index 100%
rename from ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/images/shape_group.png
rename to ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/images/shape_group.png
diff --git a/ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/images/slide.png b/ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/images/slide.png
similarity index 100%
rename from ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/images/slide.png
rename to ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/images/slide.png
diff --git a/ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/images/speaker-volume-control-mute.png b/ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/images/speaker-volume-control-mute.png
similarity index 100%
rename from ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/images/speaker-volume-control-mute.png
rename to ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/images/speaker-volume-control-mute.png
diff --git a/ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/images/speaker-volume-control-up.png b/ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/images/speaker-volume-control-up.png
similarity index 100%
rename from ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/images/speaker-volume-control-up.png
rename to ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/images/speaker-volume-control-up.png
diff --git a/ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/images/speaker-volume-control.png b/ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/images/speaker-volume-control.png
similarity index 100%
rename from ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/images/speaker-volume-control.png
rename to ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/images/speaker-volume-control.png
diff --git a/ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/images/speaker-volume-low.png b/ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/images/speaker-volume-low.png
similarity index 100%
rename from ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/images/speaker-volume-low.png
rename to ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/images/speaker-volume-low.png
diff --git a/ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/images/speaker-volume-none.png b/ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/images/speaker-volume-none.png
similarity index 100%
rename from ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/images/speaker-volume-none.png
rename to ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/images/speaker-volume-none.png
diff --git a/ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/images/speaker-volume.png b/ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/images/speaker-volume.png
similarity index 100%
rename from ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/images/speaker-volume.png
rename to ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/images/speaker-volume.png
diff --git a/ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/images/tag_red.png b/ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/images/tag_red.png
similarity index 100%
rename from ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/images/tag_red.png
rename to ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/images/tag_red.png
diff --git a/ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/images/video-file.png b/ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/images/video-file.png
similarity index 100%
rename from ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/images/video-file.png
rename to ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/images/video-file.png
diff --git a/ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/license-imageanalyzer.txt b/ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/license-imageanalyzer.txt
similarity index 100%
rename from ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/license-imageanalyzer.txt
rename to ImageGallery/src/org/sleuthkit/autopsy/imageanalyzer/license-imageanalyzer.txt
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 382c85be129c04897e74306ca0ae51b242f8e2e1..4a16942aff1ad205f59ebd4c6917138dbd15f06c 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, 19 Feb 2015 12:52:00 -0500
+#Mon, 23 Mar 2015 09:15:22 -0400
LBL_splash_window_title=Starting Autopsy
SPLASH_HEIGHT=314
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 e009acc2acdb76faea6227c2e6eb17a62d5a4ff6..f759739c3fbcd92f18c4147cba2070d6f5ff20f0 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, 19 Feb 2015 12:52:00 -0500
+#Mon, 23 Mar 2015 09:15:22 -0400
CTL_MainWindow_Title=Autopsy 3.1.2
CTL_MainWindow_Title_No_Project=Autopsy 3.1.2
diff --git a/nbproject/platform.properties b/nbproject/platform.properties
index 1554e42acf35e58b29fd8a5465b2ae028a17ed02..efc5be94a4df116cb991fdc672ed3a5b6713014a 100644
--- a/nbproject/platform.properties
+++ b/nbproject/platform.properties
@@ -1,4 +1,5 @@
branding.token=autopsy
+nbjdk.active=jdk_1.8.0_20
# Version of platform that is automatically downloaded
# Note build.xml has similar definitions that should be kept in sync (manually)
netbeans-plat-version=7.3.1
@@ -13,111 +14,5 @@ cluster.path=\
${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
+ org.netbeans.modules.junit
diff --git a/nbproject/project.properties b/nbproject/project.properties
index de529c07a2199fd6bcf5a9db9915a4bc8f837473..9aae8bc5b0e206edc511f2af32a2750fc26e6a35 100644
--- a/nbproject/project.properties
+++ b/nbproject/project.properties
@@ -10,6 +10,7 @@ app.version=3.1.2
#build.type=RELEASE
build.type=DEVELOPMENT
+project.org.sleuthkit.autopsy.imageanalyzer=ImageGallery
update_versions=false
#custom JVM options
#Note: can be higher on 64 bit systems, should be in sync with build.xml
@@ -27,7 +28,8 @@ modules=\
${project.org.sleuthkit.autopsy.testing}:\
${project.org.sleuthkit.autopsy.thunderbirdparser}:\
${project.org.sleuthkit.autopsy.core}:\
- ${project.org.sleuthkit.autopsy.corelibs}
+ ${project.org.sleuthkit.autopsy.corelibs}:\
+ ${project.org.sleuthkit.autopsy.imageanalyzer}
project.org.sleuthkit.autopsy.core=Core
project.org.sleuthkit.autopsy.corelibs=CoreLibs
project.org.sleuthkit.autopsy.keywordsearch=KeywordSearch