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

Merge https://github.com/jawallace/autopsy into encaseReportModule

Browse Source
This commit is contained in:
Jeff Wallace 2013-10-15 09:18:00 -04:00
commit 1ba9f2b9be
3 changed files with 43 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Core/src/org/sleuthkit/autopsy/corecomponents/Bundle.properties
View File

@ -106,3 +106,6 @@ MediaViewVideoPanel.pauseButton.text=\u25ba
MediaViewVideoPanel.progressLabel.text=00:00 MediaViewVideoPanel.progressLabel.text=00:00
DataContentViewerMedia.AccessibleContext.accessibleDescription= DataContentViewerMedia.AccessibleContext.accessibleDescription=
MediaViewVideoPanel.infoLabel.text=info MediaViewVideoPanel.infoLabel.text=info
GeneralPanel.jLabel2.text=When displaying times:
GeneralPanel.useLocalTimeRB.text=Use local timezone
GeneralPanel.useGMTTimeRB.text=Use GMT

26
Core/src/org/sleuthkit/autopsy/corecomponents/DataResultPanel.java
View File

@ -358,6 +358,7 @@ public class DataResultPanel extends javax.swing.JPanel implements DataResult, C
this.rootNode = selectedNode; this.rootNode = selectedNode;
if (this.rootNode != null) { if (this.rootNode != null) {
dummyNodeListener.reset();
this.rootNode.addNodeListener(dummyNodeListener); this.rootNode.addNodeListener(dummyNodeListener);
} }
@ -612,15 +613,28 @@ public class DataResultPanel extends javax.swing.JPanel implements DataResult, C
private class DummyNodeListener implements NodeListener { private class DummyNodeListener implements NodeListener {
private static final String DUMMY_NODE_DISPLAY_NAME = "Please Wait..."; private static final String DUMMY_NODE_DISPLAY_NAME = "Please Wait...";
private volatile boolean load = true;
public void reset() {
load = true;
}
@Override @Override
public void childrenAdded(final NodeMemberEvent nme) { public void childrenAdded(NodeMemberEvent nme) {
Node added = nme.getNode(); Node[] delta = nme.getDelta();
if (added.getDisplayName().equals(DUMMY_NODE_DISPLAY_NAME)) { if (load && containsReal(delta)) {
// don't set up tabs if the new node is a waiting node load = false;
return; setupTabs(nme.getNode());
} }
setupTabs(nme.getNode()); }
private boolean containsReal(Node[] delta) {
for (Node n : delta) {
if (!n.getDisplayName().equals(DUMMY_NODE_DISPLAY_NAME)) {
return true;
}
}
return false;
} }
@Override @Override

29
Core/src/org/sleuthkit/autopsy/corecomponents/DataResultViewerTable.java
View File

@ -243,8 +243,7 @@ public class DataResultViewerTable extends AbstractDataResultViewer {
this.setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR)); this.setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
try { try {
boolean hasChildren = false; boolean hasChildren = false;
if (selectedNode != null) { if (selectedNode != null) {
hasChildren = selectedNode.getChildren().getNodesCount() > 0; hasChildren = selectedNode.getChildren().getNodesCount() > 0;
} }
@ -257,6 +256,7 @@ public class DataResultViewerTable extends AbstractDataResultViewer {
// if there's no selection node, do nothing // if there's no selection node, do nothing
if (hasChildren) { if (hasChildren) {
Node root = selectedNode; Node root = selectedNode;
dummyNodeListener.reset();
root.addNodeListener(dummyNodeListener); root.addNodeListener(dummyNodeListener);
setupTable(root); setupTable(root);
} else { } else {
@ -478,21 +478,32 @@ public class DataResultViewerTable extends AbstractDataResultViewer {
private class DummyNodeListener implements NodeListener { private class DummyNodeListener implements NodeListener {
private static final String DUMMY_NODE_DISPLAY_NAME = "Please Wait..."; private static final String DUMMY_NODE_DISPLAY_NAME = "Please Wait...";
private volatile boolean load = true;
public void reset() {
load = true;
}
@Override @Override
public void childrenAdded(NodeMemberEvent nme) { public void childrenAdded(NodeMemberEvent nme) {
Node added = nme.getNode(); Node[] delta = nme.getDelta();
if (added.getDisplayName().equals(DUMMY_NODE_DISPLAY_NAME)) { if (load && containsReal(delta)) {
// If it's the dummy waiting node, we don't want load = false;
// to reload the table headers setupTable(nme.getNode());
return;
} }
setupTable(added); }
private boolean containsReal(Node[] delta) {
for (Node n : delta) {
if (!n.getDisplayName().equals(DUMMY_NODE_DISPLAY_NAME)) {
return true;
}
}
return false;
} }
@Override @Override
public void childrenRemoved(NodeMemberEvent nme) { public void childrenRemoved(NodeMemberEvent nme) {
} }
@Override @Override