Commit graph

3241 commits

Author SHA1 Message Date
Max Schenkelberg
ba19a58428 Issue #2189 Set size properly on GLFont
Change-Id: Ib7321dfada582f4cbb05416428bd0c9639a905f7

Former-commit-id: 1e4fe87002 [formerly 970f2c1373] [formerly 1e4fe87002 [formerly 970f2c1373] [formerly 564d6ee664 [formerly 77d6ace9b601558ece1bf5ea724ef2f08df0112a]]]
Former-commit-id: 564d6ee664
Former-commit-id: e1c5959762 [formerly ef01f6db81]
Former-commit-id: 9101a9e190
2013-07-26 13:14:48 -05:00
Nate Jensen
a31a515ede Merge "Issue #2199 Fixed subgridding calculation and made so data smoothing is done once instead of every paint" into development
Former-commit-id: 1c564eeaad [formerly d5158a3fd5] [formerly 1c564eeaad [formerly d5158a3fd5] [formerly 4f8cf1230f [formerly 3d3e29b59fdac2e97d9783e1b102fe3227c4197d]]]
Former-commit-id: 4f8cf1230f
Former-commit-id: a8b2d95ba0 [formerly 65dc8671f7]
Former-commit-id: 17d5768f7b
2013-07-25 13:22:37 -05:00
Max Schenkelberg
f79466a524 Issue #2199 Fixed subgridding calculation and made so data smoothing is done once instead of every paint
Amend: Added comments

Change-Id: Ieb045b1a8f8271adba804cacd6f47996ffae4cf5

Former-commit-id: 439c8040c9 [formerly d3df3e97c8] [formerly 439c8040c9 [formerly d3df3e97c8] [formerly 3506c5d38d [formerly 2cc61515015e125816b76c560900744258dbd2f1]]]
Former-commit-id: 3506c5d38d
Former-commit-id: b4807c9831 [formerly dafbad884d]
Former-commit-id: b557b5d141
2013-07-25 13:18:46 -05:00
Nate Jensen
820150deb3 Issue #2208 moving edex unit tests to tests project
Change-Id: I9189ebd225df930d021855c19d338e74af800702

Former-commit-id: 2103294b75 [formerly 8d1e19f2df] [formerly 2103294b75 [formerly 8d1e19f2df] [formerly 15fae243c9 [formerly 37c1d3c5b1a60260a537951c8a4bbceef4204029]]]
Former-commit-id: 15fae243c9
Former-commit-id: be35d04928 [formerly fd38b63609]
Former-commit-id: 52dfbc9f9f
2013-07-25 12:29:46 -05:00
Richard Peter
b784aadcff Merge "Issue #2216 Removetime stamp filer when copying to a hdf5 file." into development
Former-commit-id: edd3f92a2e [formerly 766dc280e6] [formerly edd3f92a2e [formerly 766dc280e6] [formerly 37b87b0a6f [formerly d69fb813113fbaf92400e90bfd63e7de2a65b639]]]
Former-commit-id: 37b87b0a6f
Former-commit-id: fcb150ef7d [formerly 7a5327af97]
Former-commit-id: 7dfd04ed1e
2013-07-25 10:55:39 -05:00
Nate Jensen
ba33284648 Merge "Issue #2203 synchronize init and dispose of frames" into development
Former-commit-id: 989ce29e03 [formerly 9ad16f084a] [formerly 989ce29e03 [formerly 9ad16f084a] [formerly 1bb0208372 [formerly dff57efeb2c54cffc5caf61a50bf954cc39bdc37]]]
Former-commit-id: 1bb0208372
Former-commit-id: f84d36038c [formerly 294a8d0d38]
Former-commit-id: cf26f59d5f
2013-07-25 10:02:42 -05:00
Nate Jensen
a229db50f0 Merge "Issue #2189 Added a FontType option when initializing a font from a file." into development
Former-commit-id: ca729f1c49 [formerly c8d7c9cdf9] [formerly ca729f1c49 [formerly c8d7c9cdf9] [formerly 7b1d8cb576 [formerly a17330cc596961b4b3630579631de438f971c884]]]
Former-commit-id: 7b1d8cb576
Former-commit-id: 94cb066d8c [formerly 29e7454a4f]
Former-commit-id: 90866d6c06
2013-07-24 17:01:06 -05:00
Max Schenkelberg
fddc9ce779 Issue #2189 Added a FontType option when initializing a font from a file.
Amend: Added abstract awt font class, deprecated initializeFont not specifying FontType, added comments

