Commit graph

6128 commits

Author SHA1 Message Date
Nate Jensen
a32552846d Omaha #3242 thread safety for inset map
Change-Id: I358dfcb211444407095cd86657dee8ad522b5857

Former-commit-id: 9b98b63bb5 [formerly d06eedeefc7997f6c881cf267c7f24979afbd9d7]
Former-commit-id: 30e76a1fd5
2014-06-18 17:02:10 -05:00
Nate Jensen
a990471021 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 7999e026e8ff02ccb0f155af8770b0d8aac43339]
Former-commit-id: 3ba4931eee
2014-06-18 16:48:48 -05:00
Nate Jensen
32038939b3 Omaha #3242 fix error if user zooms on cross section before it's loaded
Change-Id: I9143840a5074e4e5c9995c94cb21686598d79830

Former-commit-id: 1add8fca08 [formerly 4a7eebe03c9cd84702e6cda1258503da725a10bb]
Former-commit-id: 46c843f51a
2014-06-18 16:37:49 -05:00
Nate Jensen
a575c57ecc Omaha #3242 support ensemble id in time series legends
Change-Id: I7f8435d274d3981e4871a5cf726bbf69e22a0d08

Former-commit-id: 1a8995fc2d [formerly 453c1eecf4f08203b4c6e2a74ad5dc366d85d359]
Former-commit-id: e10a73c17b
2014-06-18 15:37:14 -05:00
Benjamin Phillippe
4bb4c753ba Omaha #3255 Fix build
Former-commit-id: 3864eb622e [formerly cd985e372ebdd705e1e93c4760fc02f229ddfddd]
Former-commit-id: bc9e7f1cb3
2014-06-18 14:03:23 -05:00
Benjamin Phillippe
f6dc8523d7 Omaha #3255 Fixing Build
Former-commit-id: 621a3f1a5c [formerly a2a18d6f4a9f536172c264eeeee3ff51e225981f]
Former-commit-id: 7e7cecceea
2014-06-18 13:57:27 -05:00
Nate Jensen
806b3b1490 Merge "Omaha #3255 Dependency cleanup" into omaha_14.4.1
Former-commit-id: 042b69ba9a [formerly b209ae6772fe33ca73a130468c4c314f86ffeba5]
Former-commit-id: 9fd4e4a8d9
2014-06-18 12:14:45 -05:00
Ben Steffensmeier
49fc12968f Omaha #2061 Remove another reference to IDecoderGettable.
Former-commit-id: cc72f9d983 [formerly bdca92f18fa4a7348dd82d9f2348583398dd5c30]
Former-commit-id: 7b356e8ce0
2014-06-18 12:12:01 -05:00
Nate Jensen
c59136990b Merge "Omaha #3274 fix generation of viz .ini files" into omaha_14.4.1
Former-commit-id: b3e73d78cc [formerly 5d378ca9529b48bd0a1422aec3263310f8350161]
Former-commit-id: 32bc3e4056
2014-06-18 11:11:34 -05:00
Nate Jensen
a9fc46a6fb Omaha #3274 fix generation of viz .ini files
Change-Id: I5ca9b02310cd068df5ee30acf47396070142dfc7

Former-commit-id: 465a0fef71 [formerly dd628b80f7798bb66d3c54568b9549e66870ddec]
Former-commit-id: 17dc45e7ca
2014-06-18 10:03:17 -05:00
Benjamin Phillippe
447fb0572a Omaha #3255 Dependency cleanup
Change-Id: Ic405d8f4fbe3f778d7e542529d566678c445647e

Former-commit-id: 270caaadde [formerly dbac62df979f23402594dc6439b53e7884ea1bd1]
Former-commit-id: c2ed8a39d1
2014-06-18 09:54:40 -05:00
Steve Harris
18b2a1df08 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 da50f581c90ea0cca5f43c45c44cb8ac045a6c8c]
Former-commit-id: 676948e239
2014-06-18 08:52:25 -05:00
Nate Jensen
bc5cedb1c8 Merge "Omaha #3078 collaboration shared display data over private chat" into omaha_14.4.1
Former-commit-id: a2783be56a [formerly 4468390aaf89456e93b45fca20aeca7fb96d8c12]
Former-commit-id: 764f977bf6
2014-06-17 18:09:33 -05:00
Nate Jensen
a499624f5f Merge "Omaha #3245 fix GFE starting without a cave data" into omaha_14.4.1
Former-commit-id: dcab909b4b [formerly c632bf24ee15cc85da9d7e7fb0a295912bf06b78]
Former-commit-id: 7fc256d076
2014-06-17 17:01:46 -05:00
Brian Clements
59d92634b0 Issue #2903 prevent shared display crash from missing point style enum value
Change-Id: I9d3faccba56c2832c5dcc185c6c20bcce396b173

