93 Commits

Author SHA1 Message Date
William Schaefer
4bc8d85acd 3199 clean up read Tags properties code and rename Category to DhsImageCategory 2017-11-17 19:08:59 -05:00
William Schaefer
ad7d504d27 3199 Category class moved to Aut Core, tags created one place 2017-11-06 15:00:05 -05:00
U-BASIS\dgrove
70339153e1 Sync 2017-08-16 11:44:14 -04:00
jmillman
c60f9e692a use alias in sql query to avoid ambiguity about column name 2016-04-20 12:58:16 -04:00
jmillman
60ee20c9ef improve error handling in ImageGallery 2016-03-22 17:08:15 -04:00
jmillman
4b542f6d49 improve ImageUtils.isGIF and cleanup
minor cleanup in ImageUtils
2016-03-22 17:08:00 -04:00
jmillman
bd22f0d0d8 use fileTypeDetector.detect
use fileTypeDetector.detect
2016-03-22 17:07:53 -04:00
Oliver Spohngellert
ad2921cba1 Updated for new constructor for attribute type 2016-03-01 13:17:42 -05:00
Oliver Spohngellert
98d75a29ba Updated for api changes 2016-03-01 12:25:14 -05:00
Richard Cordovano
449a3020a8 Merge in develop and resolve merge conflicts 2016-02-19 16:30:30 -05:00
jmillman
a4f3377a64 refactor DrawableFile so it no longer extends AbstractFile
remove type paramater from DrawableFile since it was not adding anything usefull and cluttered up the code
add getters  that delegate to private AbastractFile instance
refactor methods on DrawableTagsManager to deal with Content or DrawableFile objects
remove unneeded  invocation of   ImageIO.scanForPlugins() in ImageFile
2016-02-17 14:35:52 -05:00
jmillman
5ba21cf3c3 add new sort order buttons, add new SortChooser control, refactor GroupSortBy to implement Comparator directly, refactor ToolBar, GroupManager etc accordingly and to use new SortChooser 2016-02-12 16:40:41 -05:00
Richard Cordovano
15d56ad88c Merge ja_localization_2016_1 into develop 2016-02-02 15:10:51 -05:00
Nick Davis
ca2a4e5b2b Extracted hard coded strings. Commented strings that shouldn't be extracted using NON-NLS. Used @NbBundle.Messages() style annotations for strings. Verified it correctly builds. 2016-02-02 12:56:17 -05:00
jmillman
876ec3d8fd improve exception fix 2016-02-01 16:50:40 -05:00
jmillman
f5a095bcc6 fix exception that is logged when mime-type is unknown 2016-02-01 13:54:15 -05:00
Richard Cordovano
96c966002a Revert "Revert "Revert "1501 ja image gallery - redo 1""" 2016-02-01 13:32:20 -05:00
Richard Cordovano
2a25dab4c6 Revert "Revert "1501 ja image gallery - redo 1"" 2016-02-01 12:49:13 -05:00
Richard Cordovano
e6e91fa9be Revert "1501 ja image gallery - redo 1" 2016-01-30 18:27:15 -05:00
Nick Davis
ee516a45d5 Ran searches. Tagged strings. Moved hard coded strings into @NbBundle.Messages() annotations. 2016-01-30 16:48:14 -05:00
Richard Cordovano
94a7a4addd Revert "1501 ja imagegallery" 2016-01-30 09:42:45 -05:00
Nick Davis
4a58766fff Merge branch 'develop' of github.com:sleuthkit/autopsy into 1501-ja-imagegallery
Conflicts:
	ImageGallery/src/org/sleuthkit/autopsy/imagegallery/FileTypeUtils.java
	ImageGallery/src/org/sleuthkit/autopsy/imagegallery/ImageGalleryController.java
	ImageGallery/src/org/sleuthkit/autopsy/imagegallery/datamodel/DrawableAttribute.java
	ImageGallery/src/org/sleuthkit/autopsy/imagegallery/datamodel/DrawableDB.java
	ImageGallery/src/org/sleuthkit/autopsy/imagegallery/datamodel/grouping/DrawableGroup.java
	ImageGallery/src/org/sleuthkit/autopsy/imagegallery/datamodel/grouping/GroupManager.java
	ImageGallery/src/org/sleuthkit/autopsy/imagegallery/datamodel/grouping/GroupSortBy.java
	ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/drawableviews/SlideShowView.java