Change-Id: Ia5608cb7ffd0b760b3922e65107e66c971fa3e63

Former-commit-id: 52110961b4 [formerly c386533867] [formerly 52110961b4 [formerly c386533867] [formerly 3381c0016e [formerly 9250700e425983156dd2d226556647d6a2bf43af]]]
Former-commit-id: 3381c0016e
Former-commit-id: 473c2f2659 [formerly a8972da606]
Former-commit-id: 2efabffe80
2013-07-24 16:35:50 -05:00
Nate Jensen
027acec4ab Issue #2203 synchronize init and dispose of frames
Change-Id: I94504a039f321ff40830b3bb7e21d31bf586a0d0

Former-commit-id: f556c7191b [formerly b053fea59b] [formerly f556c7191b [formerly b053fea59b] [formerly 162a1ba48f [formerly ed75a28d871dc1e97717fa44636df635eed8b4fc]]]
Former-commit-id: 162a1ba48f
Former-commit-id: 52e1262094 [formerly ac310f7bbf]
Former-commit-id: a6943514a7
2013-07-24 16:17:43 -05:00
Roger Ferrel
52ad86b071 Issue #2216 Removetime stamp filer when copying to a hdf5 file.
Change-Id: Ib3ff230e410a73ea63c5d5f5dc2a27efa663921f

Former-commit-id: ded6102f7d [formerly 47632854c3] [formerly ded6102f7d [formerly 47632854c3] [formerly e90ec9184c [formerly ec1c371beb034e8ea256c18b7da074cabebe56f4]]]
Former-commit-id: e90ec9184c
Former-commit-id: d6e54addf1 [formerly b9bcc23b96]
Former-commit-id: bf6acd3414
2013-07-24 15:21:18 -05:00
Richard Peter
192cf864af Merge "Issue #1655 - Delta Scripts for adding ddsystemstatus table." into development
Former-commit-id: bfc288965c [formerly d0fb138b5e] [formerly bfc288965c [formerly d0fb138b5e] [formerly 56c16fc15b [formerly 6d4b225142a86cbffb50af02127a96edddef3d96]]]
Former-commit-id: 56c16fc15b
Former-commit-id: 3ada8d3a05 [formerly 9c4070b8d5]
Former-commit-id: 243dcc2621
2013-07-24 13:47:17 -05:00
Nate Jensen
49ef86992f Merge "Issue #2032 move warngen files out of build.edex" into development
Former-commit-id: 3dc28df1e7 [formerly b300d9a847] [formerly 3dc28df1e7 [formerly b300d9a847] [formerly 90646a6cb9 [formerly b81e696e390e7d46939e546661a56d23b7c965cf]]]
Former-commit-id: 90646a6cb9
Former-commit-id: fe41d0e590 [formerly f5ab274c2c]
Former-commit-id: a11d6376cf
2013-07-24 12:53:48 -05:00
Bryan Kowal
f4914052e5 Merge "Issue #2164 - disable build of awips2-notification temporarily." into development
Former-commit-id: 45b521958e [formerly 990b162124] [formerly 45b521958e [formerly 990b162124] [formerly d0b6aeba28 [formerly 619acd4183c8f5a6d856bcf6174161b769060bbc]]]
Former-commit-id: d0b6aeba28
Former-commit-id: 7509e7e9b1 [formerly 9ac5967643]
Former-commit-id: 6a4facbce7
2013-07-24 12:47:51 -05:00
Bryan Kowal
5945e88676 Issue #2164 - disable build of awips2-notification temporarily.
Former-commit-id: bedb6e5b55 [formerly 9ae7f63e26] [formerly bedb6e5b55 [formerly 9ae7f63e26] [formerly cccb37ebc0 [formerly 69f7d9afd3d61fe1a68b16b98d7d3a41d4fcc2c4]]]
Former-commit-id: cccb37ebc0
Former-commit-id: 693a72ad6a [formerly 779c2ea7a2]
Former-commit-id: 04b8d9d26c
2013-07-24 12:45:29 -05:00
Mike Duff
c015a15988 Issue #1655 - Delta Scripts for adding ddsystemstatus table.
Change-Id: Ib2618f907e9e13567ef40a5d2613b12f85a7011f

