Commit graph

2713 commits

Author SHA1 Message Date
Nate Jensen
6b4d16b750 Merge "Issue #2832 fix watches and warnings in collaboration displays" into development
Former-commit-id: faf3dbb670 [formerly 67fa21cfd9 [formerly 27ce4812affb11b506a21b5cf54c4b74b8c49031]]
Former-commit-id: 67fa21cfd9
Former-commit-id: 8ebe236ce9
2014-03-04 13:59:01 -06:00
Nate Jensen
41d80f6fce Issue #2832 fix watches and warnings in collaboration displays
Change-Id: Id24366f8ee0cc9e13d3822fefaee13e92b95126f

Former-commit-id: 3c3e483d18 [formerly e3d211c8d7 [formerly bb84ca01bb74bc93710ba92fcbdb13b30dc2454e]]
Former-commit-id: e3d211c8d7
Former-commit-id: 559b1794af
2014-03-04 13:18:16 -06:00
Richard Peter
83b99aad5c Merge "Issue #2791 Use Data Source for all grid data access." into development
Former-commit-id: 873fa00fac [formerly f87a913017 [formerly 0b9954f00ca5f5a61a1cd79d094408e43b115abe]]
Former-commit-id: f87a913017
Former-commit-id: 090829f75e
2014-03-04 12:43:17 -06:00
Nate Jensen
b0e727938b 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: 7ac7dd5f01 [formerly f50a2789dd [formerly 788133c5ea1a3005ed309a466e8cafad6db84ce3]]
Former-commit-id: f50a2789dd
Former-commit-id: 75611f0631
2014-03-04 10:55:05 -06:00
Max Schenkelberg
dbc6cc3fc6 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: cbf8b9249c [formerly a01a6d68d0 [formerly cc34e3dbebe13ec4f63b7529f5053391135837ef]]
Former-commit-id: a01a6d68d0
Former-commit-id: 59434c8a60
2014-03-04 09:23:36 -06:00
Max Schenkelberg
4bcdc9f85b 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: 1854bbb477 [formerly dbcbd1b560 [formerly 51664693bd87df52acdb74d5286b61eeb06b792d]]
Former-commit-id: dbcbd1b560
Former-commit-id: 6edfb8965f
2014-03-03 17:59:48 -06:00
Nate Jensen
0044c21ad5 Issue #2792 enforce getDensity() will not return above max
Change-Id: I3d9f8587f73f50083436900b9f8d058bfdc20af1

Former-commit-id: 22153d43bb [formerly 384b531d26 [formerly a502a64219e869401b1bff82fbb73e67565a6dae]]
Former-commit-id: 384b531d26
Former-commit-id: 7f31e34dc9
2014-03-03 14:44:16 -06:00
Brian Clements
dedd9e80ed Issue #2667 fixed bin lightning menus
the column name for the source of the lightning data was changed


Former-commit-id: 7a7d476899 [formerly 91936beadf [formerly 62e8a279840672f1ee2bb9f3ecf982c80a04d83c]]
Former-commit-id: 91936beadf
Former-commit-id: 5d21675a91
2014-03-03 13:17:05 -06:00
Ben Steffensmeier
16b6723cbb Issue #2791 Use Data Source for all grid data access.
Former-commit-id: 05770129c1 [formerly 6fa441396f [formerly 961c232e35da077ef4fc0b62cb04a8f4cb9fb6f0]]
Former-commit-id: 6fa441396f
Former-commit-id: 02cef4ddaa
2014-02-28 17:06:33 -06:00
Brian Clements
fd18963221 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: d8e283e1b4 [formerly ce24bd1018 [formerly e0e4dfdedff283c809060257fbf04e777faf318d]]
Former-commit-id: ce24bd1018
Former-commit-id: 9d0b02e0a4
2014-02-28 16:15:17 -06:00
Lee Venable
4631a29ca3 Merge "Issue #2632 - Implement buddy pounce (Contact Notifiers) Review comments" into development
Former-commit-id: c77634951c [formerly f171e3adb0 [formerly 1a72af70658f288d43e397d12499de1a08ff2ba8]]
Former-commit-id: f171e3adb0
Former-commit-id: 40f3df6aff
2014-02-28 13:50:15 -06:00
Mike Duff
512e634a97 Issue #2632 - Implement buddy pounce (Contact Notifiers)
Review comments

