Commit graph

3212 commits

Author SHA1 Message Date
Nate Jensen
bcdaae1922 Issue #2142 removing some viz dependencies on edex.common
Change-Id: I11e42f76c4b58292535af03ddf25023fbdeb734c

Former-commit-id: 4c9cc211ec [formerly 399d44a62df1c54e94d93d4e0b198db976104143]
Former-commit-id: 22438766b4
2013-07-22 12:20:43 -05:00
Ron Anderson
1a479e848f Merge "Issue #2185 Cache computed grid reprojections." into development
Former-commit-id: cd639e0220 [formerly 4f75c44b4dccb1cde093e32605dae809aa7a351c]
Former-commit-id: ecce97701f
2013-07-22 11:43:48 -05:00
Richard Peter
401ed88e44 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: c6386e306f [formerly 293586df88f53c2ddf6f7586bf71719298728022]
Former-commit-id: 15d1a6eab0
2013-07-22 09:40:18 -05:00
Richard Peter
d075546952 Merge "Issue #1655 - Implement the framework for DD system status messaging" into development
Former-commit-id: 7ceaed43c3 [formerly 638b708123bb5a89292cc7778ed8211102718d28]
Former-commit-id: 51a097fb8d
2013-07-21 22:54:14 -05:00
Richard Peter
c926f71281 Merge "Issue #1653 - Add a subscription summary" into development
Former-commit-id: 68e565fdd9 [formerly 74351187e3b7061ecfdfd040ff88b81823055889]
Former-commit-id: 73c2547981
2013-07-21 22:04:02 -05:00
Richard Peter
4dc5e4ac27 Merge "Issue #1992 Remove redundant time columns from bufrua. Change-Id: If0799726ff9fa3d90026d0115cc03bd55347ce90" into development
Former-commit-id: c7e9cd592e [formerly 57a6241f16973a6e793d0917ca4242a51bfd55f6]
Former-commit-id: 857426cc44
2013-07-21 21:57:38 -05:00
Richard Peter
09b2f9fa7e Merge "Issue #2194 Fix site override." into development
Former-commit-id: 347fb5bc2f [formerly f32db14a29a2d545aa44dddf0bec0d4e5e56069b]
Former-commit-id: 26ab0ff706
2013-07-21 21:45:43 -05:00
Greg Armendariz
fda3ba6d5b Merge "Issue #2205 Fix cancelling adhoc queries" into omaha_13.5.1
Former-commit-id: d5ea12d97f [formerly d60e75576a5f80f8838330789c97e89788c7a057]
Former-commit-id: a3b77f2623
2013-07-19 14:15:24 -05:00
Ben Steffensmeier
e11099ff24 Issue #1992 Remove redundant time columns from bufrua.
Change-Id: If0799726ff9fa3d90026d0115cc03bd55347ce90

Former-commit-id: 9c55581ad2 [formerly 3e916aad7d281ba53cd1634a15d7ac521943bc75]
Former-commit-id: ad0cefc7fa
2013-07-19 11:53:23 -05:00
Dustin Johnson
9dbf1c69d8 Merge "Issue #2193 - Fix for DD data browser subscription column." into development
Former-commit-id: 1acaf2dbfa [formerly 674aeafa6f5d317a30e1f078b1ee38acff6acf95]
Former-commit-id: 8e78f80ddd
2013-07-19 10:40:45 -05:00
Bryan Kowal
b49ddfe75a Issue #2153 - fix 13.5.1 build after merge
Former-commit-id: e9e3baa4df [formerly a70fac10e48f1fc258a7756acb4d48560a54248d]
Former-commit-id: 914f2f7e2f
2013-07-19 10:28:30 -05:00
Dave Hladky
e72a0afa66 Issue #2209 Fixed un-serialized subscription in BandwidthManager
Change-Id: I7fd734cf360a55ab3d8f5869963dc50dd7d4f5a4

Former-commit-id: e9b3030a6f [formerly 4107e8c2ab354d3bfb59b9c633cbd55bc0810066]
Former-commit-id: 6da58160d6
2013-07-19 10:08:09 -05:00
Richard Peter
85fb4c3940 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: cc7189fcb7 [formerly 3a10af4a3aedbccccb2062f5bf6c0902e448e6d7]
Former-commit-id: 7e08c04383
2013-07-18 21:46:25 -05:00
Nate Jensen
2ee87452db Issue #2032 moving localization edex_static files to respective plugins, except colormaps
Change-Id: I287fe0a7d44782dc45265a9ffe2312549d95edbf

