18529 Commits

Author SHA1 Message Date
Brian Sweeney
c92e644042 harmonizing code 2018-04-09 14:09:44 -06:00
Brian Sweeney
8623479056 Merge branch 'Branch_3629_common_datasource' of https://github.com/briangsweeney/autopsy into 3624-tree-table-view
# Conflicts:
#	Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonFilesMetaData.java
#	Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonFilesPanel.java
2018-04-09 14:09:43 -06:00
Andrew Ziehl
eabb6c142e boolean logic fixes 2018-04-09 14:09:40 -06:00
Andrew Ziehl
3972f0b922 Merge branch 'develop' of https://github.com/briangsweeney/autopsy into Branch_3629_common_datasource
# Conflicts:
#	Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonFilesChildren.java
#	Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonFilesMetaData.java
#	Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonFilesPanel.java
2018-04-09 14:09:40 -06:00
Andrew Ziehl
2066d7c41f Code cleanup, update UI to disable 'across data sources' radio button instead of disabling common files search altogether when open case has one datasource. 2018-04-09 14:05:33 -06:00
Andrew Ziehl
f8177f1221 Fix instance count query 2018-04-09 14:05:33 -06:00
Andrew Ziehl
d76cd5367f functional within datasources query / UI
# Conflicts:
#	Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonFilesPanel.java
2018-04-09 14:05:32 -06:00
Andrew Ziehl
073b02d5dc hook up panel UI elements.
# Conflicts:
#	Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonFilesPanel.java
2018-04-09 14:04:12 -06:00
Andrew Ziehl
5973c90464 error/ code cleanup
# Conflicts:
#	Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonFilesMetaData.java
#	Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonFilesPanel.java
2018-04-09 14:03:30 -06:00
Brian Sweeney
31b062062f whitespace 2018-04-09 14:00:10 -06:00
Brian Sweeney
5184472fe0 fixed an algorithmic bug in collating files 2018-04-09 14:00:09 -06:00
Brian Sweeney
caf73a7563 new algorithm and model types for supporting children (the actual files) of common file nodes 2018-04-09 14:00:09 -06:00
Brian Sweeney
95e06fa8ee whitespace 2018-04-09 14:00:08 -06:00
Brian Sweeney
e2633606f8 common files search results supports child row 2018-04-09 14:00:08 -06:00
Brian Sweeney
78c7e9cef1 white space and unneeded imports cleanup 2018-04-09 14:00:07 -06:00
Brian Sweeney
89dfcafc30 exception handling 2018-04-09 14:00:07 -06:00
Brian Sweeney
8237a9111f throws exceptions 2018-04-09 14:00:06 -06:00
Brian Sweeney
494dc032f2 files deduped in only 2 sql queries - no roundtrips
business logic encapsulated outside of swingworker
2018-04-09 14:00:06 -06:00
Brian Sweeney
9ca10b5af0 new code for gather datasourcenames without db roundtrips - wip 2018-04-09 14:00:05 -06:00
Brian Sweeney
53bcc68665 impl notes 2018-04-09 14:00:05 -06:00
Brian Sweeney
c4be23b841 Merge branch 'develop' of https://github.com/briangsweeney/autopsy into 3623-common-files-optimize
# Conflicts:
#	Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonFilesMetaData.java
#	Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonFilesSearchNode.java
2018-04-09 14:00:04 -06:00
Brian Sweeney
7beb8c78d6 added data result filter node back 2018-04-09 13:58:17 -06:00
Brian Sweeney
bc26799d5f better error hanlding 2018-04-09 13:58:17 -06:00
Brian Sweeney
ee809a0fe9 removed unneeded code 2018-04-09 13:58:16 -06:00
Brian Sweeney
a51c9c595c property error handling around data source selection for common files
# Conflicts:
#	Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonFilesMetaData.java
2018-04-09 13:58:16 -06:00
Brian Sweeney
0b9987c7f9 improved event handler wire-up for search button 2018-04-09 13:57:04 -06:00
Brian Sweeney
d934805234 implement filenode to enable bottom right pane 2018-04-09 13:57:03 -06:00
Brian Sweeney
3b698f10cf whitespace, final modifier
# Conflicts:
#	Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonFilesSearchNode.java
2018-04-09 13:57:02 -06:00
Brian Sweeney
e0247395b0 fixed name column of common files search result 2018-04-09 13:56:52 -06:00
Brian Sweeney
e250067731 Merge branch '3602-common-case-files_r2' of https://github.com/briangsweeney/autopsy into 3602-common-case-files_r2
# Conflicts:
#	Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonFilesMetaData.java
#	Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonFilesPanel.java