Change-Id: I7492b84b59406cf2ddbc65d9e6fc7c0c41c30ce7

Former-commit-id: 5f433b4f6b [formerly 5440ff64d1 [formerly 8ece6e53095ee80d7d4baa249125b3fe7a03add7]]
Former-commit-id: 5440ff64d1
Former-commit-id: 377c1f9998
2014-02-28 13:23:34 -06:00
Richard Peter
39cf8178ff Merge "Issue #2791 Switch contouring to use DataSource for data access." into development
Former-commit-id: d5e09a82a7 [formerly 5565bc88af [formerly 029efeddc9a20b10f8991976be5640bff2e14cfc]]
Former-commit-id: 5565bc88af
Former-commit-id: 18ec1e12ae
2014-02-28 11:52:51 -06:00
Ben Steffensmeier
7c8332a30f Issue #2791 Switch contouring to use DataSource for data access.
Former-commit-id: 23ce77d864 [formerly 4b7f3b2a5b [formerly 6c90be7554bcbbf0aeb363b6e76c455d3896be83]]
Former-commit-id: 4b7f3b2a5b
Former-commit-id: fbf6371c8e
2014-02-28 11:28:02 -06:00
Nate Jensen
3153786b6f Merge "Issue #2703 Fix GFE time matching in iscMode." into development
Former-commit-id: 908d308825 [formerly 63244f840f [formerly 252551462222ae8b7364ab39f1e927daec89a32c]]
Former-commit-id: 63244f840f
Former-commit-id: b40f5477b4
2014-02-28 09:53:27 -06:00
Richard Peter
79d3aa4e1a 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: 1c150e6e8b [formerly 0e25ae35c1 [formerly a47eaa9af45db41391fe46e36ec0793f70d06ad6]]
Former-commit-id: 0e25ae35c1
Former-commit-id: 7bd6a07913
2014-02-27 15:18:26 -06:00
Richard Peter
63da19f472 Issue #2509: Fix Merge of 13.5.2-4 ncep resources
Change-Id: I9ed15a3114d07a210795cd26e3096a8cddd548d3

Former-commit-id: 862069dfd3 [formerly 86d42ed603 [formerly 08990cfd910707cbf1731a8f271a52ff922a6345]]
Former-commit-id: 86d42ed603
Former-commit-id: c267c5a08f
2014-02-27 13:46:47 -06:00
Richard Peter
ae39697315 Issue #2509: Fix merge of SS #124
Change-Id: I853f6b877a66cd7cb002ea3487dcffc783f902f1

