Commit graph

2719 commits

Author SHA1 Message Date
Mike Duff
e97e745b61 Issue #2798 - Fix user presence messages and settings
Peer review comments

Change-Id: I615edc12a7fe93540b5e62cf673b92829cac3dfa

Former-commit-id: b087558dce4e19596c93d47e986af50fae806a74
2014-03-05 14:39:55 -06:00
Nate Jensen
59dcb3a97d Merge "Issue #2861 added synchronized blocks where necessary" into development
Former-commit-id: e108aa41bb586593f50970da53109a82d2bb8452
2014-03-05 14:14:25 -06:00
Max Schenkelberg
10bfa59aef Issue #2861 added synchronized blocks where necessary
Change-Id: I86a483612f618b04c1ef938ebc8f95decb496811

Former-commit-id: 1c019671d35dc4d544fa9ceaeabe0a075e3e5ede
2014-03-05 13:51:06 -06:00
Nate Jensen
7a2a489c77 Merge "Issue #2843 Harden recycle." into development
Former-commit-id: c36359b0aaa1540f6d941e9445b41ed929a91e14
2014-03-05 11:41:05 -06:00
Ben Steffensmeier
26c1a8e494 Issue #2843 Harden recycle.
Former-commit-id: 364b818dbd055b13fd8d5bb9f40c16f730f30b53
2014-03-05 11:16:12 -06:00
Brian Clements
c0e4615967 Issue #2837 collaboration icon changes
changed add/remove group icon colors
created icons for add/remove contact, alias contact and rename group


Former-commit-id: 3f7cfbbf1c60cffa0aa31f53b29521b78774042e
2014-03-05 09:00:57 -06:00
Nate Jensen
67fa21cfd9 Merge "Issue #2832 fix watches and warnings in collaboration displays" into development
Former-commit-id: 27ce4812affb11b506a21b5cf54c4b74b8c49031
2014-03-04 13:59:01 -06:00
Nate Jensen
e3d211c8d7 Issue #2832 fix watches and warnings in collaboration displays
Change-Id: Id24366f8ee0cc9e13d3822fefaee13e92b95126f

Former-commit-id: bb84ca01bb74bc93710ba92fcbdb13b30dc2454e
2014-03-04 13:18:16 -06:00
Richard Peter
f87a913017 Merge "Issue #2791 Use Data Source for all grid data access." into development
Former-commit-id: 0b9954f00ca5f5a61a1cd79d094408e43b115abe
2014-03-04 12:43:17 -06:00
Nate Jensen
f50a2789dd Merge "Issue #2804 Fixed clipping pane issues where clipped map borders would be visible due to other resources not resetting up the clipping pane when done." into development
Former-commit-id: 788133c5ea1a3005ed309a466e8cafad6db84ce3
2014-03-04 10:55:05 -06:00
Max Schenkelberg
a01a6d68d0 Issue #2861 Rewrote HierarchicalPreferenceStore to be more efficient and thread safe when reading values.
Amend: Added comments and cleaned up preference store

Change-Id: Iac708c0988fc1b8f552d3bccf76b1706d6324b8d

Former-commit-id: cc34e3dbebe13ec4f63b7529f5053391135837ef
2014-03-04 09:23:36 -06:00
Max Schenkelberg
dbcbd1b560 Issue #2804 Fixed clipping pane issues where clipped map borders would be visible due to other resources not resetting up the clipping pane when done.
Change-Id: If27cd7c8e11cdc6287303e6d5fc1f4990e300ada

Former-commit-id: 51664693bd87df52acdb74d5286b61eeb06b792d
2014-03-03 17:59:48 -06:00
Nate Jensen
384b531d26 Issue #2792 enforce getDensity() will not return above max
Change-Id: I3d9f8587f73f50083436900b9f8d058bfdc20af1

Former-commit-id: a502a64219e869401b1bff82fbb73e67565a6dae
2014-03-03 14:44:16 -06:00
Brian Clements
91936beadf Issue #2667 fixed bin lightning menus
the column name for the source of the lightning data was changed


Former-commit-id: 62e8a279840672f1ee2bb9f3ecf982c80a04d83c
2014-03-03 13:17:05 -06:00
Ben Steffensmeier
6fa441396f Issue #2791 Use Data Source for all grid data access.
Former-commit-id: 961c232e35da077ef4fc0b62cb04a8f4cb9fb6f0
2014-02-28 17:06:33 -06:00
Brian Clements
ce24bd1018 Issue #2756 implemented HTTP public key auth scheme
collaboration HTTP server now requires auth header (configured via openfire)
added auth to cave client


Former-commit-id: e0e4dfdedff283c809060257fbf04e777faf318d
2014-02-28 16:15:17 -06:00
Lee Venable
f171e3adb0 Merge "Issue #2632 - Implement buddy pounce (Contact Notifiers) Review comments" into development
Former-commit-id: 1a72af70658f288d43e397d12499de1a08ff2ba8
2014-02-28 13:50:15 -06:00
Mike Duff
5440ff64d1 Issue #2632 - Implement buddy pounce (Contact Notifiers)
Review comments

