Steve Harris
196f53e609
CM-MERGE:14.1.3-2,-3 into 14.2.2
...
Merge branch 'master_14.1.3' (-3) into master_14.2.2 (-14)
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-request.xml
edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-spring.xml
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/spc/SPCWatchSrv.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/tpc/TPCWatchSrv.java
edexOsgi/com.raytheon.edex.plugin.gfe/test/com/raytheon/edex/plugin/gfe/watch/TestWCLWatchSrv.java
edexOsgi/com.raytheon.edex.plugin.warning/WarningDecoder.py
edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/gis/GeospatialFactory.java
Former-commit-id: 16f5ff0979b84dda593016f5ff0979b84dda5930419c5f4aba419c5f4abaaf06c5a89066d30e59a3935542914d
2014-06-20 14:01:55 -04:00
Brian Clements
bb58783ca4
Omaha #3281 peer2peer chat view improvements
...
bounced chat messages now result in error messages in window
fixed view secondary id bug with userids (removed resource from key)
Change-Id: I76a68bf290b0c5205361bc6c78fda99336d7c62d
Former-commit-id: f053e9b0849d626a97e5f053e9b0849d626a97e593a1ee71c493a1ee71c43eb4cd513ca9827ef8e87060fe3fba
2014-06-20 09:04:15 -05:00
Brian Clements
a8e31ffa21
Omaha #3281 collaboration views persist between perspectives
...
fixed bug that prevented re-opening collaboration after views were closed
Change-Id: I62651d9d5fe52defe3f4f37ee97b4d824cb974e3
Former-commit-id: 21fca2e6629aa5a87c4b21fca2e6629aa5a87c4bfd95df3bc0fd95df3bc074c62e0bf9795fa49ced5560b12a5a
2014-06-20 08:53:54 -05:00
Nate Jensen
cc90e21628
Omaha #3245 remove -vm argument
...
Change-Id: Ic4170cc85683121845013380fb2780b922e5fc13
Former-commit-id: 02372893b6123b22d90a02372893b6123b22d90ad60d2b5cafd60d2b5caf98e2cb8d62ef20c3192e7af79aca86
2014-06-19 14:44:24 -05:00
Nate Jensen
1d44a9f517
Merge "Omaha #3214 added pulse and cloud flash rendering to cave" into omaha_14.4.1
...
Former-commit-id: 3971e05c4c644fdf50c73971e05c4c644fdf50c7caf278ca5ccaf278ca5cad63e5b322977a3818f1d67339b3a9
2014-06-19 13:42:06 -05:00
Nate Jensen
255d1859f4
Omaha #3255 fix cave install of data delivery
...
Change-Id: I06820560fd6b18c4886c0b3bef993e6830037b4e
Former-commit-id: 76658aa485eff82573df76658aa485eff82573dff01e19946cf01e19946c6990acc1a7cb5d6fe18743cdc7fccb
2014-06-19 13:15:40 -05:00
Brian Clements
cadb1091fb
Omaha #3214 added pulse and cloud flash rendering to cave
...
Change-Id: Ibb842c0088b959e9ffc88c4db51f4c1bcc77d3ce
Former-commit-id: 6345119f9b7dd90e6f856345119f9b7dd90e6f85a18069809aa18069809abd2288e0666d5cbf29a574d4ebf071
2014-06-19 12:50:56 -05:00
Nate Jensen
813921a97c
Merge "Omaha #3255 Remove cxf from cave feature to fix build" into omaha_14.4.1
...
Former-commit-id: c19f10ddd466cb3d5f03c19f10ddd466cb3d5f0327df878d8627df878d86d34ee39b1c918e5664bb9c0adc1c15
2014-06-19 10:59:35 -05:00
Benjamin Phillippe
7dd8c59365
Omaha #3255 Remove cxf from cave feature to fix build
...
Former-commit-id: 8428c676d78d2605199e8428c676d78d2605199efc024e6d4cfc024e6d4cd9298ddd4fa90b1891b1fb3ea7760d
2014-06-19 10:58:11 -05:00
Nate Jensen
89d67fbce7
Omaha #3242 clean up more graphs
...
Change-Id: I2440877381afc684cb2a3b02cbdbe36905643de4
Former-commit-id: 9e317cb9bcaca7b462439e317cb9bcaca7b462437bb2aebd597bb2aebd5988607607d733f36374d0a1467e4361
2014-06-18 18:23:36 -05:00
Nate Jensen
da89b20f75
Merge "Omaha #3242 thread safety for inset map" into omaha_14.4.1
...
Former-commit-id: a83159ff6a55bd088ce5a83159ff6a55bd088ce5835b65b7b8835b65b7b8135656f5f519383d86f2c02a5a88eb
2014-06-18 17:17:17 -05:00
Nate Jensen
76f8d24c33
Merge "Omaha #3242 support ensemble id in time series legends" into omaha_14.4.1
...
Former-commit-id: 393718bf41f0e0866155393718bf41f0e0866155fbd7e64fe2fbd7e64fe29e8f46a84c098712e6a0ddae1dc541
2014-06-18 17:17:04 -05:00
Nate Jensen
697c53e6bb
Merge "Omaha #3242 fix errors that can occur if a user zooms or pans while the time series is still loading" into omaha_14.4.1
...
Former-commit-id: 43a6ca22ac0db147238d43a6ca22ac0db147238d9a76fd4db09a76fd4db02e569fea177867dc1ff6a57ea807ea
2014-06-18 17:07:19 -05:00
Nate Jensen
d68030a1cc
Omaha #3242 thread safety for inset map
...
Change-Id: I358dfcb211444407095cd86657dee8ad522b5857
Former-commit-id: 33f858e9519b98b63bb533f858e9519b98b63bb530e76a1fd530e76a1fd540ca9ab166a32552846d3a7c95c110
2014-06-18 17:02:10 -05:00
Nate Jensen
e46c6a4ed4
Omaha #3242 fix errors that can occur if a user zooms or pans while the
...
time series is still loading
Change-Id: Ibcdc9681c651731f7da554c8cca40e260303aebb
Former-commit-id: b6ba8c0a3da18fa3f026b6ba8c0a3da18fa3f0263ba4931eee3ba4931eee51e5563415a9904710214e673d8358
2014-06-18 16:48:48 -05:00
Nate Jensen
c65c47c798
Omaha #3242 fix error if user zooms on cross section before it's loaded
...
Change-Id: I9143840a5074e4e5c9995c94cb21686598d79830
Former-commit-id: aa579b85e71add8fca08aa579b85e71add8fca0846c843f51a46c843f51a18ce2d663532038939b34c44afbf22
2014-06-18 16:37:49 -05:00
Nate Jensen
bf95e2a827
Omaha #3242 support ensemble id in time series legends
...
Change-Id: I7f8435d274d3981e4871a5cf726bbf69e22a0d08
Former-commit-id: 73082de4611a8995fc2d73082de4611a8995fc2de10a73c17be10a73c17bd6f84d8281a575c57ecc1d244a4a95
2014-06-18 15:37:14 -05:00
Benjamin Phillippe
55e4811fe8
Omaha #3255 Fixing Build
...
Former-commit-id: a50a8e79a1621a3f1a5ca50a8e79a1621a3f1a5c7e7cecceea7e7cecceead59ea2591df6dc8523d707c5831045
2014-06-18 13:57:27 -05:00
Nate Jensen
2e803f21b3
Merge "Omaha #3255 Dependency cleanup" into omaha_14.4.1
...
Former-commit-id: 0167a89312042b69ba9a0167a89312042b69ba9a9fd4e4a8d99fd4e4a8d9fdebae41d5806b3b14905d1cf81f99
2014-06-18 12:14:45 -05:00
Nate Jensen
86a57cc2c5
Merge "Omaha #3274 fix generation of viz .ini files" into omaha_14.4.1
...
Former-commit-id: 079828ecceb3e73d78cc079828ecceb3e73d78cc32bc3e405632bc3e4056b6c7e0dfd2c59136990b7872e29f1b
2014-06-18 11:11:34 -05:00
Nate Jensen
787b6d8a60
Omaha #3274 fix generation of viz .ini files
...
Change-Id: I5ca9b02310cd068df5ee30acf47396070142dfc7
Former-commit-id: f958ca8de2465a0fef71f958ca8de2465a0fef7117dc45e7ca17dc45e7cafe17c9b8b9a9fc46a6fb4129bd518d
2014-06-18 10:03:17 -05:00
Benjamin Phillippe
a8d99c348d
Omaha #3255 Dependency cleanup
...
Change-Id: Ic405d8f4fbe3f778d7e542529d566678c445647e
Former-commit-id: b41f79658f270caaaddeb41f79658f270caaaddec2ed8a39d1c2ed8a39d138abcb36f5447fb0572a5d908f2288
2014-06-18 09:54:40 -05:00
Steve Harris
a6d5652425
Merge branch 'omaha_14.3.1' into omaha_14.4.1
...
Conflicts (these go to ufcore):
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/AbstractGraphicsTarget.java
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/IGraphicsTarget.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/GLTarget.java
cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/cmenu/ChangePointStyleAction.java
Former-commit-id: 9de49b59eacc7e6bc52a9de49b59eacc7e6bc52a676948e239676948e239586f56383918b2a1df08545d6da097
2014-06-18 08:52:25 -05:00
Brian.Dyke
b602d29456
CM-MERGE:OB13.5.6-4 into 14.1.3
...
Former-commit-id: be589ceb9b399c06820abe589ceb9b399c06820a8ecdd9a1928ecdd9a192e28febcf279031f58d023e10995d87
2014-06-18 08:55:49 -04:00
Nate Jensen
3923c96927
Merge "Omaha #3078 collaboration shared display data over private chat" into omaha_14.4.1
...
Former-commit-id: 344a6b80efa2783be56a344a6b80efa2783be56a764f977bf6764f977bf6686f6f67a0bc5cedb1c87011f15929
2014-06-17 18:09:33 -05:00
Nate Jensen
f21b672114
Merge "Omaha #3245 fix GFE starting without a cave data" into omaha_14.4.1
...
Former-commit-id: bb60b170e8dcab909b4bbb60b170e8dcab909b4b7fc256d0767fc256d0761f9f0ba7f3a499624f5ff94209e681
2014-06-17 17:01:46 -05:00
Brian Clements
ed95461c36
Issue #2903 prevent shared display crash from missing point style enum value
...
Change-Id: I9d3faccba56c2832c5dcc185c6c20bcce396b173
Former-commit-id: b8a0a60df69946f78241b8a0a60df69946f782415d03048fff5d03048fffdbe778cbe059d92634b048e634b14a
2014-06-17 17:01:23 -05:00
Nate Jensen
11753fc2d3
Omaha #3245 fix GFE starting without a cave data
...
Change-Id: I61e9766bccd099619bfedfd9a1e1121fe63120d7
Former-commit-id: 2ce0e5aee519aa9dc96e2ce0e5aee519aa9dc96e8ab7d86a8f8ab7d86a8f5129fee3e6451b265ce6e59c180fdc
2014-06-17 16:31:20 -05:00
Nate Jensen
aec31b09bc
Merge "Omaha #3078 added private chat to collaboration" into omaha_14.4.1
...
Former-commit-id: 12ef85f6657fb85a1acc12ef85f6657fb85a1accc05ae83ea2c05ae83ea2f9252851310d71d5dc2b181da0bc6a
2014-06-17 16:24:42 -05:00
Brian Clements
3702533a45
Omaha #3078 collaboration shared display data over private chat
...
Change-Id: I0ede9310eb109adc1b08673027e9e36a68a09fbf
Former-commit-id: b518cb24189a427606aeb518cb24189a427606aeadd8286d52add8286d5213bf7e079306b7415ceca993d1f90a
2014-06-17 14:32:17 -05:00
Nate Jensen
1b2612e117
Merge "Omaha #3110 Fix typos in revision comment and log message. Changed to log number of messages in queue instead of number being added to queue." into omaha_14.4.1
...
Former-commit-id: bd2ef07395d8dc6eceefbd2ef07395d8dc6eceefacd7620d7aacd7620d7afe52a8f7f8485aced54c479ccb41f4
2014-06-17 14:21:55 -05:00
Ron Anderson
450ece09b7
Merge "Omaha #3274 switch viz to G1 garbage collector" into omaha_14.4.1
...
Former-commit-id: b0a7be6203d5c2170a20b0a7be6203d5c2170a20855b4ad7c1855b4ad7c132e707294a79c6182cc9b6f47567b2
2014-06-17 13:54:11 -05:00
Ron Anderson
f2c24187a2
Omaha #3110 Fix typos in revision comment and log message.
...
Changed to log number of messages in queue instead of number being added to queue.
Change-Id: I0f6b2be8e62be964de993c6c66f042b371a80bd7
Former-commit-id: 404098d861b7843361f6404098d861b7843361f61a8ccd01811a8ccd0181ed318889dee31eabe77b2728191963
2014-06-17 13:46:38 -05:00
Brian Clements
cdcf7d8143
Omaha #3078 added private chat to collaboration
...
Change-Id: Ifcc4a33c1551e4209721fcc181b0becb49bdb5ae
Former-commit-id: 86e89665bf37699395ef86e89665bf37699395ef97a6f5bfe897a6f5bfe851e260627760508bf6744433482d56
2014-06-17 11:52:58 -05:00
Nate Jensen
54b72c7108
Omaha #3274 switch viz to G1 garbage collector
...
Change-Id: I720c4ebb21bd3a37dcc71f8879bb96edb6a0b109
Former-commit-id: 14a520dbd94a91c3320b14a520dbd94a91c3320b44cb0e6ae644cb0e6ae6439e037d033981241355fe47ecf6ce
2014-06-17 10:54:57 -05:00
Brian Clements
0dcfac1a44
Omaha #3288 collaboration feed venue config comes from server
...
Change-Id: I5bc747507e44cc31093d7a7f470a263d0cf116c0
Former-commit-id: 8205f7cd56b6a2bf0ae48205f7cd56b6a2bf0ae484e3f967d984e3f967d94dc81aabfa5436efb886616315d830
2014-06-17 09:26:24 -05:00
Nate Jensen
19383cbf10
Merge "Omaha #2061 Remove references to IDecoderGettable.Amount from Range Rings." into omaha_14.4.1
...
Former-commit-id: 95b2e262a0b1acd1709a95b2e262a0b1acd1709a9b7ed95e6b9b7ed95e6b99b46cfbcf521065548dea80faede7
2014-06-16 09:26:30 -05:00
Nate Jensen
2566b6419c
Merge "Omaha #3265 Fix potential NPE in D2D time matching." into omaha_14.4.1
...
Former-commit-id: c2766190a45fad6501a7c2766190a45fad6501a7b3df7745d4b3df7745d4ca06c42305752fe5010435ed3931c3
2014-06-16 09:00:47 -05:00
Nate Jensen
450611cd70
Merge "Omaha #3163 Fix NPE when styleless strings are sent to 14.3" into omaha_14.4.1
...
Former-commit-id: 4544d7d3e0181a87e72d4544d7d3e0181a87e72d5908a4501a5908a4501a8aa1e4aacb442a3d9683e01ddac6ad
2014-06-16 09:00:39 -05:00
Nate Jensen
cc66519671
Merge "Issue #2903 changed collaboration jaxb xml to be base64 encoded" into omaha_14.3.1
...
Former-commit-id: eddc8f373ac2aa87470deddc8f373ac2aa87470ded36453f09ed36453f0950715cc012ef61539a8a48496aeb9b
2014-06-16 08:31:30 -05:00
Steve Harris
a0d17947a9
Merge branch 'omaha_14.3.1' (14.3.1-10,11) into omaha_14.4.1
...
Conflicts:
cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
edexOsgi/com.raytheon.uf.common.derivparam.python/utility/common_static/base/derivedParameters/functions/Vector.py
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/CCP.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/GVV.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/T.xml
edexOsgi/com.raytheon.uf.edex.purgesrv/src/com/raytheon/uf/edex/purgesrv/PurgeJob.java
Former-commit-id: 97843cf58e921336973997843cf58e9213369739e1c8ad2611e1c8ad2611d7cd0ac02c362988b9d78270fd8a9f
2014-06-16 08:19:12 -05:00
Ben Steffensmeier
6594b9dbd8
Omaha #3265 Fix potential NPE in D2D time matching.
...
Former-commit-id: 9caf60a55181fbf3b6979caf60a55181fbf3b69729b423645e29b423645e18f1cd9d5bb0ff6298f107f36a59a7
2014-06-13 16:58:35 -05:00
Ben Steffensmeier
307f065952
Omaha #3163 Fix NPE when styleless strings are sent to 14.3
...
Former-commit-id: d2997f9fc01f8f612d3ad2997f9fc01f8f612d3a7245544e1f7245544e1f1282f7431759b5076a66991dff52d2
2014-06-13 16:49:25 -05:00
Brian.Dyke
03f8202ff2
CM-MERGE:OB13.5.6-3 into 14.1.3
...
Merge branch 'master_14.1.3_merge' into master_14.1.3
Former-commit-id: 06c565d74f30d8644fa506c565d74f30d8644fa5482f915b42482f915b42c1bd7a0c55072a4a9d63ce9ebc90f5
2014-06-13 14:05:49 -04:00
Brian.Dyke
3da13f3d12
CM-MERGE:OB13.5.6-3 into 14.1.3
...
Former-commit-id: 5064d24e26346bf852cd5064d24e26346bf852cd81832d97e581832d97e5764b7295464bca0769fb766974a05d
2014-06-13 13:21:19 -04:00
Nate Jensen
cfa8bc6903
Merge "Omaha #3263 Check for null when mosaic time matches." into omaha_14.4.1
...
Former-commit-id: 254ba2762fba2f130b13254ba2762fba2f130b13fc905ca588fc905ca58855ddf5dbe7907fc445a3198da6201c
2014-06-12 15:14:50 -05:00
Brian Clements
338f293065
Omaha #3267 fixed collaboration NPE possibility
...
Change-Id: I9bc68be7d9106396a0c369e3181e15baf25ca260
Former-commit-id: 42e6e38c2eadbffa5ddd42e6e38c2eadbffa5ddd91eb7d40c291eb7d40c2b1fac777f43bdbf79eebe13aeb0ca5
2014-06-12 15:06:46 -05:00
Ben Steffensmeier
c73ec7db64
Omaha #3263 Check for null when mosaic time matches.
...
Former-commit-id: c105de1a4c5355ca8c1cc105de1a4c5355ca8c1cdf2fed2be3df2fed2be36309145495ab616254bf5e433c9871
2014-06-12 15:00:26 -05:00
Nate Jensen
53fe673750
Merge "Omaha #2061 Remove dataURI from acars." into omaha_14.4.1
...
Former-commit-id: dd10c76b19387b0604ccdd10c76b19387b0604ccd3417d8e45d3417d8e4566c3efd7846220def0994dc987369a
2014-06-12 14:27:47 -05:00
Ben Steffensmeier
deaecfc649
Omaha #2061 Remove dataURI from acars.
...
Former-commit-id: 0a6e99e9d1f66725a5150a6e99e9d1f66725a51535ad2f2b8d35ad2f2b8d4e3a8e97fee227d408db81b4860e27
2014-06-12 13:59:45 -05:00
