Nate Jensen
d67339b3a9
Merge "Omaha #3214 added pulse and cloud flash rendering to cave" into omaha_14.4.1
...
Former-commit-id: 644fdf50c7
[formerly 644fdf50c7
[formerly 741f2710372a713c53e70602395bf7c54fd17cdf]]
Former-commit-id: caf278ca5c
Former-commit-id: 977a3818f1
2014-06-19 13:42:06 -05:00
Nate Jensen
43cdc7fccb
Omaha #3255 fix cave install of data delivery
...
Change-Id: I06820560fd6b18c4886c0b3bef993e6830037b4e
Former-commit-id: eff82573df
[formerly eff82573df
[formerly bc22cda0a2bcdb550ad4d57a9be522336d4bc633]]
Former-commit-id: f01e19946c
Former-commit-id: cb5d6fe187
2014-06-19 13:15:40 -05:00
Brian Clements
74d4ebf071
Omaha #3214 added pulse and cloud flash rendering to cave
...
Change-Id: Ibb842c0088b959e9ffc88c4db51f4c1bcc77d3ce
Former-commit-id: 7dd90e6f85
[formerly 7dd90e6f85
[formerly 136bb5feca753f83f53d9d1e9381061853edc402]]
Former-commit-id: a18069809a
Former-commit-id: 6d5cbf29a5
2014-06-19 12:50:56 -05:00
Nate Jensen
9c0adc1c15
Merge "Omaha #3255 Remove cxf from cave feature to fix build" into omaha_14.4.1
...
Former-commit-id: 66cb3d5f03
[formerly 66cb3d5f03
[formerly 73c71e83588237e0a39d173c648f68a8e35bf119]]
Former-commit-id: 27df878d86
Former-commit-id: 918e5664bb
2014-06-19 10:59:35 -05:00
Benjamin Phillippe
fb3ea7760d
Omaha #3255 Remove cxf from cave feature to fix build
...
Former-commit-id: 8d2605199e
[formerly 8d2605199e
[formerly b6f01bfe3f45ab4c3299879db44763994f7f8222]]
Former-commit-id: fc024e6d4c
Former-commit-id: a90b1891b1
2014-06-19 10:58:11 -05:00
Nate Jensen
a1467e4361
Omaha #3242 clean up more graphs
...
Change-Id: I2440877381afc684cb2a3b02cbdbe36905643de4
Former-commit-id: aca7b46243
[formerly aca7b46243
[formerly 667817cf9473889f8c5cc39dd71814f1181a3805]]
Former-commit-id: 7bb2aebd59
Former-commit-id: 33f36374d0
2014-06-18 18:23:36 -05:00
Nate Jensen
c02a5a88eb
Merge "Omaha #3242 thread safety for inset map" into omaha_14.4.1
...
Former-commit-id: 55bd088ce5
[formerly 55bd088ce5
[formerly 43684d4c0fe8f4b79ef384c08d01d2bdd51990e6]]
Former-commit-id: 835b65b7b8
Former-commit-id: 19383d86f2
2014-06-18 17:17:17 -05:00
Nate Jensen
ddae1dc541
Merge "Omaha #3242 support ensemble id in time series legends" into omaha_14.4.1
...
Former-commit-id: f0e0866155
[formerly f0e0866155
[formerly 84257c99914950f412f1e3d8c12b691fb428086f]]
Former-commit-id: fbd7e64fe2
Former-commit-id: 098712e6a0
2014-06-18 17:17:04 -05:00
Nate Jensen
a57ea807ea
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: 0db147238d
[formerly 0db147238d
[formerly 968613aaa91648a8e860eff88293744ddc00464c]]
Former-commit-id: 9a76fd4db0
Former-commit-id: 7867dc1ff6
2014-06-18 17:07:19 -05:00
Nate Jensen
3a7c95c110
Omaha #3242 thread safety for inset map
...
Change-Id: I358dfcb211444407095cd86657dee8ad522b5857
Former-commit-id: 9b98b63bb5
[formerly 9b98b63bb5
[formerly d06eedeefc7997f6c881cf267c7f24979afbd9d7]]
Former-commit-id: 30e76a1fd5
Former-commit-id: a32552846d
2014-06-18 17:02:10 -05:00
Nate Jensen
4e673d8358
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: a18fa3f026
[formerly a18fa3f026
[formerly 7999e026e8ff02ccb0f155af8770b0d8aac43339]]
Former-commit-id: 3ba4931eee
Former-commit-id: a990471021
2014-06-18 16:48:48 -05:00
Nate Jensen
4c44afbf22
Omaha #3242 fix error if user zooms on cross section before it's loaded
...
Change-Id: I9143840a5074e4e5c9995c94cb21686598d79830
Former-commit-id: 1add8fca08
[formerly 1add8fca08
[formerly 4a7eebe03c9cd84702e6cda1258503da725a10bb]]
Former-commit-id: 46c843f51a
Former-commit-id: 32038939b3
2014-06-18 16:37:49 -05:00
Nate Jensen
1d244a4a95
Omaha #3242 support ensemble id in time series legends
...
Change-Id: I7f8435d274d3981e4871a5cf726bbf69e22a0d08
Former-commit-id: 1a8995fc2d
[formerly 1a8995fc2d
[formerly 453c1eecf4f08203b4c6e2a74ad5dc366d85d359]]
Former-commit-id: e10a73c17b
Former-commit-id: a575c57ecc
2014-06-18 15:37:14 -05:00
Benjamin Phillippe
07c5831045
Omaha #3255 Fixing Build
...
Former-commit-id: 621a3f1a5c
[formerly 621a3f1a5c
[formerly a2a18d6f4a9f536172c264eeeee3ff51e225981f]]
Former-commit-id: 7e7cecceea
Former-commit-id: f6dc8523d7
2014-06-18 13:57:27 -05:00
Nate Jensen
5d1cf81f99
Merge "Omaha #3255 Dependency cleanup" into omaha_14.4.1
...
Former-commit-id: 042b69ba9a
[formerly 042b69ba9a
[formerly b209ae6772fe33ca73a130468c4c314f86ffeba5]]
Former-commit-id: 9fd4e4a8d9
Former-commit-id: 806b3b1490
2014-06-18 12:14:45 -05:00
Nate Jensen
7872e29f1b
Merge "Omaha #3274 fix generation of viz .ini files" into omaha_14.4.1
...
Former-commit-id: b3e73d78cc
[formerly b3e73d78cc
[formerly 5d378ca9529b48bd0a1422aec3263310f8350161]]
Former-commit-id: 32bc3e4056
Former-commit-id: c59136990b
2014-06-18 11:11:34 -05:00
Nate Jensen
4129bd518d
Omaha #3274 fix generation of viz .ini files
...
Change-Id: I5ca9b02310cd068df5ee30acf47396070142dfc7
Former-commit-id: 465a0fef71
[formerly 465a0fef71
[formerly dd628b80f7798bb66d3c54568b9549e66870ddec]]
Former-commit-id: 17dc45e7ca
Former-commit-id: a9fc46a6fb
2014-06-18 10:03:17 -05:00
Benjamin Phillippe
5d908f2288
Omaha #3255 Dependency cleanup
...
Change-Id: Ic405d8f4fbe3f778d7e542529d566678c445647e
Former-commit-id: 270caaadde
[formerly 270caaadde
[formerly dbac62df979f23402594dc6439b53e7884ea1bd1]]
Former-commit-id: c2ed8a39d1
Former-commit-id: 447fb0572a
2014-06-18 09:54:40 -05:00
Steve Harris
545d6da097
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: cc7e6bc52a
[formerly cc7e6bc52a
[formerly da50f581c90ea0cca5f43c45c44cb8ac045a6c8c]]
Former-commit-id: 676948e239
Former-commit-id: 18b2a1df08
2014-06-18 08:52:25 -05:00
Nate Jensen
7011f15929
Merge "Omaha #3078 collaboration shared display data over private chat" into omaha_14.4.1
...
Former-commit-id: a2783be56a
[formerly a2783be56a
[formerly 4468390aaf89456e93b45fca20aeca7fb96d8c12]]
Former-commit-id: 764f977bf6
Former-commit-id: bc5cedb1c8
2014-06-17 18:09:33 -05:00
Nate Jensen
f94209e681
Merge "Omaha #3245 fix GFE starting without a cave data" into omaha_14.4.1
...
Former-commit-id: dcab909b4b
[formerly dcab909b4b
[formerly c632bf24ee15cc85da9d7e7fb0a295912bf06b78]]
Former-commit-id: 7fc256d076
Former-commit-id: a499624f5f
2014-06-17 17:01:46 -05:00
Brian Clements
48e634b14a
Issue #2903 prevent shared display crash from missing point style enum value
...
Change-Id: I9d3faccba56c2832c5dcc185c6c20bcce396b173
Former-commit-id: 9946f78241
[formerly 9946f78241
[formerly 5d298b39786d37aa365ccfe2c337214d1e46f1a9]]
Former-commit-id: 5d03048fff
Former-commit-id: 59d92634b0
2014-06-17 17:01:23 -05:00
Nate Jensen
e59c180fdc
Omaha #3245 fix GFE starting without a cave data
...
Change-Id: I61e9766bccd099619bfedfd9a1e1121fe63120d7
Former-commit-id: 19aa9dc96e
[formerly 19aa9dc96e
[formerly 539d497c5fc80efd5099e76a9e95a4709ace041d]]
Former-commit-id: 8ab7d86a8f
Former-commit-id: 451b265ce6
2014-06-17 16:31:20 -05:00
Nate Jensen
181da0bc6a
Merge "Omaha #3078 added private chat to collaboration" into omaha_14.4.1
...
Former-commit-id: 7fb85a1acc
[formerly 7fb85a1acc
[formerly 2c2b3891003076484539ef5fa7d6772b6336c635]]
Former-commit-id: c05ae83ea2
Former-commit-id: 0d71d5dc2b
2014-06-17 16:24:42 -05:00
Brian Clements
a993d1f90a
Omaha #3078 collaboration shared display data over private chat
...
Change-Id: I0ede9310eb109adc1b08673027e9e36a68a09fbf
Former-commit-id: 9a427606ae
[formerly 9a427606ae
[formerly a51847aff197f805a4e48c9ecdb0c16f874e6a78]]
Former-commit-id: add8286d52
Former-commit-id: 06b7415cec
2014-06-17 14:32:17 -05:00
Nate Jensen
479ccb41f4
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: d8dc6eceef
[formerly d8dc6eceef
[formerly 6efd831efcc5372c7e7bfd52265d13de382407ee]]
Former-commit-id: acd7620d7a
Former-commit-id: 485aced54c
2014-06-17 14:21:55 -05:00
Ron Anderson
b6f47567b2
Merge "Omaha #3274 switch viz to G1 garbage collector" into omaha_14.4.1
...
Former-commit-id: d5c2170a20
[formerly d5c2170a20
[formerly a971a5b1d27611c8b3a9a47b76efafa0c2c7a9fc]]
Former-commit-id: 855b4ad7c1
Former-commit-id: 79c6182cc9
2014-06-17 13:54:11 -05:00
Ron Anderson
2728191963
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: b7843361f6
[formerly b7843361f6
[formerly 0cf0e93eabd440cf0ca3e88ac36c62b3309b6527]]
Former-commit-id: 1a8ccd0181
Former-commit-id: e31eabe77b
2014-06-17 13:46:38 -05:00
Brian Clements
4433482d56
Omaha #3078 added private chat to collaboration
...
Change-Id: Ifcc4a33c1551e4209721fcc181b0becb49bdb5ae
Former-commit-id: 37699395ef
[formerly 37699395ef
[formerly 93f7d7088e7d7888a878558c6f2fcc368bf3ab05]]
Former-commit-id: 97a6f5bfe8
Former-commit-id: 60508bf674
2014-06-17 11:52:58 -05:00
Nate Jensen
fe47ecf6ce
Omaha #3274 switch viz to G1 garbage collector
...
Change-Id: I720c4ebb21bd3a37dcc71f8879bb96edb6a0b109
Former-commit-id: 4a91c3320b
[formerly 4a91c3320b
[formerly 0355813f030ac996427c64dfcb6cbd4dd781ad2f]]
Former-commit-id: 44cb0e6ae6
Former-commit-id: 3981241355
2014-06-17 10:54:57 -05:00
Brian Clements
616315d830
Omaha #3288 collaboration feed venue config comes from server
...
Change-Id: I5bc747507e44cc31093d7a7f470a263d0cf116c0
Former-commit-id: b6a2bf0ae4
[formerly b6a2bf0ae4
[formerly baab2ea12e1117446295ae60bc06228eb6139895]]
Former-commit-id: 84e3f967d9
Former-commit-id: 5436efb886
2014-06-17 09:26:24 -05:00
Nate Jensen
ea80faede7
Merge "Omaha #2061 Remove references to IDecoderGettable.Amount from Range Rings." into omaha_14.4.1
...
Former-commit-id: b1acd1709a
[formerly b1acd1709a
[formerly 2ee54c1f78136332f1cd2c40da0c2e7953510e7f]]
Former-commit-id: 9b7ed95e6b
Former-commit-id: 521065548d
2014-06-16 09:26:30 -05:00
Nate Jensen
35ed3931c3
Merge "Omaha #3265 Fix potential NPE in D2D time matching." into omaha_14.4.1
...
Former-commit-id: 5fad6501a7
[formerly 5fad6501a7
[formerly 83d1a4b6e69e3fe1bb350beba4f36eb3bf34e05d]]
Former-commit-id: b3df7745d4
Former-commit-id: 752fe50104
2014-06-16 09:00:47 -05:00
Nate Jensen
e01ddac6ad
Merge "Omaha #3163 Fix NPE when styleless strings are sent to 14.3" into omaha_14.4.1
...
Former-commit-id: 181a87e72d
[formerly 181a87e72d
[formerly 34250721f97f05be61e9e4e8b6f71758347a9f60]]
Former-commit-id: 5908a4501a
Former-commit-id: 442a3d9683
2014-06-16 09:00:39 -05:00
Nate Jensen
48496aeb9b
Merge "Issue #2903 changed collaboration jaxb xml to be base64 encoded" into omaha_14.3.1
...
Former-commit-id: c2aa87470d
[formerly c2aa87470d
[formerly 93f63c0d42941001e4d59a4840df5e5b525592bf]]
Former-commit-id: ed36453f09
Former-commit-id: ef61539a8a
2014-06-16 08:31:30 -05:00
Steve Harris
8270fd8a9f
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: 9213369739
[formerly 9213369739
[formerly 48a7eabebb78db9b97201c44ff5c71af3ee78de7]]
Former-commit-id: e1c8ad2611
Former-commit-id: 362988b9d7
2014-06-16 08:19:12 -05:00
Ben Steffensmeier
07f36a59a7
Omaha #3265 Fix potential NPE in D2D time matching.
...
Former-commit-id: 81fbf3b697
[formerly 81fbf3b697
[formerly 9fea363e4fd21f2e9dc06b9450b71eb174dd0a29]]
Former-commit-id: 29b423645e
Former-commit-id: b0ff6298f1
2014-06-13 16:58:35 -05:00
Ben Steffensmeier
991dff52d2
Omaha #3163 Fix NPE when styleless strings are sent to 14.3
...
Former-commit-id: 1f8f612d3a
[formerly 1f8f612d3a
[formerly 3c1dd0e7daea7149a02b1a5e2be1a0db27e662d5]]
Former-commit-id: 7245544e1f
Former-commit-id: 59b5076a66
2014-06-13 16:49:25 -05:00
Nate Jensen
198da6201c
Merge "Omaha #3263 Check for null when mosaic time matches." into omaha_14.4.1
...
Former-commit-id: ba2f130b13
[formerly ba2f130b13
[formerly c8f486ed32dfffff69ff9e9fefe1320c4ec009f4]]
Former-commit-id: fc905ca588
Former-commit-id: 907fc445a3
2014-06-12 15:14:50 -05:00
Brian Clements
e13aeb0ca5
Omaha #3267 fixed collaboration NPE possibility
...
Change-Id: I9bc68be7d9106396a0c369e3181e15baf25ca260
Former-commit-id: adbffa5ddd
[formerly adbffa5ddd
[formerly a23e57f3d1a6f4213216a7e038b85b17b6628faa]]
Former-commit-id: 91eb7d40c2
Former-commit-id: 3bdbf79eeb
2014-06-12 15:06:46 -05:00
Ben Steffensmeier
5e433c9871
Omaha #3263 Check for null when mosaic time matches.
...
Former-commit-id: 5355ca8c1c
[formerly 5355ca8c1c
[formerly 913d70b860c1f129d1632dfd1d84e5fbcca5e2d9]]
Former-commit-id: df2fed2be3
Former-commit-id: ab616254bf
2014-06-12 15:00:26 -05:00
Nate Jensen
4dc987369a
Merge "Omaha #2061 Remove dataURI from acars." into omaha_14.4.1
...
Former-commit-id: 387b0604cc
[formerly 387b0604cc
[formerly 6e2588a672ceb81a922be9fcdac9a4212376ed5f]]
Former-commit-id: d3417d8e45
Former-commit-id: 6220def099
2014-06-12 14:27:47 -05:00
Ben Steffensmeier
81b4860e27
Omaha #2061 Remove dataURI from acars.
...
Former-commit-id: f66725a515
[formerly f66725a515
[formerly e8b5ea58ca12878922be01c815a354703f5f4387]]
Former-commit-id: 35ad2f2b8d
Former-commit-id: e227d408db
2014-06-12 13:59:45 -05:00
Nate Jensen
0a893a8692
Omaha #3270 fix warngen manifest's register buddy
...
Change-Id: I273bc344c60fb4c824241a28949a1ce9fb3020a2
Former-commit-id: 31b3029e02
[formerly 31b3029e02
[formerly 796e242b031087e08b9ba5e44664d6b400405c42]]
Former-commit-id: 305564d6f0
Former-commit-id: 0b185c3b6c
2014-06-12 13:58:27 -05:00
Brian Clements
649d0cf43f
Issue #2903 changed collaboration jaxb xml to be base64 encoded
...
Change-Id: I0de0db3bf455a14d747520f34ef66d986815e42c
Former-commit-id: 5424eb0258
[formerly 5424eb0258
[formerly afcfdf1ed08cd64deb085b909f0965e4ab68d92d]]
Former-commit-id: ef0ecfd1d4
Former-commit-id: 9e39c19a7d
2014-06-12 13:40:33 -05:00
Nate Jensen
576fc405e5
Merge "Omaha #3269 - Fix editing of Notifiers before saving Amend - Remove save confirmation dialog, rename buttons" into omaha_14.4.1
...
Former-commit-id: 4ac8246386
[formerly 4ac8246386
[formerly 88280dedea4b6065a5603ac26e982eab0a2e0e72]]
Former-commit-id: f118e1b0e9
Former-commit-id: 343b88e3b3
2014-06-12 12:36:14 -05:00
Richard Peter
52b9f0107f
Merge "Omaha #3231 - Added 16 km Puerto Rico grid (AWIPS grid 200)." into omaha_14.4.1
...
Former-commit-id: df86770b4e
[formerly df86770b4e
[formerly 3285557835e929a6b7048f4445d1da45ae8e1325]]
Former-commit-id: 7731e25983
Former-commit-id: 40e2813f50
2014-06-12 12:35:24 -05:00
Nate Jensen
7fac05ac42
Omaha #3247 upgrade build.cave's xalan jar
...
Change-Id: Idd4e0d583ef4ad91bcde99278e3e035f1f12e434
Former-commit-id: d4471bf759
[formerly d4471bf759
[formerly c2d32dddb2bba04b46099d8745ff541989e1a281]]
Former-commit-id: 95fe41966a
Former-commit-id: a6fa27a1b8
2014-06-12 11:38:22 -05:00
Slav Korolev
a66dd879c7
Omaha #3231 - Added 16 km Puerto Rico grid (AWIPS grid 200).
...
Former-commit-id: 2b877529ce
[formerly 2b877529ce
[formerly 0172e8f27b646a965e472f969f112a4e170d9f41]]
Former-commit-id: 16ec392c12
Former-commit-id: d8ebeb4778
2014-06-12 12:24:34 -04:00
Mike Duff
5e0aa25048
Omaha #3269 - Fix editing of Notifiers before saving
...
Amend - Remove save confirmation dialog, rename buttons
Change-Id: I0dd81db4c74d07f0535341fc410c288b077463c4
Former-commit-id: 80922824a3
[formerly 80922824a3
[formerly 47d57692c81757a8b8c0d3217e21f701f18cdf2c]]
Former-commit-id: c920a24300
Former-commit-id: b15b6514fd
2014-06-12 11:21:15 -05:00