Change-Id: I7492b84b59406cf2ddbc65d9e6fc7c0c41c30ce7

Former-commit-id: 8ece6e53095ee80d7d4baa249125b3fe7a03add7
2014-02-28 13:23:34 -06:00
Richard Peter
5565bc88af Merge "Issue #2791 Switch contouring to use DataSource for data access." into development
Former-commit-id: 029efeddc9a20b10f8991976be5640bff2e14cfc
2014-02-28 11:52:51 -06:00
Ben Steffensmeier
4b7f3b2a5b Issue #2791 Switch contouring to use DataSource for data access.
Former-commit-id: 6c90be7554bcbbf0aeb363b6e76c455d3896be83
2014-02-28 11:28:02 -06:00
Nate Jensen
63244f840f Merge "Issue #2703 Fix GFE time matching in iscMode." into development
Former-commit-id: 252551462222ae8b7364ab39f1e927daec89a32c
2014-02-28 09:53:27 -06:00
Richard Peter
0e25ae35c1 Merge branch 'omaha_14.2.1' (14.2.1-8) into development
Conflicts:
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/localization/LocalizationManager.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/ui/zoneselector/ZoneSelectorResource.java
	cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/GeneralGridData.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
	edexOsgi/com.raytheon.edex.plugin.textlightning/src/com/raytheon/edex/plugin/textlightning/impl/TextLightningParser.java
	edexOsgi/com.raytheon.uf.common.comm/src/com/raytheon/uf/common/comm/HttpClient.java
	edexOsgi/com.raytheon.uf.common.dataaccess/src/com/raytheon/uf/common/dataaccess/response/GridResponseData.java
	edexOsgi/com.raytheon.uf.common.dataaccess/src/com/raytheon/uf/common/dataaccess/util/PDOUtil.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth.ncf/src/com/raytheon/uf/edex/datadelivery/bandwidth/sbn/SbnSimulator.java

Change-Id: Ia74f80ced9091ff0497ccc6d93e876b5a9807f75

Former-commit-id: a47eaa9af45db41391fe46e36ec0793f70d06ad6
2014-02-27 15:18:26 -06:00
Richard Peter
86d42ed603 Issue #2509: Fix Merge of 13.5.2-4 ncep resources
Change-Id: I9ed15a3114d07a210795cd26e3096a8cddd548d3

Former-commit-id: 08990cfd910707cbf1731a8f271a52ff922a6345
2014-02-27 13:46:47 -06:00
Richard Peter
729d608a15 Issue #2509: Fix merge of SS #124
Change-Id: I853f6b877a66cd7cb002ea3487dcffc783f902f1

Former-commit-id: 998ccfc1af2ca9c217151f353a8617ace8a1c18c
2014-02-27 13:20:49 -06:00
Nate Jensen
71d494eb34 Merge "Issue #2312 Fix file dialog input on export image dialog." into development
Former-commit-id: 4c4325675377cd170468a0c3dbe4632f5330227e
2014-02-27 09:10:07 -06:00
Lee Venable
0c7395d423 Issue #2795 - added code to check for null images.
Former-commit-id: 64cde69f612f25bf6c4a60db24791e3842b956a9
2014-02-26 15:50:46 -06:00
Ben Steffensmeier
d7a3ae4fdb Issue #2711 Use level factory more.
Former-commit-id: db58ae5999ea088cb93a8016836a6c62efe347e4
2014-02-26 15:10:40 -06:00
Ben Steffensmeier
e1dc75f97a Issue #2312 Fix file dialog input on export image dialog.
Former-commit-id: 3742e480c1551b8870a6ac719b87b1e4b3c98d2a
2014-02-26 14:57:59 -06:00
Ben Steffensmeier
d8bfdd1a7e Issue #2703 Fix GFE time matching in iscMode.
Former-commit-id: cbc63092bed92bb35a450c012b5bc882e4c82b35
2014-02-26 14:45:19 -06:00
Lee Venable
94cede8153 Issue #2833 - fixed subset dialog from disappearing when the subscription button double clicked.
Former-commit-id: a075d26c10bf7459419180f416d3e9ccefb94075
2014-02-26 13:21:58 -06:00
Brian Clements
eef242194a Issue #2751 fixed webDAV path issue
webDAV needs every part of the path created individually
made the userid portion of the url use the entire id URL encoded


Former-commit-id: 6211a9622c944171b78d04ef9263d26e6eed7687
2014-02-25 09:17:36 -06:00
Nate Jensen
279f05a1d5 Merge "Issue #2830 sort TAF dataTimes so latest are retrieved" into omaha_14.2.1
Former-commit-id: 5ce14324c20f4c73f77c827dc2991381acca813c
2014-02-24 16:17:20 -06:00
Nate Jensen
8a00a419a1 Issue #2830 sort TAF dataTimes so latest are retrieved
Former-commit-id: 04db02beec9d77e568c76541448bce0cd2f6c2d0
2014-02-24 15:35:13 -06:00
Ron Anderson
4364e7497c Merge branch 'master_14.2.1' into omaha_14.2.1
Conflicts:
	cave/com.raytheon.viz.gfe/GFESuite/ifpIMAGE