2016-01-29 12:41:24 -05:00
jmillman
626f97ff06 cleanup FileTypeUtils and ImageGalleryController, and DrawableFile, etc... 2016-01-28 14:42:14 -05:00
jmillman
e3aa664520 remove dead code 2016-01-28 13:43:20 -05:00
millmanorama
3146010d76 fix findValuesForAttribute and getFileIDsWithMimeType 2016-01-28 13:42:56 -05:00
jmillman
76c2aa2f4d preliminary work to group by mime type 2016-01-28 13:42:47 -05:00
Nick Davis
f7ec38cb5f Tagged several strings with NON-NLS. Extracted hard coded strings. 2016-01-27 21:10:44 -05:00
jmillman
9fd2c00634 clean up 2016-01-25 10:46:16 -05:00
jmillman
5f08770019 move getCategoryCount to DrawableDB, keep selection in HashTree
revert unrelated logging change
2016-01-25 10:46:12 -05:00
jmillman
fc94e2b639 preliminary work to sort groups by uncategorized file count 2016-01-25 10:46:05 -05:00
jmillman
25aebba54b suppress compiler warning 2016-01-06 10:39:23 -05:00
jmillman
e1adef5ae8 reduce db roundtrips in HashSetManager.getHashSetsForFileHelper 2015-12-10 15:35:39 -05:00
U-Mhmdfy-PC\Mhmdfy
3197a02f6f replace Exceptions calls with logger 2015-11-25 11:13:18 -05:00
Richard Cordovano
cd8c14cc60 Convert incorrect imports of java.utils.logging.Logger 2015-09-15 16:04:40 -04:00
Richard Cordovano
494a5331be Resolve develop branch conflict 2015-09-14 13:53:14 -04:00
jmillman
80b92f5cb5 fix potenial NPE when case is closed out from underneath IG 2015-09-04 10:44:36 -04:00
Richard Cordovano
0e7222dabb Merge develop->collaborative, resolve merge conflict, compile errors 2015-08-26 14:39:59 -04:00
jmillman
43103e1b2f delegate hash set name lookup to new method in Content. 2015-08-04 13:37:53 -04:00
jmillman
8b9032bca8 Merge remote-tracking branch 'upstream/develop' into timeline_hash_set_filter
Conflicts:
	ImageGallery/src/org/sleuthkit/autopsy/imagegallery/datamodel/DrawableDB.java
	branding/core/core.jar/org/netbeans/core/startup/Bundle.properties
	branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties
2015-07-30 16:21:22 -04:00
jmillman
199d2e6d2a initial pass at timeline hash set filters 2015-07-29 19:09:08 -04:00
jmillman
b9d41e95e2 Merge remote-tracking branch 'upstream/develop' into metadata_copyable
Conflicts:
	ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/drawableviews/MetaDataPane.java
2015-07-28 13:51:15 -04:00
jmillman
ea15231b98 Merge branch 'develop' into metadata_copyable
Conflicts:
	ImageGallery/src/org/sleuthkit/autopsy/imagegallery/datamodel/DrawableDB.java
	ImageGallery/src/org/sleuthkit/autopsy/imagegallery/datamodel/DrawableFile.java
2015-07-27 17:08:54 -04:00
jmillman
0a84265ba7 keyboard based copying of metadata; cleanup; 2015-07-20 16:18:26 -04:00
Richard Cordovano
b4ee3471eb Merge develop branch into collaborative branch 2015-07-13 16:43:28 -04:00
jmillman
f7e56bebcc Merge branch 'develop' into include_all_drawable_mimetypes
Conflicts:
	ImageGallery/src/org/sleuthkit/autopsy/imagegallery/datamodel/DrawableDB.java
2015-07-02 17:20:46 -04:00
jmillman
47d6318ecd Merge remote-tracking branch 'upstream/develop' into include_all_drawable_mimetypes
Conflicts:
	ImageGallery/src/org/sleuthkit/autopsy/imagegallery/datamodel/DrawableDB.java
2015-07-02 14:14:07 -04:00
jmillman
bf68bea824 Merge remote-tracking branch 'upstream/develop' into include_all_drawable_mimetypes
Conflicts:
	ImageGallery/src/org/sleuthkit/autopsy/imagegallery/datamodel/DrawableDB.java
2015-07-02 12:56:32 -04:00
jmillman
beb8efaa6a Extract FileTypeUtils from ImageGalleryModule
remove FileTypeIcons
remove deprecated method from GroupManager
2015-07-01 15:58:37 -04:00
jmillman
5866b88a35 improve synchronization and guard the videoFileMap from null keys to eliminate NPE 2015-07-01 15:52:12 -04:00
Richard Cordovano
d1219f78de Merge develop into collaborative 2015-06-25 13:15:54 -04:00