Former-commit-id: d54fee5dae [formerly 729d608a15 [formerly 998ccfc1af2ca9c217151f353a8617ace8a1c18c]]
Former-commit-id: 729d608a15
Former-commit-id: a23c8f2c27
2014-02-27 13:20:49 -06:00
Nate Jensen
6e94f1dbbf Merge "Issue #2312 Fix file dialog input on export image dialog." into development
Former-commit-id: d1ec11d932 [formerly 71d494eb34 [formerly 4c4325675377cd170468a0c3dbe4632f5330227e]]
Former-commit-id: 71d494eb34
Former-commit-id: 414cc002b1
2014-02-27 09:10:07 -06:00
Lee Venable
191ca5f9ca Issue #2795 - added code to check for null images.
Former-commit-id: 49530206f4 [formerly 0c7395d423 [formerly 64cde69f612f25bf6c4a60db24791e3842b956a9]]
Former-commit-id: 0c7395d423
Former-commit-id: 5546b537cf
2014-02-26 15:50:46 -06:00
Ben Steffensmeier
3d9b435262 Issue #2711 Use level factory more.
Former-commit-id: 3da086b71f [formerly d7a3ae4fdb [formerly db58ae5999ea088cb93a8016836a6c62efe347e4]]
Former-commit-id: d7a3ae4fdb
Former-commit-id: 1069ef8d67
2014-02-26 15:10:40 -06:00
Ben Steffensmeier
ee8f345cb2 Issue #2312 Fix file dialog input on export image dialog.
Former-commit-id: 6d0a78e233 [formerly e1dc75f97a [formerly 3742e480c1551b8870a6ac719b87b1e4b3c98d2a]]
Former-commit-id: e1dc75f97a
Former-commit-id: 2fd8351874
2014-02-26 14:57:59 -06:00
Ben Steffensmeier
fa6dcaac84 Issue #2703 Fix GFE time matching in iscMode.
Former-commit-id: 07bc9f075f [formerly d8bfdd1a7e [formerly cbc63092bed92bb35a450c012b5bc882e4c82b35]]
Former-commit-id: d8bfdd1a7e
Former-commit-id: 2425b9665c
2014-02-26 14:45:19 -06:00
Lee Venable
d74b2c0118 Issue #2833 - fixed subset dialog from disappearing when the subscription button double clicked.
Former-commit-id: e0ee93bab3 [formerly 94cede8153 [formerly a075d26c10bf7459419180f416d3e9ccefb94075]]
Former-commit-id: 94cede8153
Former-commit-id: bb4b034375
2014-02-26 13:21:58 -06:00
Brian Clements
9597ce5cd9 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: 3d365a4cd2 [formerly eef242194a [formerly 6211a9622c944171b78d04ef9263d26e6eed7687]]
Former-commit-id: eef242194a
Former-commit-id: 3f0e9d7a77
2014-02-25 09:17:36 -06:00
Nate Jensen
055caba2bf Merge "Issue #2830 sort TAF dataTimes so latest are retrieved" into omaha_14.2.1
Former-commit-id: 060eafc272 [formerly 279f05a1d5 [formerly 5ce14324c20f4c73f77c827dc2991381acca813c]]
Former-commit-id: 279f05a1d5
Former-commit-id: 8ef957d2f0
2014-02-24 16:17:20 -06:00
Nate Jensen
a201d43d63 Issue #2830 sort TAF dataTimes so latest are retrieved
Former-commit-id: f353c44cc0 [formerly 8a00a419a1 [formerly 04db02beec9d77e568c76541448bce0cd2f6c2d0]]
Former-commit-id: 8a00a419a1
Former-commit-id: 230b8bf117
2014-02-24 15:35:13 -06:00
Ron Anderson
049424e5f0 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: 2db5f26840 [formerly 4364e7497c [formerly 6567ae1f172ec982d8a2d6d25e8aca97292f9b1d]]
Former-commit-id: 4364e7497c
Former-commit-id: 45ccac0859
2014-02-24 13:46:48 -06:00
Brian Clements
a173972437 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: 386e9cc96a [formerly 3f362519aa [formerly 58c826ec371f10295fa6f4e236ff85a52698719d]]
Former-commit-id: 3f362519aa
Former-commit-id: 9217ba24c5
2014-02-24 13:19:07 -06:00
Ben Steffensmeier
152980350c Issue #2817 Fix image reproject. Remove deprecated mesh reproject.
Former-commit-id: e08d4f77c3 [formerly 70ae372303 [formerly 5e5c09b701d44e8cedcad273f301bcf92f5606ec]]
Former-commit-id: 70ae372303
Former-commit-id: 780dc19fac
2014-02-21 17:37:19 -06:00
Mike Duff
9eafacaac2 Issue #2631 - Set preference defaults in the Activator.
Removed unused file.

Change-Id: Idd6fee39cae4cc8d4cf4cd2ae652ed0722d6cd2e

Former-commit-id: a7b1e79d2d [formerly ed5cb91406 [formerly 61e803bb38b398fd6758d650b6120dc2514064b4]]
Former-commit-id: ed5cb91406
Former-commit-id: a96a833f51
2014-02-20 15:09:10 -06:00
Brian Clements
8bbf2bb6bd 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: 89a48c3f6b [formerly aaa2de20f4 [formerly 71c13c7a24fb4c3d7556d30ae35a3633b74f7bb3]]
Former-commit-id: aaa2de20f4
Former-commit-id: a2bdfa25cc
2014-02-20 11:50:54 -06:00
Brian Clements
4e165aba58 Issue #2751 implemented room/topic ownership transfer
Former-commit-id: ab72938246 [formerly c3cadff705 [formerly cf5041f2d052c4900e2871e0fc8dc1a2b71794de]]
Former-commit-id: c3cadff705
Former-commit-id: a8ff1effc1
2014-02-20 11:10:14 -06:00
Nate Jensen
6973755f4e Issue #2704 fix startup issues where settings are valid but dialog
doens't realize it