Former-commit-id: b7ea2ae30b [formerly 69c812bb8f03844333497feba62951fbdcbc9e2b]
Former-commit-id: da311b00a8
2013-07-18 17:20:27 -05:00
Ben Steffensmeier
e01f3b5b0e Issue #2194 Fix site override.
Former-commit-id: ca6cba7b41 [formerly b8a15544a205663adb4106453b4606d7f31f0423]
Former-commit-id: 1e9fe8ba48
2013-07-18 15:29:41 -05:00
Mike Duff
3cac2bd4ba Issue #1653 - Add a subscription summary
Change-Id: I677ae6d472a4de5bd8905650b2e13ffc1e2af149

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

Former-commit-id: 8229d5a23f [formerly 344193f08e3ced288cd223a0ae295d13aa50e13a]
Former-commit-id: 0ad0821d1c
2013-07-18 14:30:39 -05:00
Dustin Johnson
45d84cf09f Merge "Issue #2191 Fixed spring error" into development
Former-commit-id: 8b908afc8f [formerly 8794f7763a3cb982c5c282b40cfc82b466f49e5f]
Former-commit-id: 4bd8184d8a
2013-07-18 13:21:01 -05:00
Benjamin Phillippe
245307d449 Issue #2191 Fixed spring error
Change-Id: Ia010d718640d1dd24f2e635eaae07dae6fa29a72

Former-commit-id: 831418e2c0 [formerly 43bb45deb9075eea60ee82a66173bc7ee89d4f0a]
Former-commit-id: 9f60b0b2f6
2013-07-18 12:50:10 -05:00
Steve Harris
630705aa3f 13.5.1-7 baseline
Former-commit-id: 86ce1248c2 [formerly 4310ff14ffe9c7975574bb8b40bef668a90649e4]
Former-commit-id: bf58a81b38
2013-07-18 12:07:22 -04:00
Nate Jensen
50c17a691c Issue #2032 removing user-specific colormap files
Change-Id: Ia48f3100233c185514ca65acd0086a72f26ec7f1

Former-commit-id: ba6851b0e6 [formerly bd0401862fb0778cabb98e1fa8ef65925e25f649]
Former-commit-id: 5aef034545
2013-07-18 11:06:45 -05:00
Dustin Johnson
584e427e81 Issue #2205 Fix cancelling adhoc queries
Change-Id: I81207fe9c68a111e9894a7a25b83d9f0b4c03317

Former-commit-id: 9aadc61ea5 [formerly dd05e6c8f9c17ac331b137b9eb3d486c459144fb]
Former-commit-id: 58ab4e5cfc
2013-07-18 11:06:42 -05:00
Roger Ferrel
e225bd674b Issue #1966 Relocation of configuration files and checks for bad configuration files.
Change-Id: I1e26806cfc27eb25d0f3b8c1ad6ed21bfaebfc9c

Former-commit-id: 91ee1d36bf [formerly d8b89bcf2bb65e3e54730e58ab7529f03fcbbaad]
Former-commit-id: c002045a87
2013-07-18 10:02:05 -05:00
Nate Jensen
188d76ea71 Issue #2032 move build.edex's common-static files to appropriate plugins
Change-Id: I15fa37459c34dd40b253a97b99d62c5fc8ff4d15

Former-commit-id: b767760a9c [formerly e2feb9de0c2d7e1d7fb5dac1b0878aabe79f9ab2]
Former-commit-id: 5264d3a5b8
2013-07-18 09:53:53 -05:00
Ben Steffensmeier
d9d18683f1 Issue #2185 Cache computed grid reprojections.
Former-commit-id: ae8110acf6 [formerly 891f2241dd238b2901f8c1daee8f2236558f42e0]
Former-commit-id: b5542309b3
2013-07-17 17:34:34 -05:00
Nate Jensen
60f15e1081 Merge "Issue #2156 added orphan checking to time match basis on time match and set to null if not on any descriptor" into development
Former-commit-id: 08a90aa293 [formerly ae5a73adff9925796610ccdda83459a2f7ffb771]
Former-commit-id: 12a9907775
2013-07-17 17:10:32 -05:00
Nate Jensen
db2e2b8359 Merge "Issue #2158 Allow VizGlobalsManager to work without accessing UI thread. Change-Id: I3cb8e97d68a76b371a93a52b1c4f7b860b0847c1" into development
Former-commit-id: 3c2cd76715 [formerly 91357f42f9762e47984cba6fcf5479deb1fd5724]
Former-commit-id: b42b2f12ec
2013-07-17 17:09:29 -05:00
Nate Jensen
96ae856660 Merge "Issue #2184 Removed all other HUCs other than ALL from storage" into omaha_13.5.1
Former-commit-id: 3649af1b71 [formerly 7f9e83b42df42c1bec7946833e88a8916fc0c12d]
Former-commit-id: 09cae0cba3
2013-07-17 16:34:25 -05:00
Nate Jensen
c4bc1ef034 Issue #2142 clean up dependencies and dead code
Change-Id: I30f94c9afb01cdd1b7bef98c6ba40f79c3acea59