# Conflicts:
#	Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonFilesMetaData.java
2018-04-09 13:56:51 -06:00
Andrew Ziehl
a0b41500a9 add getChildren call back in 2018-04-09 13:56:12 -06:00
Andrew Ziehl
86b61f4a02 Merge branch '3602-common-case-files_r2' of https://github.com/briangsweeney/autopsy into 3602-common-case-files_r2
# Conflicts:
#	Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonFilesChildren.java
#	Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonFilesSearchNode.java

# Conflicts:
#	Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonFilesMetaData.java
#	Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonFilesPanel.java
#	Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonFilesSearchNode.java
2018-04-09 13:56:11 -06:00
Andrew Ziehl
3b89d3b800 wip ChildFactor refactor
# Conflicts:
#	Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonFilesChildren.java
#	Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonFilesMetaData.java
#	Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonFilesPanel.java
#	Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonFilesSearchNode.java
2018-04-09 13:47:10 -06:00
Brian Sweeney
e983bfaeba comments 2018-04-09 13:41:19 -06:00
Brian Sweeney
43257d86a4 better access modifiers/encapsulation, deduped datasource list, fixed a off-by-1 error in enumerating the non-deduped files 2018-04-09 13:41:18 -06:00
Brian Sweeney
2a58fb6843 comment cleanup 2018-04-09 13:41:18 -06:00
Brian Sweeney
8d5f209fb3 cleanup, notes, narrower access on a few items 2018-04-09 13:41:17 -06:00
Brian Sweeney
c77408eae2 wrapped commonfilessearchnode with tablefilternode 2018-04-09 13:41:17 -06:00
Brian Sweeney
ef2c2ec533 appropriate columns in common files search 2018-04-09 13:41:16 -06:00
Brian Sweeney
0c82f1637c adjusted the sql query to select all the data needed to display common files, passed new data down to nodes 2018-04-09 13:41:16 -06:00
Brian Sweeney
0d7d68af50 utility for collating common files 2018-04-09 13:41:15 -06:00
Brian Sweeney
0e19f28958 first pass at reimplementing common search results with CommonSearchNode 2018-04-09 13:41:14 -06:00
Brian Sweeney
b42966c8fb begin some changes based on latest comments from story 3602 - implenet AbstractNode rather than AbstractFsContentNode 2018-04-09 13:41:14 -06:00
Brian Sweeney
5bd046ab64 renamed a class 2018-04-09 13:41:13 -06:00
Brian Sweeney
fe13e3dcff tweaks based on PR comments 2018-04-09 13:41:13 -06:00
Brian Sweeney
160506034a amended swing worker pattern as per richards best practices 2018-04-09 13:41:12 -06:00
Brian Sweeney
58c0b6c553 removed unneeded interface, renamed a type to be more descriptive 2018-04-09 13:41:12 -06:00
Andrew Ziehl
cafa60abc0 known files query update 2018-04-09 13:41:11 -06:00
Brian Sweeney
12e6ab9e90 comments 2018-04-09 13:41:11 -06:00
Brian Sweeney
e0a6571003 comments based on chat w/richard 2018-04-09 13:41:10 -06:00