Former-commit-id: b62085d376 [formerly 4a5bbf85da] [formerly b62085d376 [formerly 4a5bbf85da] [formerly 03b39f12bc [formerly 5ff320a3345d510a1f848460ed8739b20f7a5629]]]
Former-commit-id: 03b39f12bc
Former-commit-id: 538bc95479 [formerly ad6ac7ec68]
Former-commit-id: ce2624b731
2013-07-24 12:09:24 -05:00
Richard Peter
f872d4f916 Merge "Issue #1953 added madis distribution srv config file. added gunzip to route for madis ingest." into development
Former-commit-id: 7427ec9c3c [formerly 5cc249186d] [formerly 7427ec9c3c [formerly 5cc249186d] [formerly 9450910f54 [formerly e12170bac70d242572b7720c954b65735b202409]]]
Former-commit-id: 9450910f54
Former-commit-id: bfba94f286 [formerly 716e02fa4c]
Former-commit-id: d9e41b3458
2013-07-24 11:39:39 -05:00
Nate Jensen
0ea836cc8d Issue #2032 move warngen files out of build.edex
Change-Id: Ie91caef086abca30d4b509453e1172a75fbaa09f

Former-commit-id: 6180a3ba60 [formerly 22e72a646f] [formerly 6180a3ba60 [formerly 22e72a646f] [formerly 4eb21a4ea3 [formerly eabd12dbcb081897ed340394efee2e9482fab3c7]]]
Former-commit-id: 4eb21a4ea3
Former-commit-id: b02bd4f7d8 [formerly 72726a8484]
Former-commit-id: 6450502d65
2013-07-24 09:35:24 -05:00
Nate Jensen
c7be548921 Merge "Issue #2223 fix melting layer memory leak" into development
Former-commit-id: b604a13d73 [formerly 59f14f622f] [formerly b604a13d73 [formerly 59f14f622f] [formerly e147fd411e [formerly 88fd745e4bb12abc3302727f9ec0ed37afc133c5]]]
Former-commit-id: e147fd411e
Former-commit-id: 7ae65a8946 [formerly 64ba0d05ab]
Former-commit-id: 7e00e72a62
2013-07-23 15:49:06 -05:00
Nate Jensen
8be1ed440a Issue #2223 fix melting layer memory leak
Change-Id: I2fbf4dbaea12e4bba560b27ba372df0c3f913fec

Former-commit-id: 194db9a9f9 [formerly 88b2dd18e6] [formerly 194db9a9f9 [formerly 88b2dd18e6] [formerly 7b5dcc09fa [formerly 3909f42ee097dac541328f8dc85330c618583b3f]]]
Former-commit-id: 7b5dcc09fa
Former-commit-id: 95aeee2fe6 [formerly 8db7b7b5f6]
Former-commit-id: f6d5014c43
2013-07-23 14:27:29 -05:00
Ron Anderson
fd0eda517e Merge "Issue #2009: Fix NullPointerException in SocketServer start up." into development
Former-commit-id: 5ff82ce522 [formerly 1b87afefc3] [formerly 5ff82ce522 [formerly 1b87afefc3] [formerly fd031ba61f [formerly 71ae0f3b1c05f6e888e974946d7f4378c6efe32f]]]
Former-commit-id: fd031ba61f
Former-commit-id: 90f3f0f4b7 [formerly ee45dfcbea]
Former-commit-id: b612d75564
2013-07-23 14:07:43 -05:00
Nate Jensen
3c7ec48316 Issue #2215 finish removing old facebook thrift
Change-Id: I32423b0f7d0b59cb439fcefcc9b5482947a8a4b1