Former-commit-id: f28420dac4 [formerly 593073cade120a95899f4f4d2c5a652c6ac3389a]
Former-commit-id: a636846295
2013-07-17 16:30:08 -05:00
Max Schenkelberg
bb53119678 Issue #2156 added orphan checking to time match basis on time match and set to null if not on any descriptor
Amend: Accepted ticket

Change-Id: I27df5b96cc411bb3b48850e3c6fb1ee862dbd760

Former-commit-id: 29943f945c [formerly 782a1b71f83ee3d0db7b7df82eecabe7f7fecd4f]
Former-commit-id: 7f94b93c84
2013-07-17 16:12:36 -05:00
Dave Hladky
840b44b1e1 Issue #2184 Removed all other HUCs other than ALL from storage
Change-Id: I04885f5162cbe25b4345fe797da5a6f7ac246cc5

Former-commit-id: bd03085f8d [formerly 251cf3cca7c6653300f115083aa860444fee0ea9]
Former-commit-id: 84dae0a6b8
2013-07-17 15:18:49 -05:00
Nate Jensen
621a4da9b7 Issue #2142 logback cleanup
Change-Id: I48716f940fd2c8545d372bd16d881f87a75311f1

Former-commit-id: a0aeeedd23 [formerly 38ee29e206824a1beeaad5837d731804b4affbdc]
Former-commit-id: 81d9a28d53
2013-07-17 14:03:43 -05:00
Ben Steffensmeier
01f617534f Issue #2112 Split poes data so it gets stored in correct file.
Former-commit-id: b0faff6952 [formerly 34555a105a0e8232c389c4bc64c93830304368dc]
Former-commit-id: 0ab5b60c33
2013-07-17 12:12:43 -05:00
Richard Peter
8ba374afcb Merge "Issue #2181 Convert geometry types to use hibernate-spatial" into development
Former-commit-id: f3bb0a2d3c [formerly 00bcdca58906f04bea863614b87a17022bdd4006]
Former-commit-id: 04db7e82c4
2013-07-17 09:52:07 -05:00
Mike Duff
1ca50d2c4f Issue #1655 - Implement the framework for DD system status messaging
Change-Id: I621cd07fdf6a742b0af4408dad534844d08e9e55

Former-commit-id: 2c98a91d05 [formerly 4f51d50f9d6ea76f3b2cb2e828c6b6f8e192fb38]
Former-commit-id: 7acfe076a0
2013-07-17 08:55:27 -05:00
Ben Steffensmeier
e8b22db364 Issue #2181 Convert geometry types to use hibernate-spatial
Former-commit-id: 0bc5aca64b [formerly ded324e06f81fc63e6567a535cfa8a843a39902d]
Former-commit-id: a655380bad
2013-07-16 15:50:14 -05:00
Roger Ferrel
1dbcb165df Issue #2088 Changes for non-blocking PrintTextReportDlg and TextReportDlg.
Change-Id: I0f999c8334aefb3f2d0e27d91bdea419a96d65e6

Former-commit-id: edb32da7ce [formerly 648aa82a0d6b10a92a44df55eb278b6cc4c9bc1b]
Former-commit-id: 6f6da35020
2013-07-16 14:03:20 -05:00
Ben Steffensmeier
0cbe0e996d Issue #2158 Allow VizGlobalsManager to work without accessing UI thread.
Change-Id: I3cb8e97d68a76b371a93a52b1c4f7b860b0847c1

Former-commit-id: ffed387cce [formerly d3621cf3155841086cd24eecf4543bd70c890e41]
Former-commit-id: 872ad4dfa9
2013-07-16 11:04:08 -05:00
Roger Ferrel
5884bb5692 Issue #2088 changes for non-blocking RatingCurveDlg, FindReplaceDlg and TextEditorDlg.
Change-Id: I8d651254e862a45c1dad33c0d4991b29f1611828

