mirror of
https://github.com/overcuriousity/autopsy-flatpak.git
synced 2025-07-06 21:00:22 +00:00
Merge branch 'keyword-search-prototype' of https://github.com/sleuthkit/autopsy into keyword-search-prototype
This commit is contained in:
commit
bcb23023f0
@ -1,8 +1,8 @@
|
||||
build.xml.data.CRC32=9654457e
|
||||
build.xml.data.CRC32=53a3cee0
|
||||
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.
|
||||
# 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.stylesheet.CRC32=238281d1@2.47.1
|
||||
nbproject/build-impl.xml.stylesheet.CRC32=238281d1@1.46.2
|
||||
|
@ -20,7 +20,7 @@
|
||||
<build-prerequisite/>
|
||||
<compile-dependency/>
|
||||
<run-dependency>
|
||||
<specification-version>7.39.1</specification-version>
|
||||
<specification-version>7.31.1</specification-version>
|
||||
</run-dependency>
|
||||
</dependency>
|
||||
<dependency>
|
||||
@ -28,7 +28,7 @@
|
||||
<build-prerequisite/>
|
||||
<compile-dependency/>
|
||||
<run-dependency>
|
||||
<specification-version>7.23.1</specification-version>
|
||||
<specification-version>7.20.1</specification-version>
|
||||
</run-dependency>
|
||||
</dependency>
|
||||
<dependency>
|
||||
@ -36,7 +36,7 @@
|
||||
<build-prerequisite/>
|
||||
<compile-dependency/>
|
||||
<run-dependency>
|
||||
<specification-version>7.27.1</specification-version>
|
||||
<specification-version>7.23.1</specification-version>
|
||||
</run-dependency>
|
||||
</dependency>
|
||||
<dependency>
|
||||
@ -44,7 +44,7 @@
|
||||
<build-prerequisite/>
|
||||
<compile-dependency/>
|
||||
<run-dependency>
|
||||
<specification-version>8.19.1</specification-version>
|
||||
<specification-version>8.15.1</specification-version>
|
||||
</run-dependency>
|
||||
</dependency>
|
||||
<dependency>
|
||||
@ -52,7 +52,7 @@
|
||||
<build-prerequisite/>
|
||||
<compile-dependency/>
|
||||
<run-dependency>
|
||||
<specification-version>8.11.1</specification-version>
|
||||
<specification-version>8.8.1</specification-version>
|
||||
</run-dependency>
|
||||
</dependency>
|
||||
</module-dependencies>
|
||||
|
@ -109,7 +109,7 @@ public class AutopsyPropFile {
|
||||
}
|
||||
|
||||
public void removeProperty(String key){
|
||||
properties.setProperty(key, "");
|
||||
properties.setProperty(key, null);
|
||||
try {
|
||||
storeProperties();
|
||||
} catch (Exception ex) {
|
||||
|
@ -109,7 +109,7 @@ public class DataResultFilterNode extends FilterNode{
|
||||
public List<Action> visit(File f) {
|
||||
List<Action> actions = new ArrayList<Action>();
|
||||
actions.add(new ExternalViewerAction("Open in External Viewer", getOriginal()));
|
||||
actions.add(new ExtractAction("Extract", getOriginal()));
|
||||
actions.add(new ExtractAction("Extract File", getOriginal()));
|
||||
return actions;
|
||||
}
|
||||
|
||||
|
@ -106,6 +106,11 @@ public final class ExtractAction extends AbstractAction {
|
||||
}
|
||||
|
||||
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.");
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -60,6 +60,7 @@ public class DataResultFilterNode extends FilterNode {
|
||||
@Override
|
||||
public Action[] visit(Directory dir) {
|
||||
return new Action[]{
|
||||
new ExtractAction("Extract Directory", getOriginal()),
|
||||
new ChangeViewAction("View", 0, getOriginal()),
|
||||
new OpenParentFolderAction("Open Parent Directory", ContentUtils.getSystemPath(dir))
|
||||
};
|
||||
@ -69,7 +70,7 @@ public class DataResultFilterNode extends FilterNode {
|
||||
public Action[] visit(File f) {
|
||||
return new Action[]{
|
||||
new ExternalViewerAction("Open in External Viewer", getOriginal()),
|
||||
new ExtractAction("Extract", getOriginal()),
|
||||
new ExtractAction("Extract File", getOriginal()),
|
||||
new ChangeViewAction("View", 0, getOriginal()),
|
||||
new OpenParentFolderAction("Open Parent Directory", ContentUtils.getSystemPath(f))
|
||||
};
|
||||
|
Loading…
x
Reference in New Issue
Block a user