Former-commit-id: 9946f78241 [formerly 5d298b39786d37aa365ccfe2c337214d1e46f1a9]
Former-commit-id: 5d03048fff
2014-06-17 17:01:23 -05:00
Nate Jensen
451b265ce6 Omaha #3245 fix GFE starting without a cave data
Change-Id: I61e9766bccd099619bfedfd9a1e1121fe63120d7

Former-commit-id: 19aa9dc96e [formerly 539d497c5fc80efd5099e76a9e95a4709ace041d]
Former-commit-id: 8ab7d86a8f
2014-06-17 16:31:20 -05:00
Nate Jensen
0d71d5dc2b Merge "Omaha #3078 added private chat to collaboration" into omaha_14.4.1
Former-commit-id: 7fb85a1acc [formerly 2c2b3891003076484539ef5fa7d6772b6336c635]
Former-commit-id: c05ae83ea2
2014-06-17 16:24:42 -05:00
Brian Clements
06b7415cec Omaha #3078 collaboration shared display data over private chat
Change-Id: I0ede9310eb109adc1b08673027e9e36a68a09fbf

Former-commit-id: 9a427606ae [formerly a51847aff197f805a4e48c9ecdb0c16f874e6a78]
Former-commit-id: add8286d52
2014-06-17 14:32:17 -05:00
Nate Jensen
485aced54c 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 6efd831efcc5372c7e7bfd52265d13de382407ee]
Former-commit-id: acd7620d7a
2014-06-17 14:21:55 -05:00
Ron Anderson
79c6182cc9 Merge "Omaha #3274 switch viz to G1 garbage collector" into omaha_14.4.1
Former-commit-id: d5c2170a20 [formerly a971a5b1d27611c8b3a9a47b76efafa0c2c7a9fc]
Former-commit-id: 855b4ad7c1
2014-06-17 13:54:11 -05:00
Ron Anderson
e31eabe77b 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 0cf0e93eabd440cf0ca3e88ac36c62b3309b6527]
Former-commit-id: 1a8ccd0181
2014-06-17 13:46:38 -05:00
Brian Clements
60508bf674 Omaha #3078 added private chat to collaboration
Change-Id: Ifcc4a33c1551e4209721fcc181b0becb49bdb5ae

Former-commit-id: 37699395ef [formerly 93f7d7088e7d7888a878558c6f2fcc368bf3ab05]
Former-commit-id: 97a6f5bfe8
2014-06-17 11:52:58 -05:00
Nate Jensen
3d2de14300 Merge "Omaha #3288 collaboration feed venue config comes from server" into omaha_14.4.1
Former-commit-id: 812f679b22 [formerly 615a1baccb5f263bd29a5e4a6da95f1a8c6e6568]
Former-commit-id: d334c16d1c
2014-06-17 11:19:03 -05:00
Nate Jensen
3981241355 Omaha #3274 switch viz to G1 garbage collector
Change-Id: I720c4ebb21bd3a37dcc71f8879bb96edb6a0b109

Former-commit-id: 4a91c3320b [formerly 0355813f030ac996427c64dfcb6cbd4dd781ad2f]
Former-commit-id: 44cb0e6ae6
2014-06-17 10:54:57 -05:00
Brian Clements
5436efb886 Omaha #3288 collaboration feed venue config comes from server
Change-Id: I5bc747507e44cc31093d7a7f470a263d0cf116c0

Former-commit-id: b6a2bf0ae4 [formerly baab2ea12e1117446295ae60bc06228eb6139895]
Former-commit-id: 84e3f967d9
2014-06-17 09:26:24 -05:00
Nate Jensen
ec83717594 Omaha #3255 attempt to fix build
Change-Id: I8b21eaebaa60a7051ccbc9d12d33df742c471f25

