617 Commits

Author SHA1 Message Date
jmillman
276a6155cf comments 2015-07-02 16:23:08 -04:00
jmillman
ae38edf854 add some more image format extensions 2015-07-02 15:24:53 -04:00
jmillman
4db07ba65e add "undisplayable" icon to DrawableTile.fxml and SlideShow.fxml; show this icon , when we can't display the contents of a drawable file. 2015-07-02 15:04:37 -04:00
jmillman
798ce18f0b fix animated gif loading; add "undisplayable" icon to DrawableTile.fxml 2015-07-02 14:14:53 -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
a2a8fc0bc6 move Tag events to ...casemodule.events package; explicitly implement Serializable interface.
use as needed logger to avoid serializing it.
2015-07-02 10:54:29 -04:00
jmillman
1138ed5f89 fix video/supoprted mimetype confusion 2015-07-02 10:34:14 -04:00
jmillman
8c224393e5 remove unsed icons 2015-07-02 10:33:34 -04:00
Richard Cordovano
e59ba14a44 Merge pull request #1417 from millmanorama/concurrent_hashmap_npe_fix
improve synchronization and guard the videoFileMap from null keys to eliminate NPE
2015-07-02 09:36:25 -04:00
jmillman
beb8efaa6a Extract FileTypeUtils from ImageGalleryModule
remove FileTypeIcons
remove deprecated method from GroupManager
2015-07-01 15:58:37 -04:00
jmillman
64e887b098 work towards showing a filetype icon even when we can't show the file 2015-07-01 15:58:30 -04:00
jmillman
e2cb9544f8 experimental work to show mimetype icon for undisplayable images/videos 2015-07-01 15:58:24 -04:00
jmillman
13d60ead02 use FileTypeDetector and mimetypes to decide what to include only falling back on extension if we can not get a mime type. 2015-07-01 15:58:15 -04:00
jmillman
924d012527 fix rebuilding the contents tree when switching grouping 2015-07-01 15:54:07 -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
a07802d73c Merge pull request #1407 from millmanorama/manually_sort_unseengroups
replace buggy JavaFX SortedLists with explicit sorting
2015-06-30 16:24:46 -04:00
Richard Cordovano
e1a6068298 Merge pull request #1406 from millmanorama/tag_group_menu
fix tag group menu bug ...
2015-06-30 16:23:45 -04:00
Richard Cordovano
6129da5679 Merge pull request #1405 from millmanorama/duplicate_tag_warning
Duplicate tag warning
2015-06-30 16:23:17 -04:00
jmillman
c12faa9859 refactor TagEvents heirarchy to support serialization;
don't try to lookup DeletedTag by Id, it won't exist.  Instead send DeletedTagInfo which has key info of deleted tag and is serializable.
2015-06-30 12:27:23 -04:00
jmillman
3e3a48e184 replace buggy JavaFX SortedLists with explicit sorting 2015-06-29 16:08:22 -04:00
jmillman
019e0b9584 fix tag group menu bug 2015-06-29 15:38:07 -04:00
jmillman
8b30d1bb7b check for duplicate tags in ImageGallery like we do in Autopsy. 2015-06-29 14:43:18 -04:00
jmillman
3a37fe0ef1 fixup! Merge branch 'develop' into hash_set_display 2015-06-29 11:15:20 -04:00
jmillman
ae9f9b0e31 Merge branch 'develop' into hash_set_display
Conflicts:
	ImageGallery/src/org/sleuthkit/autopsy/imagegallery/ImageGalleryController.java
	ImageGallery/src/org/sleuthkit/autopsy/imagegallery/actions/AddTagAction.java
	ImageGallery/src/org/sleuthkit/autopsy/imagegallery/actions/CategorizeAction.java
	ImageGallery/src/org/sleuthkit/autopsy/imagegallery/datamodel/CategoryManager.java
	ImageGallery/src/org/sleuthkit/autopsy/imagegallery/datamodel/DrawableDB.java
	ImageGallery/src/org/sleuthkit/autopsy/imagegallery/datamodel/grouping/GroupManager.java
	ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/drawableviews/MetaDataPane.java
2015-06-29 11:11:09 -04:00
jmillman
a234f9647d Merge branch 'develop' into hash_set_display
Conflicts:
	ImageGallery/src/org/sleuthkit/autopsy/imagegallery/ImageGalleryController.java
	ImageGallery/src/org/sleuthkit/autopsy/imagegallery/actions/AddTagAction.java
	ImageGallery/src/org/sleuthkit/autopsy/imagegallery/actions/CategorizeAction.java
	ImageGallery/src/org/sleuthkit/autopsy/imagegallery/datamodel/CategoryManager.java
	ImageGallery/src/org/sleuthkit/autopsy/imagegallery/datamodel/DrawableDB.java
	ImageGallery/src/org/sleuthkit/autopsy/imagegallery/datamodel/grouping/GroupManager.java
	ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/drawableviews/MetaDataPane.java
