10157 Commits

Author SHA1 Message Date
Brian Sweeney
2a9d8c8164 tweaking stuff to try and get child selection working 2018-04-09 14:10:04 -06:00
Andrew Ziehl
941d7d574d TODOs and cleanup. 2018-04-09 14:10:03 -06:00
Andrew Ziehl
4d75dabe23 Move ChildFactories into classes which use them. Make CommonFilesMetaDataBuilder to handle queries/ list of model building / deduping files. Simplifies CommonFilesMetaData by separating business logic from model and CommonFilesPanel. Removes yet another query by re-using the dataSourceIdMap from CommonFilesPanel for model creation, so now CommonFiles is down to 2 queries total, including UI building. 2018-04-09 14:09:52 -06:00
Andrew Ziehl
084f29ae28 Cleanup CommonFilesMetaData, add in dedup optimization changes 2018-04-09 14:09:51 -06:00
Andrew Ziehl
ae2723791f fix sqlwhere clause 2018-04-09 14:09:51 -06:00
Andrew Ziehl
a89c4f6538 re-work child factories to have better model inheritance. Need to update package locations, fix sqlWhereClause 2018-04-09 14:09:50 -06:00
Brian Sweeney
4a7fbdae59 set display name,
get rid of extra data,
added decorators to start supporting context menu
2018-04-09 14:09:50 -06:00
Brian Sweeney
0eb9282afe new constructors with support for children with custom display name 2018-04-09 14:09:49 -06:00
Brian Sweeney
a61db2e7e1 removed an unused import 2018-04-09 14:09:49 -06:00
Brian Sweeney
418a37844d all the important data is here, its just weird how the nodes all get the value 'Name in the first column 2018-04-09 14:09:48 -06:00
Brian Sweeney
1b399b0a5e harmonizing columns 2018-04-09 14:09:48 -06:00
Brian Sweeney
697c7cd0ab harmonizing columns between the two node types 2018-04-09 14:09:47 -06:00
Brian Sweeney
34b57f80c2 added default visitor behavior for CommonFilesSearchNode 2018-04-09 14:09:47 -06:00
Brian Sweeney
d9b15f39a6 CommonFilesSearchNode should extend DisplayableItemNode to properly implement content menu interface 2018-04-09 14:09:46 -06:00
Brian Sweeney
4f3347c1ba disable enableTreeModel - which drills down and fiddles with outlineView directly. turns out it was not necessary and was poor style anyway 2018-04-09 14:09:46 -06:00
Brian Sweeney
ac1f515fed comments on state of progress - TODOs 2018-04-09 14:09:45 -06:00
Brian Sweeney
57bbdc4b70 POC code - getting childnodes to show up 2018-04-09 14:09:45 -06:00
Brian Sweeney
c71d15d51f algorithm debugged and simplified 2018-04-09 14:09:44 -06:00
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