Former-commit-id: 0f81b80467 [formerly 32bd9fd635 [formerly 588323380dd3ef4f21d9cd1cac8c9a3478ed66a1]]
Former-commit-id: 32bd9fd635
Former-commit-id: 6ef26a636c
2014-02-20 10:53:21 -06:00
Nate Jensen
adb51300d8 Merge "Issue #2628 - Change cast from short to int for MPE colorbar" into development
Former-commit-id: 5856957c57 [formerly 3078b69273 [formerly 7820be8f078be179c7963cbae73cd3023a70c306]]
Former-commit-id: 3078b69273
Former-commit-id: 4563e38db2
2014-02-19 17:22:00 -06:00
Nate Jensen
f939d93d7f Merge "Issue #2761 add region level to localization" into development
Former-commit-id: 6e59175ce4 [formerly 9011e1b31e [formerly 59789454912e36ed64eb18fa83561fb7325945e2]]
Former-commit-id: 9011e1b31e
Former-commit-id: 3782880dac
2014-02-19 17:18:24 -06:00
Nate Jensen
f545a8a74d Merge "Issue #2631 - Add sound preference for users joining a room. review comments" into development
Former-commit-id: f99cf7df47 [formerly df376abcb7 [formerly ff080a6b5184f486348a015f31b957325fa280fa]]
Former-commit-id: df376abcb7
Former-commit-id: a241472c34
2014-02-19 16:19:27 -06:00
Ron Anderson
dab0ebc99e Merge "Issue #2819 Removed more unnecessary .clone() calls" into development
Former-commit-id: b8c00d8ead [formerly 98d2417f94 [formerly d4fb7ae2684b26e93c33467de0b1813e263ce9e6]]
Former-commit-id: 98d2417f94
Former-commit-id: 8703c43937
2014-02-19 15:39:56 -06:00
Mike Duff
659cb1f2a0 Issue #2631 - Add sound preference for users joining a room.
review comments

Change-Id: I5ae0872dd3a498413f4f5b74bc4e7881bf0f9207

Former-commit-id: 95fcee385a [formerly 663ea8decd [formerly f578e45e37f7ac0780d2dc6b6ea21e81630ddc78]]
Former-commit-id: 663ea8decd
Former-commit-id: e2a6251a6b
2014-02-19 15:26:14 -06:00
Mike Duff
8a29af4894 Issue #2628 - Change cast from short to int for MPE colorbar
Change-Id: I936853788469b7a9cf35e3c90643bfbbbb2cc46c

Former-commit-id: 183657fb33 [formerly 682c6af456 [formerly d21c88a52604ff5f95e713eea0a61b1f6b33455e]]
Former-commit-id: 682c6af456
Former-commit-id: 48a0b34b5f
2014-02-19 15:20:29 -06:00
Nate Jensen
72acab26c3 Merge "Issue #2751 fixed chat room bugs" into development
Former-commit-id: c72e2be969 [formerly 4b4cca776f [formerly 86d03d7d6741b176a23dd93efd996154d3beaecb]]
Former-commit-id: 4b4cca776f
Former-commit-id: b4ac186728
2014-02-19 14:52:24 -06:00
Ron Anderson
5f3248574f Issue #2819 Removed more unnecessary .clone() calls
Change-Id: I6924801040b238354527edfd57b4a3999f844617

Former-commit-id: 419e9d0b8d [formerly 5258aecf45 [formerly ce896b573fcef99e30e3bda5f53b0941cd1b2e36]]
Former-commit-id: 5258aecf45
Former-commit-id: 663cb4cb62
2014-02-19 11:55:11 -06:00
Mike Duff
c7e22b7b3b Issue #2734 - default time range to 24 hours.
Change-Id: If50ab9d45e3c8a1074f258583e07d248582c1f1d

