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

Merge branch 'master' of https://github.com/sleuthkit/autopsy

Browse Source
This commit is contained in:
adam-m 2013-03-20 19:29:53 -04:00
commit eccd71ee66
28 changed files with 70 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Core/manifest.mf
View File

@ -2,7 +2,7 @@ Manifest-Version: 1.0
OpenIDE-Module: org.sleuthkit.autopsy.core/7
OpenIDE-Module-Localizing-Bundle: org/sleuthkit/autopsy/core/Bundle.properties
OpenIDE-Module-Layer: org/sleuthkit/autopsy/core/layer.xml
OpenIDE-Module-Implementation-Version: 6
OpenIDE-Module-Implementation-Version: 7
OpenIDE-Module-Requires: org.openide.windows.WindowManager, org.netbeans.api.javahelp.Help
AutoUpdate-Show-In-Client: true
AutoUpdate-Essential-Module: true

2
Core/nbproject/project.properties
View File

@ -6,5 +6,5 @@ license.file=../LICENSE-2.0.txt
nbm.homepage=http://www.sleuthkit.org/
nbm.module.author=Brian Carrier
nbm.needs.restart=true
spec.version.base=5.1
spec.version.base=5.2

30
Core/src/org/sleuthkit/autopsy/corecomponents/AbstractDataResultViewer.java
View File