Former-commit-id: b22a1302e9 [formerly d6efde8ce2] [formerly b22a1302e9 [formerly d6efde8ce2] [formerly a859d20865 [formerly 66924bc597e0e6da2e5f28b10a40fca10d697fbd]]]
Former-commit-id: a859d20865
Former-commit-id: 3bff1bfbad [formerly 1feaa09ccf]
Former-commit-id: e8b685d73d
2013-07-23 14:03:03 -05:00
David Gillingham
1474d8791c Issue #2009: Fix NullPointerException in SocketServer start up.
Change-Id: I07683ba74410234d162e058df0bb3ff6e00ee59e

Former-commit-id: a42de38d9e [formerly f4b6c5929c] [formerly a42de38d9e [formerly f4b6c5929c] [formerly a711fea3d9 [formerly b2b6220d5b5ef2235edb57fe2ab2ce0cb234ee25]]]
Former-commit-id: a711fea3d9
Former-commit-id: bf2e332633 [formerly 9fbbeff998]
Former-commit-id: a6fd072a4e
2013-07-23 13:57:38 -05:00
Nate Jensen
645c5101b4 Merge "Issue #2215 upgrade thrift to version 0.9.0" into development
Former-commit-id: 3aee4ff8a4 [formerly 99eff65daa] [formerly 3aee4ff8a4 [formerly 99eff65daa] [formerly fa8d032583 [formerly 5afd770ba549c485b3bba3e9c24aa5d9ae45f326]]]
Former-commit-id: fa8d032583
Former-commit-id: d2d760e035 [formerly 4aa9943e70]
Former-commit-id: d8f42c48f7
2013-07-23 13:48:19 -05:00
Nate Jensen
3aba42df34 Issue #2215 upgrade thrift to version 0.9.0
Change-Id: I9cf910a75c25f1d97a711a9088c3b496ceb2be70

Former-commit-id: 7197e75c15 [formerly 7b4938a999] [formerly 7197e75c15 [formerly 7b4938a999] [formerly 8898a6d2ba [formerly ab2e3f3e8910043b117887712258fc689f2e9445]]]
Former-commit-id: 8898a6d2ba
Former-commit-id: 7c438bd944 [formerly 375ad89ac8]
Former-commit-id: fa24302a76
2013-07-23 12:28:07 -05:00
Greg Armendariz
717b8071cd Issue #2214 - Correct syntax
Former-commit-id: eb6fef00c7 [formerly 62751f2af8] [formerly eb6fef00c7 [formerly 62751f2af8] [formerly df8dd8d71b [formerly 0b398665c539949a624b9d2e3e0b11dcd501044d]]]
Former-commit-id: df8dd8d71b
Former-commit-id: d8b26bf14f [formerly 6f0c139522]
Former-commit-id: 3396444cea
2013-07-23 09:08:53 -05:00
Richard Peter
3644f1a0eb Issue #1977: Fix NCEP Plugin issues due to merge
Former-commit-id: 3879c810db [formerly fa6a457cd0] [formerly 3879c810db [formerly fa6a457cd0] [formerly 00aeeb338b [formerly 7c054e201e41d4df5fdb82faf2648e3f8cd227cc]]]
Former-commit-id: 00aeeb338b
Former-commit-id: 55730a775c [formerly b5e8abbcab]
Former-commit-id: c079e1d161
2013-07-22 16:37:43 -05:00
Bryan Kowal
a7f6f1633b Issue #2206 - relocate ATBL directory change to 13.5
Former-commit-id: 7e0a51e3b2 [formerly bdcbf39a9a] [formerly 7e0a51e3b2 [formerly bdcbf39a9a] [formerly 7dcbe438e9 [formerly e6bc04f738a19c56563e81d1924969640223f843]]]
Former-commit-id: 7dcbe438e9
Former-commit-id: d393264d27 [formerly 1729820501]
Former-commit-id: dbec306afd
2013-07-22 16:37:42 -05:00
David Gillingham
683298b43b Issue #1842: Fix issue where start time of in progress VTEC events was being set
to 991130T0000Z.