Former-commit-id: 0b316f7bd9 [formerly 19033601bf [formerly 30d52d79ba79c79b8cdfbfdd8d61b1b7b04afef5]]
Former-commit-id: 19033601bf
Former-commit-id: bc180503b1
2014-02-19 10:23:48 -06:00
Matt Nash
1d6e1d443c 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: 1835019567 [formerly 2d20e84f6a [formerly 8b8e8e2bafaa4abb7c0b637f745a49eb7f6aa8f6]]
Former-commit-id: 2d20e84f6a
Former-commit-id: 3f67324d7c
2014-02-19 10:01:25 -06:00
Brian Clements
abc01f5475 Issue #2751 fixed chat room bugs
fixed history messages having incorrect 'from' type
added ignore to dispose messages after room is closed
renamed tool tip for userid to match how JIDs are labled in client


Former-commit-id: 3a135b8eac [formerly dc074a9650 [formerly 453604eca5fca9e5d14ba1842dc7f76f1e0180ca]]
Former-commit-id: dc074a9650
Former-commit-id: 06c16118e1
2014-02-19 08:32:26 -06:00
Mike Duff
a370e81065 Issue #2596 - Add check for null coordinates.
Change-Id: I18f7a129ec428e51b36ac5b76cae194cf2c01e75

Former-commit-id: 9754f0d8dd [formerly a6509aad8c [formerly 11f3705080210161e6915309a4aec423b307cce8]]
Former-commit-id: a6509aad8c
Former-commit-id: 283b0c670c
2014-02-18 17:32:32 -06:00
Nate Jensen
961239e181 Merge "Issue #2756 new collaboration openfire plugin and http service" into development
Former-commit-id: b08d96b1e8 [formerly 020d54c48a [formerly e483f4311d00726f023d30e6d3f4e813c559390e]]
Former-commit-id: 020d54c48a
Former-commit-id: ac0a10678b
2014-02-18 14:51:13 -06:00
Nate Jensen
d4cc8b1827 Merge "Issue #2793 improved collaboration disconnect handling" into development
Former-commit-id: b3c45b303c [formerly c63289fa14 [formerly bf0a607b05ffb042e998d2c9940091137da21dc0]]
Former-commit-id: c63289fa14
Former-commit-id: 1738248fac
2014-02-18 11:22:19 -06:00
Brian Clements
1c8f5dd579 Issue #2793 improved collaboration disconnect handling
collaboration was being shutdown even though smack was trying to reconnect
changed to notify of disconnect, but not shutdown until reconnect fails


Former-commit-id: 7028f7fd4d [formerly a28fcf0dc5 [formerly 231c3cd84e3c86caba81708581be911e771aa774]]
Former-commit-id: a28fcf0dc5
Former-commit-id: 9095a1584f
2014-02-18 11:11:33 -06:00
Brad Gonzales
1d57e9f5f7 Issue #2771 For Data Delivery CAVE now request current id from
the registry EDEX.  Added DATA_DELIVERY_ID to environment that is used instead
of site id for identification when participating in the federation
and subscription identification.

Amend: Created common data delivery package com.raytheon.uf.edex.datadelivery. Moved DataDeliveryIdUtil there.
       Created ClusterIdUtil.  DataDeliveryIdUtil uses that utility.  It also verifies the id against the awips sites.
       Changed centralRegistry.sh to  set CLUSTER_ID to NCF.
       Handle cases where site id is HAK or HUS.
       Check for empty id setting in Cluster ID Util.
       Return full id for Data Delivery ID.
       Simplify Data Delivery ID and return Cluster ID.

Change-Id: Iee140b5626e1962217cca2deb6d1483ebf265911

Former-commit-id: ba4e308328 [formerly 19460ed0d7 [formerly d2fa3dfb4a61e8d0fd68654afb1c18e49f063fcb]]
Former-commit-id: 19460ed0d7
Former-commit-id: 379c0fb46c
2014-02-18 11:10:44 -06:00