@ -30,6 +30,7 @@ import org.openide.explorer.ExplorerManager;
import org.openide.explorer.ExplorerManager.Provider;
import org.openide.nodes.Node;
import org.openide.util.Lookup;
import org.sleuthkit.autopsy.casemodule.Case;
import org.sleuthkit.autopsy.corecomponentinterfaces.DataContent;
import org.sleuthkit.autopsy.corecomponentinterfaces.DataResultViewer;
import org.sleuthkit.autopsy.coreutils.Logger;
@ -43,10 +44,9 @@ public abstract class AbstractDataResultViewer extends JPanel implements
private static final Logger logger = Logger.getLogger(AbstractDataResultViewer.class.getName());
protected transient ExplorerManager em = new ExplorerManager();
private PropertyChangeListener nodeSelListener;
/**
* Content viewer to respond to selection events
* Either the main one, or custom one if set
* Content viewer to respond to selection events Either the main one, or
* custom one if set
*/
protected DataContent contentViewer;
@ -54,17 +54,22 @@ public abstract class AbstractDataResultViewer extends JPanel implements
//DataContent is designed to return only the default viewer from lookup
//use the default one unless set otherwise
contentViewer = Lookup.getDefault().lookup(DataContent.class);
contentViewer = Lookup.getDefault().lookup(DataContent.class);
//property listener to send nodes to content viewer
nodeSelListener = new PropertyChangeListener() {
/**
* Propagates changes in the current select node from the
* DataResultViewer to the DataContentTopComponent
*/
@Override
public void propertyChange(PropertyChangeEvent evt) {
if (!Case.isCaseOpen()) {
//handle in-between condition when case is being closed
//and legacy selection events are pumped
return;
}
String changed = evt.getPropertyName();
// change that should affect view
@ -77,10 +82,10 @@ public abstract class AbstractDataResultViewer extends JPanel implements
setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
try {
Node selectedNode = getSelectedNode();
nodeSelected(selectedNode);
if (selectedNode != null) {
// there's a new/changed node to display
@ -142,10 +147,11 @@ public abstract class AbstractDataResultViewer extends JPanel implements
@Override
public void resetComponent() {
}
/**
* Called when a new node has been selected in the result viewer
* Can update the viewer, etc.
* Called when a new node has been selected in the result viewer Can update
* the viewer, etc.
*
* @param selectedNode the new node currently selected
*/
public abstract void nodeSelected(Node selectedNode);
@ -168,7 +174,7 @@ public abstract class AbstractDataResultViewer extends JPanel implements
logger.log(Level.WARNING, "Couldn't set selected nodes.", ex);
}
}
@Override
public void setContentViewer(DataContent contentViewer) {
this.contentViewer = contentViewer;

9
Core/src/org/sleuthkit/autopsy/corecomponents/DataContentViewerMedia.java
View File

@ -304,6 +304,12 @@ public class DataContentViewerMedia extends javax.swing.JPanel implements DataCo
private void showImageFx(final AbstractFile file) {
final String fileName = file.getName();
if (!Case.isCaseOpen()) {
//handle in-between condition when case is being closed
//and an image was previously selected
return;
}
// load the image
PlatformImpl.runLater(new Runnable() {
@Override
@ -363,15 +369,14 @@ public class DataContentViewerMedia extends javax.swing.JPanel implements DataCo
fxPanel.setScene(fxScene);
videoPanel.setVisible(true);
} else {
inImageMode = true;
final JFXPanel fxPanel = new JFXPanel();
fxPanel.setScene(fxScene);
//when done, join with the swing panel
EventQueue.invokeLater(new Runnable() {
@Override
public void run() {
inImageMode = true;
//remove video panels and recreate image view panel
//TODO use swing layered pane to switch between different modes
videoPanel.removeAll();

12
Core/src/org/sleuthkit/autopsy/directorytree/DirectoryTreeTopComponent.java
View File

@ -595,14 +595,18 @@ public final class DirectoryTreeTopComponent extends TopComponent implements Dat
/**
* Event handler to run when selection changed
*
*
* TODO this needs to be revised
*
*
* @param oldNodes
* @param newNodes
* @param newNodes
*/
private void respondSelection(final Node[] oldNodes, final Node[] newNodes) {
if (!Case.isCaseOpen()) {
//handle in-between condition when case is being closed
//and legacy selection events are pumped
return;
}
//this looks redundant?
// if (getSelectedNode() == null && oldNodes != null) {
// try {

15
Core/src/org/sleuthkit/autopsy/ingest/IngestManager.java
View File

@ -899,7 +899,14 @@ public class IngestManager {
logger.log(Level.SEVERE, "Error: unexpected exception from module: " + module.getName(), e);
stats.addError(module);
}
}
catch (OutOfMemoryError e) {
logger.log(Level.SEVERE, "Error: out of memory from module: " + module.getName(), e);
stats.addError(module);
}
} //end for every module
//free the internal file resource after done with every module
fileToProcess.close();
int newTotalEnqueuedFiles = fileScheduler.getFilesEnqueuedEst();
if (newTotalEnqueuedFiles > totalEnqueuedFiles) {
@ -915,7 +922,8 @@ public class IngestManager {
}
//--totalEnqueuedFiles;
} //end of this AbstractFile
} //end of for every AbstractFile
logger.log(Level.INFO, "IngestManager: Finished processing files");
return null;
}
@ -933,8 +941,7 @@ public class IngestManager {
}
logger.log(Level.INFO, PlatformUtil.getAllMemUsageInfo());
logger.log(Level.INFO, "Freeing resources post file pipeline run");
System.gc();
logger.log(Level.INFO, "Freeing jvm heap resources post file pipeline run");
System.gc();
logger.log(Level.INFO, PlatformUtil.getAllMemUsageInfo());

2
ExifParser/manifest.mf
View File

@ -1,6 +1,6 @@
Manifest-Version: 1.0
AutoUpdate-Show-In-Client: true
OpenIDE-Module: org.sleuthkit.autopsy.exifparser/3
OpenIDE-Module-Implementation-Version: 6
OpenIDE-Module-Implementation-Version: 7
OpenIDE-Module-Layer: org/sleuthkit/autopsy/exifparser/layer.xml
OpenIDE-Module-Localizing-Bundle: org/sleuthkit/autopsy/exifparser/Bundle.properties

2
ExifParser/nbproject/project.properties
View File

@ -3,4 +3,4 @@ javac.compilerargs=-Xlint -Xlint:-serial
license.file=../LICENSE-2.0.txt
nbm.homepage=http://www.sleuthkit.org/autopsy/
nbm.needs.restart=true
spec.version.base=1.0
spec.version.base=1.1

2
ExifParser/nbproject/project.xml
View File

@ -12,7 +12,7 @@
<compile-dependency/>
<run-dependency>
<release-version>7</release-version>
<specification-version>5.0</specification-version>
<specification-version>5.2</specification-version>
</run-dependency>
</dependency>
</module-dependencies>

2
HashDatabase/manifest.mf
View File

@ -1,7 +1,7 @@
Manifest-Version: 1.0
AutoUpdate-Show-In-Client: true
OpenIDE-Module: org.sleuthkit.autopsy.hashdatabase/3
OpenIDE-Module-Implementation-Version: 6
OpenIDE-Module-Implementation-Version: 7
OpenIDE-Module-Layer: org/sleuthkit/autopsy/hashdatabase/layer.xml
OpenIDE-Module-Localizing-Bundle: org/sleuthkit/autopsy/hashdatabase/Bundle.properties

2
HashDatabase/nbproject/project.properties
View File

@ -3,4 +3,4 @@ javac.compilerargs=-Xlint -Xlint:-serial
license.file=../LICENSE-2.0.txt
nbm.homepage=http://www.sleuthkit.org/autopsy/
nbm.needs.restart=true
spec.version.base=1.1
spec.version.base=1.2

2
HashDatabase/nbproject/project.xml
View File

@ -78,7 +78,7 @@
<compile-dependency/>
<run-dependency>
<release-version>7</release-version>
<specification-version>5.0</specification-version>
<specification-version>5.2</specification-version>
</run-dependency>
</dependency>
</module-dependencies>

2
KeywordSearch/manifest.mf
View File

@ -1,7 +1,7 @@
Manifest-Version: 1.0
AutoUpdate-Show-In-Client: true
OpenIDE-Module: org.sleuthkit.autopsy.keywordsearch/5
OpenIDE-Module-Implementation-Version: 6
OpenIDE-Module-Implementation-Version: 7
OpenIDE-Module-Install: org/sleuthkit/autopsy/keywordsearch/Installer.class
OpenIDE-Module-Layer: org/sleuthkit/autopsy/keywordsearch/layer.xml
OpenIDE-Module-Localizing-Bundle: org/sleuthkit/autopsy/keywordsearch/Bundle.properties

2
KeywordSearch/nbproject/project.properties
View File

@ -3,4 +3,4 @@ javac.compilerargs=-Xlint -Xlint:-serial
license.file=../LICENSE-2.0.txt
nbm.homepage=http://www.sleuthkit.org/autopsy/
nbm.needs.restart=true
spec.version.base=3.0
spec.version.base=3.1

2
KeywordSearch/nbproject/project.xml
View File

@ -96,7 +96,7 @@
<compile-dependency/>
<run-dependency>
<release-version>7</release-version>
<specification-version>5.0</specification-version>
<specification-version>5.2</specification-version>
</run-dependency>
</dependency>
</module-dependencies>

4
NEWS.txt
View File

@ -1,4 +1,4 @@
---------------- VERSION Current (development) --------------
---------------- VERSION 3.0.5 --------------
New features:
- Archive extractor ingest module (uses 7zip)
@ -7,7 +7,7 @@ New features:
Improvements:
- Sleuthkit-4.0.2 and libewf-20130128
- improved image loading in Media View and Thumbnail View (faster loading, handles large files better)
- improve Keyword Search file indexing (decision whether to index using detected mime-type instead of file extension)
- improve Keyword Search file indexing (use detected mime-type instead of file extension)
- show children counts in directory tree
Bugfixes:

2
RecentActivity/manifest.mf
View File

@ -1,6 +1,6 @@
Manifest-Version: 1.0
OpenIDE-Module: org.sleuthkit.autopsy.recentactivity/4
OpenIDE-Module-Implementation-Version: 6
OpenIDE-Module-Implementation-Version: 7
OpenIDE-Module-Layer: org/sleuthkit/autopsy/recentactivity/layer.xml
OpenIDE-Module-Localizing-Bundle: org/sleuthkit/autopsy/recentactivity/Bundle.properties
OpenIDE-Module-Requires:

2
RecentActivity/nbproject/project.properties
View File

@ -4,4 +4,4 @@ javac.compilerargs=-Xlint -Xlint:-serial
license.file=../LICENSE-2.0.txt
nbm.homepage=http://www.sleuthkit.org/autopsy/
nbm.needs.restart=true
spec.version.base=2.0
spec.version.base=2.1

2
RecentActivity/nbproject/project.xml
View File

@ -36,7 +36,7 @@
<compile-dependency/>
<run-dependency>
<release-version>7</release-version>
<specification-version>5.0</specification-version>
<specification-version>5.2</specification-version>
</run-dependency>
</dependency>
</module-dependencies>

2
SevenZip/nbproject/project.xml
View File

@ -21,7 +21,7 @@
<compile-dependency/>
<run-dependency>
<release-version>7</release-version>
<specification-version>5.0</specification-version>
<specification-version>5.2</specification-version>
</run-dependency>
</dependency>
<dependency>

2
Testing/manifest.mf
View File

@ -1,6 +1,6 @@
Manifest-Version: 1.0
AutoUpdate-Show-In-Client: false
OpenIDE-Module: org.sleuthkit.autopsy.testing/3
OpenIDE-Module-Implementation-Version: 5
OpenIDE-Module-Implementation-Version: 6
OpenIDE-Module-Localizing-Bundle: org/sleuthkit/autopsy/testing/Bundle.properties

2
Testing/nbproject/project.properties
View File

@ -3,4 +3,4 @@ javac.compilerargs=-Xlint -Xlint:-serial
license.file=../LICENSE-2.0.txt
nbm.homepage=http://www.sleuthkit.org/autopsy/
nbm.needs.restart=true
spec.version.base=1.1
spec.version.base=1.2

2
Testing/nbproject/project.xml
View File

@ -12,7 +12,7 @@
<compile-dependency/>
<run-dependency>
<release-version>7</release-version>
<specification-version>5.0</specification-version>
<specification-version>5.2</specification-version>
</run-dependency>
</dependency>
<dependency>

1
Timeline/manifest.mf
View File

@ -4,4 +4,5 @@ OpenIDE-Module-Layer: org/sleuthkit/autopsy/timeline/layer.xml
OpenIDE-Module-Localizing-Bundle: org/sleuthkit/autopsy/timeline/Bundle.properties
OpenIDE-Module-Requires: org.openide.windows.WindowManager
OpenIDE-Module-Specification-Version: 1.0
OpenIDE-Module-Implementation-Version: 1

2
Timeline/nbproject/project.xml
View File

@ -94,7 +94,7 @@
<compile-dependency/>
<run-dependency>
<release-version>7</release-version>
<specification-version>3.0</specification-version>
<specification-version>5.2</specification-version>
</run-dependency>
</dependency>
<dependency>

2
thunderbirdparser/manifest.mf
View File

@ -1,7 +1,7 @@
Manifest-Version: 1.0
AutoUpdate-Show-In-Client: true
OpenIDE-Module: org.sleuthkit.autopsy.thunderbirdparser/3
OpenIDE-Module-Implementation-Version: 6
OpenIDE-Module-Implementation-Version: 7
OpenIDE-Module-Layer: org/sleuthkit/autopsy/thunderbirdparser/layer.xml
OpenIDE-Module-Localizing-Bundle: org/sleuthkit/autopsy/thunderbirdparser/Bundle.properties

2
thunderbirdparser/nbproject/project.properties
View File

@ -3,4 +3,4 @@ javac.compilerargs=-Xlint -Xlint:-serial
license.file=../LICENSE-2.0.txt
nbm.homepage=http://www.sleuthkit.org/autopsy/
nbm.needs.restart=true
spec.version.base=1.0
spec.version.base=1.1

4
thunderbirdparser/nbproject/project.xml
View File

@ -12,7 +12,7 @@
<compile-dependency/>
<run-dependency>
<release-version>7</release-version>
<specification-version>5.0</specification-version>
<specification-version>5.2</specification-version>
</run-dependency>
</dependency>
<dependency>
@ -21,7 +21,7 @@
<compile-dependency/>
<run-dependency>
<release-version>5</release-version>
<specification-version>3.0</specification-version>
<specification-version>3.1</specification-version>
</run-dependency>
</dependency>
</module-dependencies>