Former-commit-id: 5bfa13b5bf [formerly cf21fb8fb3] [formerly 5bfa13b5bf [formerly cf21fb8fb3] [formerly 2281f4abc5 [formerly e6ad90e07a4af553edcb79ce71790f339b3f4ed5]]]
Former-commit-id: 2281f4abc5
Former-commit-id: c14ab8225f [formerly ea42ffa3e5]
Former-commit-id: 6b49330d25
2013-07-22 16:37:42 -05:00
Nate Jensen
fc9a9f990b Issue #2142 fix ncep features
Change-Id: I3d13c58e450d7b0b41f41f608986537b51c3b4ca

Former-commit-id: 412c880579 [formerly 747cab2eaf] [formerly 412c880579 [formerly 747cab2eaf] [formerly 07dfc5d206 [formerly 3b35fd54816e3a8926e4061a4e36ca6be7287dd3]]]
Former-commit-id: 07dfc5d206
Former-commit-id: 682bf1ea10 [formerly 2e92cf7bc1]
Former-commit-id: edb3e81718
2013-07-22 14:17:17 -05:00
Ron Anderson
6548d151d3 Merge "Issue #2009: Implement dual-domain GFE export_grids solution. Update MHS emulator program to support new directory structure and some code cleanup and refactoring." into development
Former-commit-id: 89a1c1b2c9 [formerly eb7893c0ba] [formerly 89a1c1b2c9 [formerly eb7893c0ba] [formerly 6540885809 [formerly ba587ef79d0db60aa31b681e1a0614d2fee65417]]]
Former-commit-id: 6540885809
Former-commit-id: 8425e10cbc [formerly d54aa6fe0b]
Former-commit-id: 577819698c
2013-07-22 13:29:24 -05:00
Nate Jensen
3e7f3c66a8 Issue #2142 removing some viz dependencies on edex.common
Change-Id: I11e42f76c4b58292535af03ddf25023fbdeb734c

Former-commit-id: bcdaae1922 [formerly 22438766b4] [formerly bcdaae1922 [formerly 22438766b4] [formerly 4c9cc211ec [formerly 399d44a62df1c54e94d93d4e0b198db976104143]]]
Former-commit-id: 4c9cc211ec
Former-commit-id: a51d424851 [formerly 797760bb71]
Former-commit-id: c28a52bee8
2013-07-22 12:20:43 -05:00
Ron Anderson
d9df33da78 Merge "Issue #2185 Cache computed grid reprojections." into development
Former-commit-id: 1a479e848f [formerly ecce97701f] [formerly 1a479e848f [formerly ecce97701f] [formerly cd639e0220 [formerly 4f75c44b4dccb1cde093e32605dae809aa7a351c]]]
Former-commit-id: cd639e0220
Former-commit-id: 95a153d410 [formerly 61e947ba76]
Former-commit-id: 8bff2be5dc
2013-07-22 11:43:48 -05:00
Richard Peter
2a9cfe51af Merge branch 'omaha_13.5.1' (13.5.1-7) into development
Conflicts:
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/subset/GriddedSubsetManagerDlg.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesAction.java
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/MPEFieldResource.java
	cave/com.raytheon.viz.satellite/src/com/raytheon/viz/satellite/rsc/SatResource.java
	edexOsgi/com.raytheon.uf.common.pointdata/src/com/raytheon/uf/common/pointdata/spatial/SurfaceObsLocation.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/BandwidthManager.java
	ncep/gov.noaa.nws.ncep.viz.customProjection/META-INF/MANIFEST.MF
	rpms/awips2.cave/deploy.builder/build.sh

