Commit Graph
18776 Commits
Author SHA1 Message Date
Richard Cordovano 42988f20bb Fix compile error in KeywordSearch.java 2018-04-10 13:45:38 -04:00
Richard Cordovano c9a14c1082 Merge remote-tracking branch 'upstream/custom-release-may-2018' into develop 2018-04-10 13:40:08 -04:00
Richard Cordovano b759ddcc4f Merge pull request #3664 from millmanorama/962-layout-progress
962 layout progress
2018-04-10 12:21:18 -04:00
Richard Cordovano 74856bc4de Merge pull request #3653 from millmanorama/976-show-applied-layout
976 show applied layout as bold text on buttons
2018-04-10 12:18:08 -04:00
Brian Sweeney b212f6db3b cleanup 2018-04-10 09:11:29 -06:00
Brian Sweeney a19de80c24 tabs have meaningful titles 2018-04-10 08:38:57 -06:00
Ann Priestman 30a364c417 Minor cleanup from PR review 2018-04-10 07:29:51 -04:00
Ann Priestman f82cfe9c85 Changed x-axis to timestamps 2018-04-10 07:26:12 -04:00
William Schaefer 14d271bb28 3610 add comments to clarifiy new methods and classes for outlineView aid2.0 2018-04-09 17:04:51 -04:00
Brian Sweeney 3585611cff Merge branch 'develop' of https://github.com/briangsweeney/autopsy into 3624-tree-table-view
# Conflicts:
#	Core/src/org/sleuthkit/autopsy/corecomponents/DataResultViewerTable.java
2018-04-09 14:42:20 -06:00
William Schaefer 8d7cc2550f 3610 some clean up of various auto ingest outline view changes 2018-04-09 16:36:18 -04:00
William Schaefer 08298e5dce 3610 retain selection through refreshes of explorer view for aid 2.0 2018-04-09 16:14:32 -04:00
Brian Sweeney ce3a873552 !!! toggled off the thumbnail viewer for testing / demoing purposes !!! 2018-04-09 14:12:29 -06:00
Brian Sweeney d88615a42d pulled the two subclasses into their own files 2018-04-09 14:12:29 -06:00
Brian Sweeney 51f2c0881a refactored builder to use nicer abstraction 2018-04-09 14:12:28 -06:00
Brian Sweeney 3548534b90 unused imports 2018-04-09 14:12:28 -06:00
Brian Sweeney c8c8f90e01 ensure that panel closes on search 2018-04-09 14:12:27 -06:00
Brian Sweeney c1e84712a3 comment 2018-04-09 14:12:27 -06:00
Brian Sweeney aff22061b0 light refactoring (nothing functional - just stylistic) 2018-04-09 14:12:26 -06:00
Brian Sweeney 69c4b0cc66 renamed a variable, removed a useless listener 2018-04-09 14:12:26 -06:00
Brian Sweeney fd1dc6f0eb moved db calls into swing worker 2018-04-09 14:12:25 -06:00
Brian Sweeney 994cd5c1c8 style cleanup 2018-04-09 14:12:25 -06:00
Brian Sweeney 51b0fc894a removed unused usings 2018-04-09 14:12:24 -06:00
Brian Sweeney 568197d6c0 cleanup 2018-04-09 14:12:24 -06:00
Brian Sweeney 475992d6f4 cleanup
# Conflicts:
#	Core/src/org/sleuthkit/autopsy/corecomponents/DataResultViewerTable.java
2018-04-09 14:12:23 -06:00
Brian Sweeney 16cb4378bc needed to close a db connection manually or we needed to wrap in try with resouces 2018-04-09 14:11:11 -06:00
Brian Sweeney bc79abc766 removed redundant declaration 2018-04-09 14:11:11 -06:00
Brian Sweeney 2f00491528 Merge branch '3624-tree-table-view' of https://github.com/briangsweeney/autopsy into 3624-tree-table-view
# Conflicts:
#	Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonFilesPanel.java
#	Core/src/org/sleuthkit/autopsy/corecomponents/DataResultViewerTable.java
2018-04-09 14:11:10 -06:00
Andrew Ziehl 8a6c7b6e3d WIP, the child node stays selected but we bypass the propertyChange ? Also force sets selectedChild in DataResultViewerTable
# Conflicts:
#	Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonFilesPanel.java
#	Core/src/org/sleuthkit/autopsy/corecomponents/DataResultViewerTable.java
2018-04-09 14:11:08 -06:00
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