Mike Duff
5c2d6189b4
Issue #2876 - move NDM plugin feature entry.
...
Change-Id: I3a0bc2b0deeaf565215cec588d71b177ef6a456f
Former-commit-id: 2fc712e1e8
[formerly 6be6181108
[formerly a3b334c9269a9753af0f2dd9f6507aef23177b9f]]
Former-commit-id: 6be6181108
Former-commit-id: bcd4b1490d
2014-03-10 09:45:04 -05:00
Steve Harris
08dbf1f7ea
Merge branch 'omaha_14.2.1' into development (from 14.2.1-9)
...
Former-commit-id: 1c64a5c025
[formerly 8b6263bfbd
[formerly 857ae00bea95a7981cb4752c1a7c147d725173e3]]
Former-commit-id: 8b6263bfbd
Former-commit-id: dc7d6ceced
2014-03-06 18:31:10 -06:00
Steve Harris
93aa41a34b
Merge branch 'master_14.2.1' into omaha_14.2.1
...
Former-commit-id: a2e36f4c6c
[formerly 7f1ad89df9
[formerly 22538918b8a7175bbb517cbf65ec3738e65a6eb2]]
Former-commit-id: 7f1ad89df9
Former-commit-id: 3358e8d6ef
2014-03-06 18:19:55 -06:00
Brad Gonzales
5cdaee1f29
Issue #2885 Updated java version in build.properties.p2.
...
Change-Id: Ifb266696902142ab59977025ae75010540836ed5
Former-commit-id: b47dc5df40
[formerly 2e224094ad
[formerly d1f3c5e508cf268198531a31fd3a91faba0159df]]
Former-commit-id: 2e224094ad
Former-commit-id: dadcd2e10b
2014-03-06 17:35:43 -06:00
Brad Gonzales
885a9567bc
Issue #2885 Updated all of the PDE builds to Java 1.7.
...
Change-Id: If74c5b163bc0742403fe701378bfae56b91bd49b
Former-commit-id: dea17a19da
[formerly 0e3dc17872
[formerly 6d2a542774db6c37cfc2a65f490ebf618f2e7954]]
Former-commit-id: 0e3dc17872
Former-commit-id: a24cbcfa77
2014-03-06 16:29:37 -06:00
Ben Steffensmeier
0d05c6135b
Issue #2831 Fix No Data Value in collaboration images.
...
Former-commit-id: 6962f80c5a
[formerly 82b8790050
[formerly 30a2518e0f780e4c344ec0e8fcdac39c9e3d617c]]
Former-commit-id: 82b8790050
Former-commit-id: c9eb976b65
2014-03-06 13:37:08 -06:00
Brian.Dyke
972c2c284b
ASM #124 - Display GLD360 lightning data
...
Former-commit-id: eefe8c45fe
[formerly db274c890f
[formerly 1edba9216beac913f9bd867da9988e213394a396]]
Former-commit-id: db274c890f
Former-commit-id: bd81ebd8c2
2014-03-06 10:54:15 -05:00
Nate Jensen
451a7fe552
Merge "Issue #2791 Move D2D Grids to direct memory." into development
...
Former-commit-id: a91e941d3e
[formerly be9cc9397f
[formerly acd6c523e7b1ab836b3529bacdbebb5fcfce3c3c]]
Former-commit-id: be9cc9397f
Former-commit-id: 0d547ab0bf
2014-03-05 15:02:46 -06:00
Ben Steffensmeier
6dc44e895f
Issue #2791 Move D2D Grids to direct memory.
...
Former-commit-id: 775c29e77c
[formerly 12ed63619a
[formerly 8d8a06be12652349032f15ab1e31d5f23adf0b24]]
Former-commit-id: 12ed63619a
Former-commit-id: fd34cf3993
2014-03-05 14:57:28 -06:00
Nate Jensen
dcbafebc0d
Merge "Issue #2632 - Fix problem with multiple notifiers per user." into development
...
Former-commit-id: 48fa8f8d1b
[formerly cf4631f9bf
[formerly e6dc5f076bfd4811b2b1cdaf3782a5066e032381]]
Former-commit-id: cf4631f9bf
Former-commit-id: ae9adefbf7
2014-03-05 14:41:12 -06:00
Mike Duff
ec892bb7a7
Issue #2798 - Fix user presence messages and settings
...
Peer review comments
Change-Id: I615edc12a7fe93540b5e62cf673b92829cac3dfa
Former-commit-id: 9c873e6dd9
[formerly e97e745b61
[formerly b087558dce4e19596c93d47e986af50fae806a74]]
Former-commit-id: e97e745b61
Former-commit-id: 25425a4268
2014-03-05 14:39:55 -06:00
Nate Jensen
d0fd1154d4
Merge "Issue #2861 added synchronized blocks where necessary" into development
...
Former-commit-id: 2eea0b9205
[formerly 59dcb3a97d
[formerly e108aa41bb586593f50970da53109a82d2bb8452]]
Former-commit-id: 59dcb3a97d
Former-commit-id: 54d015cb4f
2014-03-05 14:14:25 -06:00
Max Schenkelberg
1dad35e391
Issue #2861 added synchronized blocks where necessary
...
Change-Id: I86a483612f618b04c1ef938ebc8f95decb496811
Former-commit-id: b5ed7ac361
[formerly 10bfa59aef
[formerly 1c019671d35dc4d544fa9ceaeabe0a075e3e5ede]]
Former-commit-id: 10bfa59aef
Former-commit-id: 83ac37724e
2014-03-05 13:51:06 -06:00
Mike Duff
a670398424
Issue #2632 - Fix problem with multiple notifiers per user.
...
Change-Id: Ia6f9d18e9217c74e6ecf6a2df324860a2b817000
Former-commit-id: 9963324b60
[formerly 8c693a5f70
[formerly 168a656194aa3b455f403aa92b290bbbe17d3b45]]
Former-commit-id: 8c693a5f70
Former-commit-id: 14107f0914
2014-03-05 12:02:33 -06:00
Nate Jensen
c65bb2a011
Merge "Issue #2843 Harden recycle." into development
...
Former-commit-id: 308ab7c314
[formerly 7a2a489c77
[formerly c36359b0aaa1540f6d941e9445b41ed929a91e14]]
Former-commit-id: 7a2a489c77
Former-commit-id: 09311b8270
2014-03-05 11:41:05 -06:00
Ben Steffensmeier
291d5f55df
Issue #2843 Harden recycle.
...
Former-commit-id: 3cd6b29e75
[formerly 26c1a8e494
[formerly 364b818dbd055b13fd8d5bb9f40c16f730f30b53]]
Former-commit-id: 26c1a8e494
Former-commit-id: 22adc336df
2014-03-05 11:16:12 -06:00
Brian Clements
17661200a1
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: c9906cde88
[formerly c0e4615967
[formerly 3f7cfbbf1c60cffa0aa31f53b29521b78774042e]]
Former-commit-id: c0e4615967
Former-commit-id: d76dd2a8f6
2014-03-05 09:00:57 -06:00
Lee Venable
3c85140ba0
Issue #2833 - fixed a widget disposed error.
...
Former-commit-id: 980e21ca5a
[formerly e71dad9c80
[formerly eb3cf0ade9203766a437512b85e55f32108db1e3]]
Former-commit-id: e71dad9c80
Former-commit-id: f38afb0976
2014-03-05 08:37:13 -06:00
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
Lee Venable
fec690642e
Issue #2795 - removed test code.
...
Former-commit-id: f94bcc4d3f
[formerly 28fe1e99e2
[formerly 0e1db42a04b15b8815d59db272b4b2f7b3e79fb9]]
Former-commit-id: 28fe1e99e2
Former-commit-id: e34e636dc7
2014-02-27 15:46:30 -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
Brian.Dyke
9158806dd2
Rebased omaha_14.2.1_set_4 delivery on master_14.2.1-7
...
Former-commit-id: 1a8a0b703e
[formerly 2faab606e5
[formerly f7a43d07109a7c04ffb9754c285043ce446d46b5]]
Former-commit-id: 2faab606e5
Former-commit-id: 363403fb34
2014-02-24 14:51:00 -05: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