Former-commit-id: 401ed88e44 [formerly 15d1a6eab0] [formerly 401ed88e44 [formerly 15d1a6eab0] [formerly c6386e306f [formerly 293586df88f53c2ddf6f7586bf71719298728022]]]
Former-commit-id: c6386e306f
Former-commit-id: e7ec068c7e [formerly 12993d9539]
Former-commit-id: 85fc9c773b
2013-07-22 09:40:18 -05:00
Richard Peter
6ba6248d49 Merge "Issue #1655 - Implement the framework for DD system status messaging" into development
Former-commit-id: d075546952 [formerly 51a097fb8d] [formerly d075546952 [formerly 51a097fb8d] [formerly 7ceaed43c3 [formerly 638b708123bb5a89292cc7778ed8211102718d28]]]
Former-commit-id: 7ceaed43c3
Former-commit-id: ce7e6eeeed [formerly 5026801885]
Former-commit-id: 7fc81195f0
2013-07-21 22:54:14 -05:00
Richard Peter
56eac084b5 Merge "Issue #1653 - Add a subscription summary" into development
Former-commit-id: c926f71281 [formerly 73c2547981] [formerly c926f71281 [formerly 73c2547981] [formerly 68e565fdd9 [formerly 74351187e3b7061ecfdfd040ff88b81823055889]]]
Former-commit-id: 68e565fdd9
Former-commit-id: d922c86c26 [formerly 992b544e33]
Former-commit-id: 64adb6ec6c
2013-07-21 22:04:02 -05:00
Richard Peter
1b96d1cbf4 Merge "Issue #1992 Remove redundant time columns from bufrua. Change-Id: If0799726ff9fa3d90026d0115cc03bd55347ce90" into development
Former-commit-id: 4dc5e4ac27 [formerly 857426cc44] [formerly 4dc5e4ac27 [formerly 857426cc44] [formerly c7e9cd592e [formerly 57a6241f16973a6e793d0917ca4242a51bfd55f6]]]
Former-commit-id: c7e9cd592e
Former-commit-id: 54d607a63f [formerly a86bc58e13]
Former-commit-id: 73b4dfdff9
2013-07-21 21:57:38 -05:00
Richard Peter
bd403dc35a Merge "Issue #2194 Fix site override." into development
Former-commit-id: 09b2f9fa7e [formerly 26ab0ff706] [formerly 09b2f9fa7e [formerly 26ab0ff706] [formerly 347fb5bc2f [formerly f32db14a29a2d545aa44dddf0bec0d4e5e56069b]]]
Former-commit-id: 347fb5bc2f
Former-commit-id: 3ddae2a6e5 [formerly 3719e0d32f]
Former-commit-id: 6318d3dec0
2013-07-21 21:45:43 -05:00
Greg Armendariz
6c35eb215a Merge "Issue #2205 Fix cancelling adhoc queries" into omaha_13.5.1
Former-commit-id: fda3ba6d5b [formerly a3b77f2623] [formerly fda3ba6d5b [formerly a3b77f2623] [formerly d5ea12d97f [formerly d60e75576a5f80f8838330789c97e89788c7a057]]]
Former-commit-id: d5ea12d97f
Former-commit-id: c8c2a3d636 [formerly 3947baa02d]
Former-commit-id: e1092b5725
2013-07-19 14:15:24 -05:00
Ben Steffensmeier
c584a6797d Issue #1992 Remove redundant time columns from bufrua.
Change-Id: If0799726ff9fa3d90026d0115cc03bd55347ce90