Former-commit-id: bc48674092 [formerly 4e8c5f881272ed8d7aea30cd8316ebcbdd2443c3]
Former-commit-id: 3c57231c82
2014-06-17 08:42:29 -05:00
Nate Jensen
9cd933cc7b Omaha #3255 fix build
Change-Id: I0bff28eb7d430c7a789539a76c893ecf0a64ac46

Former-commit-id: a8bae916f3 [formerly 579cef6ab063bae1df0cfe85411d174dc75b08bd]
Former-commit-id: c65c392d63
2014-06-17 07:40:18 -05:00
Ben Steffensmeier
50a1fd7cf9 Omaha #2061 Update ncep copies of radar resources.
Former-commit-id: 14b5c0d792 [formerly 64b5e484c0dd8409ab0b791763c31681c94a38d3]
Former-commit-id: 8064a74866
2014-06-16 10:56:40 -05:00
Nate Jensen
521065548d Merge "Omaha #2061 Remove references to IDecoderGettable.Amount from Range Rings." into omaha_14.4.1
Former-commit-id: b1acd1709a [formerly 2ee54c1f78136332f1cd2c40da0c2e7953510e7f]
Former-commit-id: 9b7ed95e6b
2014-06-16 09:26:30 -05:00
Nate Jensen
752fe50104 Merge "Omaha #3265 Fix potential NPE in D2D time matching." into omaha_14.4.1
Former-commit-id: 5fad6501a7 [formerly 83d1a4b6e69e3fe1bb350beba4f36eb3bf34e05d]
Former-commit-id: b3df7745d4
2014-06-16 09:00:47 -05:00
Nate Jensen
442a3d9683 Merge "Omaha #3163 Fix NPE when styleless strings are sent to 14.3" into omaha_14.4.1
Former-commit-id: 181a87e72d [formerly 34250721f97f05be61e9e4e8b6f71758347a9f60]
Former-commit-id: 5908a4501a
2014-06-16 09:00:39 -05:00
Greg Armendariz
5c8c3ba6b3 Merge "Omaha #3247 - Update qpid dependency" into omaha_14.4.1
Former-commit-id: faebbc13f7 [formerly 2484a3407392f64b51b93bd3a4dab04194debea5]
Former-commit-id: 8c568a223e
2014-06-16 08:57:12 -05:00
Nate Jensen
ef61539a8a Merge "Issue #2903 changed collaboration jaxb xml to be base64 encoded" into omaha_14.3.1
Former-commit-id: c2aa87470d [formerly 93f63c0d42941001e4d59a4840df5e5b525592bf]
Former-commit-id: ed36453f09
2014-06-16 08:31:30 -05:00
Steve Harris
362988b9d7 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 48a7eabebb78db9b97201c44ff5c71af3ee78de7]
Former-commit-id: e1c8ad2611
2014-06-16 08:19:12 -05:00
Steve Harris
7a8741d8fa Merge branch 'master_14.3.1' (14.3.1-10,11) into omaha_14.3.1
Former-commit-id: 1d2b8aeb7b [formerly 4041e8afbb4bf1c0c416624140d74d27e963f9c8]
Former-commit-id: 6c82cc5c3d
2014-06-16 07:49:58 -05:00
Greg Armendariz
d2f9344b5f Omaha #3247 - Update qpid dependency
Former-commit-id: db4e94b713 [formerly 9a6a0c9941aaa9b49da7329cccb7e05456ad514c]
Former-commit-id: 70104bc9aa
2014-06-14 08:13:14 -05:00
Ben Steffensmeier
b0ff6298f1 Omaha #3265 Fix potential NPE in D2D time matching.
Former-commit-id: 81fbf3b697 [formerly 9fea363e4fd21f2e9dc06b9450b71eb174dd0a29]
Former-commit-id: 29b423645e
2014-06-13 16:58:35 -05:00
Ben Steffensmeier
59b5076a66 Omaha #3163 Fix NPE when styleless strings are sent to 14.3
Former-commit-id: 1f8f612d3a [formerly 3c1dd0e7daea7149a02b1a5e2be1a0db27e662d5]
Former-commit-id: 7245544e1f
2014-06-13 16:49:25 -05:00
Benjamin Phillippe
e53e82e5c0 Omaha #3255 Fix Build
Former-commit-id: a22c77cbfb [formerly 6a4e388f9778101d5edd6a1b8ee1d1dc41e422b6]
Former-commit-id: 63d104d18d
2014-06-13 11:17:55 -05:00
Benjamin Phillippe
e3f37f8ddd Omaha #3255 Fix Build
Former-commit-id: 0baf11790f [formerly 3182016dc2a85aef65a6f715dc1ed5e60bedb27d]
Former-commit-id: 493302f63b
2014-06-13 10:55:23 -05:00
Ron Anderson
47ec04766d Merge "Omaha #3244 Improved GFE purge error handling" into omaha_14.4.1
Former-commit-id: ee21383c07 [formerly a4102501a895730d99e03b6fbafe0e7152b198cd]
Former-commit-id: 97c35aacd2
2014-06-13 10:45:48 -05:00
Ron Anderson
4b4638c5a9 Merge "Omaha #3262 smarter detection of java packages/classes" into omaha_14.4.1
Former-commit-id: 00eac78a02 [formerly d02af9d53b1f00d21f3d7ef92c54a930d13441ae]
Former-commit-id: 8857dfe49a
2014-06-12 18:19:25 -05:00
Richard Peter
458ead4d6b Merge "Omaha #3229 added bufr buoy support" into omaha_14.4.1
Former-commit-id: 9f2854abe8 [formerly e5d608a8977a62143bf487737e1852cd43776cfd]
Former-commit-id: 7a750bc86a
2014-06-12 16:50:20 -05:00
Richard Peter
601a4c7ee0 Merge "Omaha #3280 Sister ticket to 3141 for DD repo. Setup SOAP metadata transfers for DPA" into omaha_14.4.1
Former-commit-id: b630aa2971 [formerly 5dab0d8232781688132d7df0710a86ea98f93810]
Former-commit-id: 418ad24111
2014-06-12 16:50:09 -05:00
Benjamin Phillippe
13549f05d8 Omaha #3255 Fixing bundle version to fix build
Former-commit-id: 7da0490ede [formerly 5201bd2f8cc36c2dd39ac7bab51693affa5e6da1]
Former-commit-id: ed5a7a50f2
2014-06-12 16:39:25 -05:00
Nate Jensen
907fc445a3 Merge "Omaha #3263 Check for null when mosaic time matches." into omaha_14.4.1
Former-commit-id: ba2f130b13 [formerly c8f486ed32dfffff69ff9e9fefe1320c4ec009f4]
Former-commit-id: fc905ca588
2014-06-12 15:14:50 -05:00
Brian Clements
3bdbf79eeb Omaha #3267 fixed collaboration NPE possibility
Change-Id: I9bc68be7d9106396a0c369e3181e15baf25ca260

Former-commit-id: adbffa5ddd [formerly a23e57f3d1a6f4213216a7e038b85b17b6628faa]
Former-commit-id: 91eb7d40c2
2014-06-12 15:06:46 -05:00
Ben Steffensmeier
ab616254bf Omaha #3263 Check for null when mosaic time matches.
Former-commit-id: 5355ca8c1c [formerly 913d70b860c1f129d1632dfd1d84e5fbcca5e2d9]
Former-commit-id: df2fed2be3
2014-06-12 15:00:26 -05:00
Nate Jensen
6220def099 Merge "Omaha #2061 Remove dataURI from acars." into omaha_14.4.1
Former-commit-id: 387b0604cc [formerly 6e2588a672ceb81a922be9fcdac9a4212376ed5f]
Former-commit-id: d3417d8e45
2014-06-12 14:27:47 -05:00
Nate Jensen
ed46d95f35 Merge "Omaha #3270 fix warngen manifest's register buddy" into omaha_14.4.1
Former-commit-id: 2ef1293724 [formerly 6bc86288772152802b164382293f040691fcc262]
Former-commit-id: 6ce08839d8
2014-06-12 14:20:47 -05:00