Former-commit-id: 3eacead9bb [formerly d71b87606a93f744984f45aec8887dbc0052bb4e]
Former-commit-id: d620283c3b
2013-07-16 10:28:32 -05:00
Lee Venable
aae2be3488 Merge "Issue #2088 Changes for non-blocking DataSourcesDlg, ImpactStatementDlg and LowWaterStatementDlg." into development
Former-commit-id: e78b2c6cfc [formerly ba0218361df0703fa7600f0f32459aa2fd846d62]
Former-commit-id: c1371b2429
2013-07-16 09:15:57 -05:00
Lee Venable
24d98f7668 Merge "Issue #2141 - Fix envelope validation for DD areal filter and selection dialogs" into development
Former-commit-id: 59018aeaae [formerly 78996d6a3e7cb15f5084d30f02c8cf7c02e832b2]
Former-commit-id: c047f90db2
2013-07-16 08:50:10 -05:00
Lee Venable
6b17378b91 Merge "Issue #2166 - Fix to not open graph from CAVE menus" into development
Former-commit-id: d9d7f21d05 [formerly f5f136b9adc1a8f2c9c3da5c15d5018549643c07]
Former-commit-id: 80425d74a2
2013-07-16 08:46:47 -05:00
Nate Jensen
f25314cfde Merge "Issue #2149 Fix radar mesocyclone regex." into development
Former-commit-id: 79903a7f1f [formerly 8b11b9e86e5054dfaf6f5c993cc1c901479e5458]
Former-commit-id: de002b6737
2013-07-16 08:44:21 -05:00
Dustin Johnson
962d7ea2f7 Issue #2195 Fix ArchiveConfigManagerTest
Change-Id: I3f7dbe37d9fb14fa9eb5fb326c0e1eb18e901a9f

Former-commit-id: ee505a7b63 [formerly a86f2ef5cfa15fd8277dbe60e9a34c548af1f1c6]
Former-commit-id: 8587fc7317
2013-07-16 08:33:39 -05:00
Mike Duff
013f05d57e Issue #2166 - Fix to not open graph from CAVE menus
Change-Id: If77854e7ea4e0c703649e2e1bc322b3833d21996

Former-commit-id: 764e4966d1 [formerly f6d940c02245d59782d318fb482886a0df3216a9]
Former-commit-id: 03a9dcc4e3
2013-07-16 08:29:15 -05:00
Ben Steffensmeier
4f93bf0f69 Issue #2149 Fix radar mesocyclone regex.
Former-commit-id: 4b3024fe09 [formerly 386cb76aaafd330cfb12367c71c3df7eb35bff1e]
Former-commit-id: 5f8d325b05
2013-07-15 17:06:53 -05:00
Ben Steffensmeier
fb1a0a203a Issue #2107 Fix sampling of grid vector arrows.
Change-Id: If663d487fa31cba43d18b82bf93fdfacbbc65721

Former-commit-id: 4a25b32919 [formerly eae0b3931a3f5888b32c49a8c7e5b97addb3201a]
Former-commit-id: 767915b318
2013-07-15 15:51:41 -05:00
Roger Ferrel
c90a989bd6 Issue #2088 Changes for non-blocking DataSourcesDlg, ImpactStatementDlg and LowWaterStatementDlg.
Change-Id: Ib6b6a6b6a2b0c433c30ac31beb6858e4c7a0c768

Former-commit-id: e8d21c5d91 [formerly cf769302b9a9b2055f42969dfe781d7aa9c2286b]
Former-commit-id: 0ba32179e6
2013-07-15 14:26:35 -05:00
Max Schenkelberg
94fa6f0e30 Issue #2142 Got log4j out of edex.
Amend: Removed deleted files from build.properties

Change-Id: Id6aad305848ce137eb7e26cf689e172f165211fa

Former-commit-id: 50825200a1 [formerly f47d21972b86d8c2c757874c5e450f93e5704133]
Former-commit-id: 63421a4819
2013-07-15 14:26:15 -05:00
Dustin Johnson
b02a30dad8 Issue #2195 Remove Spring name= use in constructor args
Change-Id: I00745ce0cc04ed9c7d0497063668ad127357d17d

Former-commit-id: 95b61618fe [formerly 2ce8e4ebf5f67998c25cdb33ab44e169e73471b2]
Former-commit-id: 4cea4279e7
2013-07-15 13:20:44 -05:00