Former-commit-id: e11099ff24 [formerly ad0cefc7fa] [formerly e11099ff24 [formerly ad0cefc7fa] [formerly 9c55581ad2 [formerly 3e916aad7d281ba53cd1634a15d7ac521943bc75]]]
Former-commit-id: 9c55581ad2
Former-commit-id: f6eb262152 [formerly a4f75b68d4]
Former-commit-id: 71a32933c4
2013-07-19 11:53:23 -05:00
Dustin Johnson
d8e5f6550f Merge "Issue #2193 - Fix for DD data browser subscription column." into development
Former-commit-id: 9dbf1c69d8 [formerly 8e78f80ddd] [formerly 9dbf1c69d8 [formerly 8e78f80ddd] [formerly 1acaf2dbfa [formerly 674aeafa6f5d317a30e1f078b1ee38acff6acf95]]]
Former-commit-id: 1acaf2dbfa
Former-commit-id: 176b1fddfb [formerly 900241dc68]
Former-commit-id: 698cf4a9a7
2013-07-19 10:40:45 -05:00
Bryan Kowal
21902a3edb Issue #2153 - fix 13.5.1 build after merge
Former-commit-id: b49ddfe75a [formerly 914f2f7e2f] [formerly b49ddfe75a [formerly 914f2f7e2f] [formerly e9e3baa4df [formerly a70fac10e48f1fc258a7756acb4d48560a54248d]]]
Former-commit-id: e9e3baa4df
Former-commit-id: d67aa10275 [formerly a7f431e526]
Former-commit-id: 9af77e045c
2013-07-19 10:28:30 -05:00
Dave Hladky
5a551a6e0e Issue #2209 Fixed un-serialized subscription in BandwidthManager
Change-Id: I7fd734cf360a55ab3d8f5869963dc50dd7d4f5a4

Former-commit-id: e72a0afa66 [formerly 6da58160d6] [formerly e72a0afa66 [formerly 6da58160d6] [formerly e9b3030a6f [formerly 4107e8c2ab354d3bfb59b9c633cbd55bc0810066]]]
Former-commit-id: e9b3030a6f
Former-commit-id: 404087b14f [formerly ca04bb6dd6]
Former-commit-id: a5416b471b
2013-07-19 10:08:09 -05:00
Richard Peter
374879df01 Merge branch 'master_13.5.1' (13.5.1-7) into omaha_13.5.1
Conflicts:
	cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/AbstractArchiveDlg.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/FFMPMonitor.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataGenerator.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResource.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/thread/AbstractLoadJob.java
	edexOsgi/com.raytheon.uf.common.archive/src/com/raytheon/uf/common/archive/config/ArchiveConfigManager.java
	edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPBasinData.java
	edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPDataContainer.java
	edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPTemplates.java
	edexOsgi/com.raytheon.uf.edex.archive/utility/common_static/base/archiver/purger/PROCESSED_DATA.xml
	edexOsgi/com.raytheon.uf.edex.archive/utility/common_static/base/archiver/purger/RAW_DATA.xml
	edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/FFMPGenerator.java
	edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/common/FFTIProcessor.java
	rpms/awips2.core/Installer.ldm/component.spec

Former-commit-id: 85fb4c3940 [formerly 7e08c04383] [formerly 85fb4c3940 [formerly 7e08c04383] [formerly cc7189fcb7 [formerly 3a10af4a3aedbccccb2062f5bf6c0902e448e6d7]]]
Former-commit-id: cc7189fcb7
Former-commit-id: eefaf2c836 [formerly ea2b372343]
Former-commit-id: 3a573f4256
2013-07-18 21:46:25 -05:00
Nate Jensen
6d7658e02e Issue #2032 moving localization edex_static files to respective plugins, except colormaps
Change-Id: I287fe0a7d44782dc45265a9ffe2312549d95edbf