Change-Id: Iccf1487b3f0b354685ce2ff8b76e09ffc5350962

Former-commit-id: 6567ae1f172ec982d8a2d6d25e8aca97292f9b1d
2014-02-24 13:46:48 -06:00
Brian Clements
3f362519aa Issue #2751 fixed leader transfer infinite loop, added event validation
added username to paths in http urls to prevent old events from being picked up with new leader
added simple check to prevent invalid leader change events from being processed


Former-commit-id: 58c826ec371f10295fa6f4e236ff85a52698719d
2014-02-24 13:19:07 -06:00
Ben Steffensmeier
70ae372303 Issue #2817 Fix image reproject. Remove deprecated mesh reproject.
Former-commit-id: 5e5c09b701d44e8cedcad273f301bcf92f5606ec
2014-02-21 17:37:19 -06:00
Mike Duff
ed5cb91406 Issue #2631 - Set preference defaults in the Activator.
Removed unused file.

Change-Id: Idd6fee39cae4cc8d4cf4cd2ae652ed0722d6cd2e

Former-commit-id: 61e803bb38b398fd6758d650b6120dc2514064b4
2014-02-20 15:09:10 -06:00
Brian Clements
aaa2de20f4 Issue #2751 collab menu icons, fixed NPE
new icons for change color and transfer leader menu items
fixed NPE when cancelling change color dialog


Former-commit-id: 71c13c7a24fb4c3d7556d30ae35a3633b74f7bb3
2014-02-20 11:50:54 -06:00
Brian Clements
c3cadff705 Issue #2751 implemented room/topic ownership transfer
Former-commit-id: cf5041f2d052c4900e2871e0fc8dc1a2b71794de
2014-02-20 11:10:14 -06:00
Nate Jensen
32bd9fd635 Issue #2704 fix startup issues where settings are valid but dialog
doens't realize it


Former-commit-id: 588323380dd3ef4f21d9cd1cac8c9a3478ed66a1
2014-02-20 10:53:21 -06:00
Nate Jensen
3078b69273 Merge "Issue #2628 - Change cast from short to int for MPE colorbar" into development
Former-commit-id: 7820be8f078be179c7963cbae73cd3023a70c306
2014-02-19 17:22:00 -06:00
Nate Jensen
9011e1b31e Merge "Issue #2761 add region level to localization" into development
Former-commit-id: 59789454912e36ed64eb18fa83561fb7325945e2
2014-02-19 17:18:24 -06:00
Nate Jensen
df376abcb7 Merge "Issue #2631 - Add sound preference for users joining a room. review comments" into development
Former-commit-id: ff080a6b5184f486348a015f31b957325fa280fa
2014-02-19 16:19:27 -06:00
Ron Anderson
98d2417f94 Merge "Issue #2819 Removed more unnecessary .clone() calls" into development
Former-commit-id: d4fb7ae2684b26e93c33467de0b1813e263ce9e6
2014-02-19 15:39:56 -06:00
Mike Duff
663ea8decd Issue #2631 - Add sound preference for users joining a room.
review comments

Change-Id: I5ae0872dd3a498413f4f5b74bc4e7881bf0f9207

Former-commit-id: f578e45e37f7ac0780d2dc6b6ea21e81630ddc78
2014-02-19 15:26:14 -06:00
Mike Duff
682c6af456 Issue #2628 - Change cast from short to int for MPE colorbar
Change-Id: I936853788469b7a9cf35e3c90643bfbbbb2cc46c

Former-commit-id: d21c88a52604ff5f95e713eea0a61b1f6b33455e
2014-02-19 15:20:29 -06:00
Nate Jensen
4b4cca776f Merge "Issue #2751 fixed chat room bugs" into development
Former-commit-id: 86d03d7d6741b176a23dd93efd996154d3beaecb
2014-02-19 14:52:24 -06:00
Ron Anderson
5258aecf45 Issue #2819 Removed more unnecessary .clone() calls
Change-Id: I6924801040b238354527edfd57b4a3999f844617

Former-commit-id: ce896b573fcef99e30e3bda5f53b0941cd1b2e36
2014-02-19 11:55:11 -06:00
Mike Duff
19033601bf Issue #2734 - default time range to 24 hours.
Change-Id: If50ab9d45e3c8a1074f258583e07d248582c1f1d

Former-commit-id: 30d52d79ba79c79b8cdfbfdd8d61b1b7b04afef5
2014-02-19 10:23:48 -06:00
Matt Nash
2d20e84f6a Issue #2761 add region level to localization
Amend : Change comment now that we do not get file from localization

Change-Id: I864f2b4e1c84261ada3bf6169dbd3389d9b61ae2

Former-commit-id: 8b8e8e2bafaa4abb7c0b637f745a49eb7f6aa8f6
2014-02-19 10:01:25 -06:00