2015-06-29 11:07:15 -04:00
jmillman
0854d5bd41 Merge branch 'develop' into hash_set_display
Conflicts:
	ImageGallery/src/org/sleuthkit/autopsy/imagegallery/ImageGalleryController.java
	ImageGallery/src/org/sleuthkit/autopsy/imagegallery/actions/AddTagAction.java
	ImageGallery/src/org/sleuthkit/autopsy/imagegallery/actions/CategorizeAction.java
	ImageGallery/src/org/sleuthkit/autopsy/imagegallery/datamodel/CategoryManager.java
	ImageGallery/src/org/sleuthkit/autopsy/imagegallery/datamodel/DrawableDB.java
	ImageGallery/src/org/sleuthkit/autopsy/imagegallery/datamodel/grouping/GroupManager.java
	ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/drawableviews/MetaDataPane.java
2015-06-29 10:54:38 -04:00
Richard Cordovano
d1219f78de Merge develop into collaborative 2015-06-25 13:15:54 -04:00
jmillman
5b904edba6 fix merge mistakes 2015-06-25 11:31:53 -04:00
jmillman
773e4293c5 SlideShow toggle is disabled when there is no group selected; fix relative paths to images in fxml 2015-06-25 10:55:13 -04:00
jmillman
bb85f3feda SlideShow toggle is disabled initialy; fix relative paths to images in fxml 2015-06-25 10:55:11 -04:00
jmillman
257ebc64da clean up add tag action, use invokeLater not invokeAndWait; getNonCategoryTagNames returns TagNames in alphabetical order by displayname 2015-06-25 10:54:44 -04:00
jmillman
e157a5b53b only add new cat tag if there is no existing cat tag. put adding and removing fileids to/from group on jfx thread; remove file from groups when adding to new catagory based on new tag 2015-06-25 10:54:28 -04:00
jmillman
ed2fcdf80e better handling of exceptions in event bus eventhandlers 2015-06-25 10:54:05 -04:00
jmillman
8c2f6d274a move classes to better packages; remove FileUpdateEvent 2015-06-25 10:53:32 -04:00
jmillman
f293485a2f remove unneeded interface 2015-06-25 10:52:29 -04:00
jmillman
38732c17ba move DrawableView and GroupPane to a new package 2015-06-25 10:52:27 -04:00
jmillman
d11e4b03d5 reduce duplicate code 2015-06-25 10:51:30 -04:00
jmillman
4b7285ffd8 rename method in CategoryManager to be more descriptive; fix tag and category grouping when tags aer added / removed 2015-06-25 10:50:40 -04:00
jmillman
da0554de6a fix bugs updating tags/categpries in slideshowview and metadata pane
make new abstract base calss DrawableUIBase and move fileid and file object access to it.
2015-06-25 10:50:07 -04:00
jmillman
1f1d59d76f remove uneeded notification code; let event handlers do it all. optionalize DrawableView 2015-06-25 10:48:10 -04:00
jmillman
1665dc11b9 use new Autopsy Tag events, don't fire extra events from ig, but listen to events from autopsy 2015-06-25 10:44:36 -04:00
jmillman
bc33284c68 more granular synchronization in DrawableTagsManager 2015-06-25 10:39:20 -04:00
jmillman
e126aee4cb new Tag event system 2015-06-25 10:38:36 -04:00
jmillman
5432309c2f rename method; add synchronization; remove singletonness from SummaryTablePane 2015-06-25 10:35:59 -04:00
jmillman
e336dccfb2 refactor in GroupManager, to make logic and flow cleaner
split FileUpdateEvent handlers to seperate update and removed methods
name DbWorkerThread, Thread
2015-06-25 10:34:32 -04:00
jmillman
1f813a6708 more work to keep autopsy and ImageGallery tags in sync
add setFiles method to DrawableGroup;
don't clear groups from GroupMap except for CaseChange; reuse groups via setFiles method when regrouping
reselect group in navpanel after regroup
2015-06-25 10:31:33 -04:00
jmillman
2eecaa297e more cleanup of Categories/Tags and listening to autopsy generated "Tag Events"
-remove unused code from Category.java
-use Category.isCategoryTagName instead of .getDisplayName().startsWith(Category.CATEGORY_PREFIX)

-regroup when notified of Tag Change from autopsy
2015-06-25 10:29:22 -04:00
jmillman
e94f29e16d make sure all code is using the correct TagsManager (DrawableTagsManager) from controller; more cleanup 2015-06-25 10:26:31 -04:00
jmillman
1be231107d clean up and refactor code related to Tagging and actions;
move away from singleton by injecting controller rather than using getDefault();
 use EventBus in DrawableTagsManager (used to be TagUtils)

requires equal and hashcode method implemented on TagName
2015-06-25 10:24:08 -04:00