Former-commit-id: 2ee87452db [formerly da311b00a8] [formerly 2ee87452db [formerly da311b00a8] [formerly b7ea2ae30b [formerly 69c812bb8f03844333497feba62951fbdcbc9e2b]]]
Former-commit-id: b7ea2ae30b
Former-commit-id: 41d3e45e60 [formerly dce6c06174]
Former-commit-id: b997f2a670
2013-07-18 17:20:27 -05:00
Ben Steffensmeier
0365236455 Issue #2194 Fix site override.
Former-commit-id: e01f3b5b0e [formerly 1e9fe8ba48] [formerly e01f3b5b0e [formerly 1e9fe8ba48] [formerly ca6cba7b41 [formerly b8a15544a205663adb4106453b4606d7f31f0423]]]
Former-commit-id: ca6cba7b41
Former-commit-id: 1ebe55a213 [formerly 61cde4953c]
Former-commit-id: 63f6a96a77
2013-07-18 15:29:41 -05:00
Mike Duff
2b08ae68ff Issue #1653 - Add a subscription summary
Change-Id: I677ae6d472a4de5bd8905650b2e13ffc1e2af149

Former-commit-id: 3cac2bd4ba [formerly 823f064ef8] [formerly 3cac2bd4ba [formerly 823f064ef8] [formerly d5ef7f056f [formerly d64a7895e08df47feedfb95edec033d0c87384c1]]]
Former-commit-id: d5ef7f056f
Former-commit-id: efea9b3739 [formerly b4c9a0066a]
Former-commit-id: 00904dc8ec
2013-07-18 14:53:10 -05:00
Mike Duff
aab1eea5df Issue #2193 - Fix for DD data browser subscription column.
Change-Id: I1a76cdac15273b2e1b5b76095d9ae5f3ece8c1a3

Former-commit-id: 997d195db6 [formerly 0ad0821d1c] [formerly 997d195db6 [formerly 0ad0821d1c] [formerly 8229d5a23f [formerly 344193f08e3ced288cd223a0ae295d13aa50e13a]]]
Former-commit-id: 8229d5a23f
Former-commit-id: 22e08fc1bb [formerly 4495425388]
Former-commit-id: 0cc0145076
2013-07-18 14:30:39 -05:00
Dustin Johnson
b7c8e82d1a Merge "Issue #2191 Fixed spring error" into development
Former-commit-id: 45d84cf09f [formerly 4bd8184d8a] [formerly 45d84cf09f [formerly 4bd8184d8a] [formerly 8b908afc8f [formerly 8794f7763a3cb982c5c282b40cfc82b466f49e5f]]]
Former-commit-id: 8b908afc8f
Former-commit-id: 952dfd04f1 [formerly c79352ae95]
Former-commit-id: 433e683dc6
2013-07-18 13:21:01 -05:00
Benjamin Phillippe
0aa1109598 Issue #2191 Fixed spring error
Change-Id: Ia010d718640d1dd24f2e635eaae07dae6fa29a72

Former-commit-id: 245307d449 [formerly 9f60b0b2f6] [formerly 245307d449 [formerly 9f60b0b2f6] [formerly 831418e2c0 [formerly 43bb45deb9075eea60ee82a66173bc7ee89d4f0a]]]
Former-commit-id: 831418e2c0
Former-commit-id: 95fad21198 [formerly 7fb8740fae]
Former-commit-id: edcacb3dc7
2013-07-18 12:50:10 -05:00
Steve Harris
513c089375 13.5.1-7 baseline
Former-commit-id: 630705aa3f [formerly bf58a81b38] [formerly 630705aa3f [formerly bf58a81b38] [formerly 86ce1248c2 [formerly 4310ff14ffe9c7975574bb8b40bef668a90649e4]]]
Former-commit-id: 86ce1248c2
Former-commit-id: cb50a0028d [formerly f9c9aecba5]
Former-commit-id: eff4fb29dd
2013-07-18 12:07:22 -04:00