mstoeck3/autopsy-flatpak
1
0
Fork 0
mirror of https://github.com/overcuriousity/autopsy-flatpak.git synced 2025-07-06 21:00:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'keyword-search-prototype' of https://github.com/sleuthkit/autopsy into keyword-search-prototype

Browse Source
This commit is contained in:
adam-m 2012-01-10 17:16:10 -05:00
commit bcb23023f0
6 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CoreUtils/nbproject/genfiles.properties
View File

@ -1,8 +1,8 @@
build.xml.data.CRC32=9654457e build.xml.data.CRC32=53a3cee0
build.xml.script.CRC32=b3e56256 build.xml.script.CRC32=b3e56256
build.xml.stylesheet.CRC32=a56c6a5b@2.47.1 build.xml.stylesheet.CRC32=a56c6a5b@1.46.2
# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml. # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you. # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
nbproject/build-impl.xml.data.CRC32=9654457e nbproject/build-impl.xml.data.CRC32=53a3cee0
nbproject/build-impl.xml.script.CRC32=849ea2ba nbproject/build-impl.xml.script.CRC32=849ea2ba
nbproject/build-impl.xml.stylesheet.CRC32=238281d1@2.47.1 nbproject/build-impl.xml.stylesheet.CRC32=238281d1@1.46.2

10
CoreUtils/nbproject/project.xml
View File

@ -20,7 +20,7 @@
<build-prerequisite/> <build-prerequisite/>
<compile-dependency/> <compile-dependency/>
<run-dependency> <run-dependency>
<specification-version>7.39.1</specification-version> <specification-version>7.31.1</specification-version>
</run-dependency> </run-dependency>
</dependency> </dependency>
<dependency> <dependency>
@ -28,7 +28,7 @@
<build-prerequisite/> <build-prerequisite/>
<compile-dependency/> <compile-dependency/>
<run-dependency> <run-dependency>
<specification-version>7.23.1</specification-version> <specification-version>7.20.1</specification-version>
</run-dependency> </run-dependency>
</dependency> </dependency>
<dependency> <dependency>
@ -36,7 +36,7 @@
<build-prerequisite/> <build-prerequisite/>
<compile-dependency/> <compile-dependency/>
<run-dependency> <run-dependency>
<specification-version>7.27.1</specification-version> <specification-version>7.23.1</specification-version>
</run-dependency> </run-dependency>
</dependency> </dependency>
<dependency> <dependency>
@ -44,7 +44,7 @@
<build-prerequisite/> <build-prerequisite/>
<compile-dependency/> <compile-dependency/>
<run-dependency> <run-dependency>
<specification-version>8.19.1</specification-version> <specification-version>8.15.1</specification-version>
</run-dependency> </run-dependency>
</dependency> </dependency>
<dependency> <dependency>
@ -52,7 +52,7 @@
<build-prerequisite/> <build-prerequisite/>
<compile-dependency/> <compile-dependency/>
<run-dependency> <run-dependency>
<specification-version>8.11.1</specification-version> <specification-version>8.8.1</specification-version>
</run-dependency> </run-dependency>
</dependency> </dependency>
</module-dependencies> </module-dependencies>

2
CoreUtils/src/org/sleuthkit/autopsy/coreutils/AutopsyPropFile.java
View File

@ -109,7 +109,7 @@ public class AutopsyPropFile {
} }
public void removeProperty(String key){ public void removeProperty(String key){
properties.setProperty(key, ""); properties.setProperty(key, null);
try { try {
storeProperties(); storeProperties();
} catch (Exception ex) { } catch (Exception ex) {

2
DirectoryTree/src/org/sleuthkit/autopsy/directorytree/DataResultFilterNode.java
View File

@ -109,7 +109,7 @@ public class DataResultFilterNode extends FilterNode{
public List<Action> visit(File f) { public List<Action> visit(File f) {
List<Action> actions = new ArrayList<Action>(); List<Action> actions = new ArrayList<Action>();
actions.add(new ExternalViewerAction("Open in External Viewer", getOriginal())); actions.add(new ExternalViewerAction("Open in External Viewer", getOriginal()));
actions.add(new ExtractAction("Extract", getOriginal())); actions.add(new ExtractAction("Extract File", getOriginal()));
return actions; return actions;
} }

5
DirectoryTree/src/org/sleuthkit/autopsy/directorytree/ExtractAction.java
View File

@ -106,6 +106,11 @@ public final class ExtractAction extends AbstractAction {
} }
ExtractFscContentVisitor.extract(fsContent, destination); ExtractFscContentVisitor.extract(fsContent, destination);
if(fsContent.isDir())
JOptionPane.showMessageDialog((Component) e.getSource(), "Directory extracted.");
else if(fsContent.isFile()){
JOptionPane.showMessageDialog((Component) e.getSource(), "File extracted.");
}
} }
} }
} }

3
FileSearch/src/org/sleuthkit/autopsy/filesearch/DataResultFilterNode.java
View File

@ -60,6 +60,7 @@ public class DataResultFilterNode extends FilterNode {
@Override @Override
public Action[] visit(Directory dir) { public Action[] visit(Directory dir) {
return new Action[]{ return new Action[]{
new ExtractAction("Extract Directory", getOriginal()),
new ChangeViewAction("View", 0, getOriginal()), new ChangeViewAction("View", 0, getOriginal()),
new OpenParentFolderAction("Open Parent Directory", ContentUtils.getSystemPath(dir)) new OpenParentFolderAction("Open Parent Directory", ContentUtils.getSystemPath(dir))
}; };
@ -69,7 +70,7 @@ public class DataResultFilterNode extends FilterNode {
public Action[] visit(File f) { public Action[] visit(File f) {
return new Action[]{ return new Action[]{
new ExternalViewerAction("Open in External Viewer", getOriginal()), new ExternalViewerAction("Open in External Viewer", getOriginal()),
new ExtractAction("Extract", getOriginal()), new ExtractAction("Extract File", getOriginal()),
new ChangeViewAction("View", 0, getOriginal()), new ChangeViewAction("View", 0, getOriginal()),
new OpenParentFolderAction("Open Parent Directory", ContentUtils.getSystemPath(f)) new OpenParentFolderAction("Open Parent Directory", ContentUtils.getSystemPath(f))
}; };