Commit graph

1627 commits

Author SHA1 Message Date
Ben Steffensmeier
0da60e90b9 Issue #1356 create subgrid for grib files with extra columns
Former-commit-id: dd560f4d15 [formerly c3e1005dc8] [formerly dd560f4d15 [formerly c3e1005dc8] [formerly a7a13d27cd [formerly c9c82e37fa21a01a7357c2e065aea435b325587f]]]
Former-commit-id: a7a13d27cd
Former-commit-id: ddcb3e675d [formerly 64922c17c5]
Former-commit-id: 9eba37d4fb
2012-12-11 16:00:03 -06:00
Roger Ferrel
42c5a7b343 Issue #1411 Change suggest by Dale Morris for pqact.conf.template.
Change-Id: I9101cb4eab47a82f64212f457d7e0eea11479cc4

Former-commit-id: 6929a73900 [formerly b677a5ba3d] [formerly 6929a73900 [formerly b677a5ba3d] [formerly aefa650cda [formerly b406c990607a06678a58e36118edcddaab073b26]]]
Former-commit-id: aefa650cda
Former-commit-id: 662d51cda1 [formerly f64a99d554]
Former-commit-id: d7a28eedfd
2012-12-11 15:43:54 -06:00
Ron Anderson
958957d603 Issue #1395 Modifed AwipsCalender and added additional date/time related widgets
Change-Id: I123a63ff4a42d36b2a35229dff719eda49097f7b

Former-commit-id: cc883294f1 [formerly bc5f445ecf] [formerly cc883294f1 [formerly bc5f445ecf] [formerly 43881be47a [formerly 475861fe615a070f1a3cad18dd798ba6db6b66e8]]]
Former-commit-id: 43881be47a
Former-commit-id: 01081fe723 [formerly 641d268bd8]
Former-commit-id: bd7162eca5
2012-12-11 13:31:05 -06:00
Nate Jensen
ff01a406c8 Merge "Issue #1362 create a new resource handler when nsharp is created in a side pane." into development
Former-commit-id: c34ff0c0b8 [formerly decb23f4ae] [formerly c34ff0c0b8 [formerly decb23f4ae] [formerly 773ff8c027 [formerly 273aed63277891eb091817c5769fe53ef3813759]]]
Former-commit-id: 773ff8c027
Former-commit-id: a3fb320e10 [formerly 5b1ca237b2]
Former-commit-id: 22c47a870a
2012-12-11 12:42:51 -06:00
Dustin Johnson
d346b7fb3e Issue #1407 EventBus changes to support sending notifications for subscription verification
Change-Id: I8f979e44520e32fa908aa700bb0c93596a2dd820

Former-commit-id: 79fa61bb8a [formerly 8b942c31dd] [formerly 79fa61bb8a [formerly 8b942c31dd] [formerly 3d900240b7 [formerly 12b51905d9b710ebc6fa54346d82cad9178b0bba]]]
Former-commit-id: 3d900240b7
Former-commit-id: 4de56a0141 [formerly e72d5dc09d]
Former-commit-id: 88625668bb
2012-12-11 09:37:20 -06:00
Steve Harris
868acb808b Issue #1408 - Merge branch 'ss_builds' (12.12.1-12) (via branch 'mergetest') into development
Former-commit-id: d4686333a1 [formerly ab8b1ae64d] [formerly d4686333a1 [formerly ab8b1ae64d] [formerly ce72ebb094 [formerly 794a9a083b8340d322c915139968ba5a4fe2ee54]]]
Former-commit-id: ce72ebb094
Former-commit-id: 15849ae72a [formerly 113fdcb679]
Former-commit-id: db24093e42
2012-12-11 08:56:54 -06:00
Steve Harris
b0a60923c4 Merge branch 'ss_builds' (12.12.1-12) into development
Conflicts:
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/localization/LocalizationManager.java
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/observer/TafMonitorDlg.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/actions/ShowServiceBackupDlg.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/WeatherElementGroupDialog.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/svcbackup/SvcBackupUtil.java
	edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/request/NcCheckRequest.java
	edexOsgi/com.raytheon.uf.common.geospatial/src/com/raytheon/uf/common/geospatial/interpolation/data/UnitConvertingDataSource.java

Former-commit-id: 4d4771ee3a [formerly 43ddfe98c4] [formerly 4d4771ee3a [formerly 43ddfe98c4] [formerly f6988eefff [formerly e733dd9d05d3704f86e2a711607a1834df1a56f2]]]
Former-commit-id: f6988eefff
Former-commit-id: f02c1ef71d [formerly 6287b32e7d]
Former-commit-id: ebcc9975c4
2012-12-11 08:45:53 -06:00
Ben Steffensmeier
cc5e452d3f Issue #1362 create a new resource handler when nsharp is created in a side pane.
Former-commit-id: 50ff73809f [formerly 52497f5630] [formerly 50ff73809f [formerly 52497f5630] [formerly 0eb454f0d4 [formerly 62cb0df39d0c24edc80d635f3bf90d2abc564b04]]]
Former-commit-id: 0eb454f0d4
Former-commit-id: d2f5643093 [formerly 84fa621b55]
Former-commit-id: c45e8c3123
2012-12-10 17:58:04 -06:00
Brad Gonzales
5959f06dbd Issue #1398 moved freezingLevel.cron from cron.properties to com.raytheon.uf.edex.ohd.properties.
Change-Id: I7f69e140c32c7650c193344e661062df3d09a54d

Former-commit-id: 4e44770674 [formerly bcff2c134c] [formerly 4e44770674 [formerly bcff2c134c] [formerly 6ab74bb6ab [formerly 5aa303242b0ca1abf08685b6197ddd17d465250c]]]
Former-commit-id: 6ab74bb6ab
Former-commit-id: 15b3a61287 [formerly 065ddf4d4a]
Former-commit-id: cb35e0f5e8
2012-12-10 14:08:54 -06:00
Richard Peter
9ac5db070a Merge "Issue #1367: Fix static topo route uri" into development
Former-commit-id: 3781119c4f [formerly 9a5fc20edb] [formerly 3781119c4f [formerly 9a5fc20edb] [formerly a33301394c [formerly 0bfbe098d5ae0bc93f536fd09e6fa5e63c6dd10d]]]
Former-commit-id: a33301394c
Former-commit-id: f78c720d68 [formerly 932f49fd2c]
Former-commit-id: 380f4d0f05
2012-12-10 12:59:36 -06:00
Lee Venable
2247ff9461 Merge "Issue #1353 Changes for non-blocking DamDisplayControlDlg." into development
Former-commit-id: 3afa901791 [formerly ef814e2d0b] [formerly 3afa901791 [formerly ef814e2d0b] [formerly 1175e34b0d [formerly ce03df033eac42f2d035a7483349ba9db315a2e4]]]
Former-commit-id: 1175e34b0d
Former-commit-id: 8b25017106 [formerly f122f274ac]
Former-commit-id: e7d5accc85
2012-12-10 12:55:16 -06:00
Richard Peter
8926967471 Issue #1367: Fix static topo route uri
Change-Id: Iba75a46bcd52356fd190573520639217aaa77d02

Former-commit-id: 328d065216 [formerly 44f90a6f65] [formerly 328d065216 [formerly 44f90a6f65] [formerly 7d292d1731 [formerly b4b395876a00f9b1a80314a90c0d88ea913e52bc]]]
Former-commit-id: 7d292d1731
Former-commit-id: b3cccde136 [formerly 8ba7c0ae7c]
Former-commit-id: 468c48e957
2012-12-10 12:40:18 -06:00
Richard Peter
d3b4ae2fdb Issue #1394: Reduce GFE Grid Database calls
Change-Id: I7462cca18b1b46169b25611dddbad844895be0cd

Former-commit-id: ac41861f0b [formerly 3c3c695f24] [formerly ac41861f0b [formerly 3c3c695f24] [formerly 0670ac79fa [formerly bc127f06236cb1e09dc0c87fee578e4a0cb60063]]]
Former-commit-id: 0670ac79fa
Former-commit-id: 912b2ec928 [formerly 0cdb86b6ac]
Former-commit-id: 9e837ef99c
2012-12-10 11:59:54 -06:00
Roger Ferrel
d8640632cd Issue #1353 Changes for non-blocking DamDisplayControlDlg.
Change-Id: I8a07b7ed7a7e46d243f0319850e2611e0cd05475

Former-commit-id: f9a8d30c4d [formerly 35261a7964] [formerly f9a8d30c4d [formerly 35261a7964] [formerly 40b8e4ec57 [formerly 25051f8e5de207d39cedcf5ff42ec1f8305c5c9a]]]
Former-commit-id: 40b8e4ec57
Former-commit-id: 80d7309ea7 [formerly fdad99bcc8]
Former-commit-id: 387c5d0e36
2012-12-10 11:30:06 -06:00
Lee Venable
5e23a89003 Merge "Issue #1353 Changes for non-blocking AlertAlarmValuesDlg, GetAppsDefaults, SHEFAppsDefaultsDlg and BestEstimateQpeDlg." into development
Former-commit-id: 3a4eb415f2 [formerly 59b2cf8872] [formerly 3a4eb415f2 [formerly 59b2cf8872] [formerly 8e7143967b [formerly 050d9cebb8de520c7ed0d27c686ebf84dc6d084c]]]
Former-commit-id: 8e7143967b
Former-commit-id: 17b9e0077c [formerly f3b9d1cb38]
Former-commit-id: b6e267419c
2012-12-10 11:28:34 -06:00
Roger Ferrel
50bf368b38 Issue #1353 Changes for non-blocking AlertAlarmValuesDlg, GetAppsDefaults, SHEFAppsDefaultsDlg and BestEstimateQpeDlg.
Change-Id: Id2826d4816c26454418d54811b0b0c81dc437481

Former-commit-id: f72e89ad2c [formerly 921566317a] [formerly f72e89ad2c [formerly 921566317a] [formerly 81966d39fc [formerly 62cdaba1d9e59c77efe6253105582894cd8596a0]]]
Former-commit-id: 81966d39fc
Former-commit-id: bc26433783 [formerly 053584c4e2]
Former-commit-id: 039b95d202
2012-12-07 14:43:53 -06:00
Slav Korolev
2d3674e3c2 Issue #1351. Changes for non-blocking dialog MonitorDisplayThreshDlg. Changes according to comments. Deleted unused file.
Change-Id: I62f1d4ad30ca4ed120c0ca94abf140a1e0b90ce6

Former-commit-id: 829899374d [formerly 48f074eb72] [formerly 829899374d [formerly 48f074eb72] [formerly 1a510a9f61 [formerly c063c2bdb4d4cc7c59917e9882fe78cabb63c06d]]]
Former-commit-id: 1a510a9f61
Former-commit-id: a0d07a46f9 [formerly 6bf265624d]
Former-commit-id: 0b82d18c64
2012-12-07 15:18:03 -05:00
Nate Jensen
8d184d92cd Merge "Issue #1328 Fixed invalid thread access issue when parm inventory changes and GridCanvas needs to redraw" into development
Former-commit-id: 80c743ac8b [formerly 4867cd2a64] [formerly 80c743ac8b [formerly 4867cd2a64] [formerly a505d78463 [formerly 6ae7f9a4947420a6985ecbe2834f9c9fc9f5cac4]]]
Former-commit-id: a505d78463
Former-commit-id: 7b004618b5 [formerly ef76ea6d61]
Former-commit-id: 50d01007dc
2012-12-07 13:32:29 -06:00
Lee Venable
b0f681e903 Merge "Issue #1353 old test code classes." into development
Former-commit-id: 4ae765fc4f [formerly 0d74bf9e67] [formerly 4ae765fc4f [formerly 0d74bf9e67] [formerly 4e13d01e67 [formerly 54765a26d6ca098133ff1e0b16c56e94e4053f74]]]
Former-commit-id: 4e13d01e67
Former-commit-id: 78a124efe3 [formerly fa143bd2e1]
Former-commit-id: e4c65073b1
2012-12-07 13:22:46 -06:00
Nate Jensen
df8e16bd63 Merge "Issue #1396 fix thin client" into development
Former-commit-id: 206e288594 [formerly 01c27ce5aa] [formerly 206e288594 [formerly 01c27ce5aa] [formerly f577fc578d [formerly 4ec3746745f0983226db5e0b9e4969ef0885c44f]]]
Former-commit-id: f577fc578d
Former-commit-id: 94bc1dc9ae [formerly 7257650eea]
Former-commit-id: fa676a5cf1
2012-12-07 13:18:41 -06:00
Richard Peter
038227b6fb Merge "Issue #1389 Create an adapter class and use Collections.binarySearch()" into development
Former-commit-id: 43584fa1bb [formerly 7588d18d02] [formerly 43584fa1bb [formerly 7588d18d02] [formerly 79d6219dc4 [formerly f21715c04be0c4e82975aab413110d00f64b1ebc]]]
Former-commit-id: 79d6219dc4
Former-commit-id: 1489ae1fdb [formerly 51d849368c]
Former-commit-id: 6ad6bc509f
2012-12-07 13:18:40 -06:00
Richard Peter
e2be79730b Merge "Issue #1367 broke grib ingest into two routes, better exception message from remote thrift service handler" into development
Former-commit-id: 1806a444bb [formerly 7b054e58ed] [formerly 1806a444bb [formerly 7b054e58ed] [formerly 18e4f52967 [formerly 0e79b66173d37d81e13f263c70685189ba924fc3]]]
Former-commit-id: 18e4f52967
Former-commit-id: 40287c3be1 [formerly c6fe3df93d]
Former-commit-id: a9bc67b4ef
2012-12-07 13:14:46 -06:00
Lee Venable
051cf6dcdd Merge "Issue #1353 Changes for non-blocking FFMPSplash and LoadSaveConfigDlg dialogs." into development
Former-commit-id: 6a8ae7c255 [formerly ee2572e7c0] [formerly 6a8ae7c255 [formerly ee2572e7c0] [formerly 650420354f [formerly c94fde29a1e43467378bc11100fbe0fdfcf7a51a]]]
Former-commit-id: 650420354f
Former-commit-id: dfb7dfc55a [formerly e5cf7d4ba5]
Former-commit-id: cdc302da70
2012-12-07 13:02:53 -06:00
Lee Venable
f17c2d0bc0 Merge "Issue #1351. Changes for non-blocking FogMonThreshSetupDlg. Changes according to comments." into development
Former-commit-id: bf83e5b5c6 [formerly 2c44afd3ab] [formerly bf83e5b5c6 [formerly 2c44afd3ab] [formerly 37b91cccb0 [formerly 4bab9df17245e28128644fcdbfb8bac6d4c6dc7e]]]
Former-commit-id: 37b91cccb0
Former-commit-id: b33bdc354e [formerly 78af1aa566]
Former-commit-id: 9ee06391e8
2012-12-07 12:52:44 -06:00
Nate Jensen
0ffbeecd4e Issue #1396 fix thin client
Change-Id: I58dc3f40594697d8332cc372f45f30bb28927100

Former-commit-id: 851f8977f3 [formerly 020b84e373] [formerly 851f8977f3 [formerly 020b84e373] [formerly 03e6f7ee16 [formerly 1afd50427bff0a11ebbf99eb3b29d2d8c3e02c44]]]
Former-commit-id: 03e6f7ee16
Former-commit-id: 7c0941e292 [formerly 496fa1ede9]
Former-commit-id: c1de3bcff5
2012-12-07 11:59:13 -06:00
Max Schenkelberg
40f67f7e54 Issue #1328 Fixed invalid thread access issue when parm inventory changes and GridCanvas needs to redraw
Change-Id: I8207e9e3082db861c8040858ef11dc67e63747da

Former-commit-id: 72f31d5f0c [formerly d833d917db] [formerly 72f31d5f0c [formerly d833d917db] [formerly d7c9ac3b84 [formerly ba1d1a6bfe57466a6a0fe5864cd87ffefe61a2f8]]]
Former-commit-id: d7c9ac3b84
Former-commit-id: d0e091312a [formerly e27d415da5]
Former-commit-id: 1fbb76abfd
2012-12-07 11:44:46 -06:00
Roger Ferrel
6406fe0ecb Issue #1353 old test code classes.
Change-Id: I5b0f7a45ff6e00c669aa1acc6493350f90a66350

Former-commit-id: 754afb9c52 [formerly cfb11d2d38] [formerly 754afb9c52 [formerly cfb11d2d38] [formerly 327f35c657 [formerly 51f185625e30425c1466a04d46b3eac39dfac4dc]]]
Former-commit-id: 327f35c657
Former-commit-id: ddab76526a [formerly 125d271d40]
Former-commit-id: 88a2587cbc
2012-12-07 11:27:31 -06:00
Max Schenkelberg
057dc3019a Issue #1328 Fixed time matching error for 4-panel products where No Data Available on some of the panes
Amend: Changed time cache object to have single setter for setting fields, changed map to identity map

Change-Id: I598e9033187b794631d1dbfc78bb018084ec95cf

Former-commit-id: dbc9141454 [formerly 8fc766ab05] [formerly dbc9141454 [formerly 8fc766ab05] [formerly 424c6e0b1b [formerly 9a5766f8a6bd61734b2f9e44aaabbef835d1d676]]]
Former-commit-id: 424c6e0b1b
Former-commit-id: 9a978a9156 [formerly 4cb9cc5632]
Former-commit-id: 87ad71d28d
2012-12-07 11:24:44 -06:00
Slav Korolev
02ea1250da Issue #1351. Changes for non-blocking FogMonThreshSetupDlg. Changes according to comments.
Change-Id: I605f6819def85f197e37e13803627baec67e6786

Former-commit-id: 349ea52e2b [formerly a284f0f50f] [formerly 349ea52e2b [formerly a284f0f50f] [formerly b650fa6675 [formerly 64fffb1598b943dc9890d2b9ee04a690c006bfe7]]]
Former-commit-id: b650fa6675
Former-commit-id: b5fc4b6800 [formerly 1c16ed59c1]
Former-commit-id: 61d69bbccf
2012-12-07 12:23:39 -05:00
Dustin Johnson
f0820759d4 Issue #1389 Create an adapter class and use Collections.binarySearch()
Change-Id: Ia51742d40f053aa50d83c4ccdd8acabaa544bdf7

Former-commit-id: f655d93b5c [formerly c53235fdf2] [formerly f655d93b5c [formerly c53235fdf2] [formerly fe18156d26 [formerly 64b4b9b03ffd07d8515a5279496e4b520744b39d]]]
Former-commit-id: fe18156d26
Former-commit-id: 55ae7a14ab [formerly cd72050b6e]
Former-commit-id: cc902b3c8f
2012-12-07 10:55:20 -06:00
Roger Ferrel
1ae2cea7b1 Issue #1353 Changes for non-blocking FFMPSplash and LoadSaveConfigDlg dialogs.
Change-Id: Ie8589daa43e45a83835d119bdecc1674c7104ed0

Former-commit-id: 991c64f0a9 [formerly 0c83b2a277] [formerly 991c64f0a9 [formerly 0c83b2a277] [formerly 3cb0385a93 [formerly c243a7bdb065db53dee2a01b251e5fbc5f1ec23e]]]
Former-commit-id: 3cb0385a93
Former-commit-id: 351e3711fb [formerly b6ae15b04e]
Former-commit-id: b4d43d2d1e
2012-12-07 10:46:14 -06:00
Lee Venable
eccc05f81c Merge "Issue #1353 Changes for non-blocking AttributeThresholdDlg, BasinTrendDlg and ConfigSummaryDlg." into development
Former-commit-id: 723e4845e9 [formerly ecb7946aa1] [formerly 723e4845e9 [formerly ecb7946aa1] [formerly 4630059ce6 [formerly ca3afef8fe6a7a5840a35af569927a1e8e1a6bfd]]]
Former-commit-id: 4630059ce6
Former-commit-id: a4bbcd2205 [formerly 0d626354b8]
Former-commit-id: d455c023a6
2012-12-07 08:49:23 -06:00
Ron Anderson
c2dbc99468 Merge "Issue #1395 Updated ShadeableCapability to specify opacity (alpha) to be used for shading" into development
Former-commit-id: 3fa549f595 [formerly b15783eeee] [formerly 3fa549f595 [formerly b15783eeee] [formerly 3d876177d5 [formerly 4af8030874d2737e652fcb89f913c8d327e83bb1]]]
Former-commit-id: 3d876177d5
Former-commit-id: 8673447150 [formerly 338ccc416d]
Former-commit-id: 6ebc07e20a
2012-12-06 17:05:14 -06:00
Richard Peter
d7dcc31497 Merge "Issue #1389 Add AlgorithmUtil which provides binary search capabilities" into development
Former-commit-id: f8b40086e1 [formerly 6f73ee4582] [formerly f8b40086e1 [formerly 6f73ee4582] [formerly 972c7fe492 [formerly a7f30b4c483df3c378b6951e821baee285ac60ff]]]
Former-commit-id: 972c7fe492
Former-commit-id: d597716f55 [formerly c08a4ad6a4]
Former-commit-id: c98109754c
2012-12-06 17:04:27 -06:00
Ron Anderson
b02f3a733f Issue #1395 Updated ShadeableCapability to specify opacity (alpha) to be used for shading
Change-Id: Ifeb87aa3dc83c34c4599f22bbb2ed540e82d6c06

Former-commit-id: 45914e0a46 [formerly bb163074fa] [formerly 45914e0a46 [formerly bb163074fa] [formerly b6fcd999f4 [formerly 596a5c305e2c7be6e76c8d623a2fd4d5a5ffb7f7]]]
Former-commit-id: b6fcd999f4
Former-commit-id: c5b3111795 [formerly 70cca3900b]
Former-commit-id: 111c0495a4
2012-12-06 17:02:56 -06:00
Dave Hladky
c8037a5575 Issue #1367 broke grib ingest into two routes, better exception message from remote thrift service handler
Change-Id: I38294e99102b77936f95b97eef28ef3eca126d6d

Former-commit-id: 20bbdee95d [formerly e34b9a8862] [formerly 20bbdee95d [formerly e34b9a8862] [formerly 92e8877af4 [formerly 039fdaacc80f5158240de028541ba6688fa1d468]]]
Former-commit-id: 92e8877af4
Former-commit-id: bd878d58d0 [formerly b5689bac66]
Former-commit-id: 1299130f80
2012-12-06 16:06:14 -06:00
Ron Anderson
bb50fa220a Issue #1395 Modified LineStyle to contain a definition of the style so that GL and SWT can render them the same way
Change-Id: I9e9875c3d56870309d4c5420a541674fb8733a09

Former-commit-id: 330e913cb2 [formerly 5143e82d4a] [formerly 330e913cb2 [formerly 5143e82d4a] [formerly 9398573f2f [formerly 6c2704dffcbadab19611464df580f781bb5ebefd]]]
Former-commit-id: 9398573f2f
Former-commit-id: d42afa44dc [formerly 10479a1909]
Former-commit-id: ddd26d1fbd
2012-12-06 15:38:04 -06:00
Ron Anderson
1a27d852e1 Issue #1395 Factored out AbstractMapHandler pattern
Change-Id: I24e9e12f10742292b04dbf31571f0adfe24e35cd

Former-commit-id: 7ec03736a8 [formerly 91f8c043e1] [formerly 7ec03736a8 [formerly 91f8c043e1] [formerly 87fbaf8ff4 [formerly 522b3bd9cc24c1d75fe5fbdf6222e72ffb8a8468]]]
Former-commit-id: 87fbaf8ff4
Former-commit-id: af067ab22c [formerly 39509a66bb]
Former-commit-id: 39866900ea
2012-12-06 15:18:49 -06:00
Ron Anderson
1cd5dc0785 Merge "Issue #1393 Add additional jars to org.geotools" into development
Former-commit-id: d4935c0a84 [formerly 0aa3a3d1cb] [formerly d4935c0a84 [formerly 0aa3a3d1cb] [formerly db03ee11b8 [formerly 740a8edeca35a9eca69892f83f02c3dc9a4537d7]]]
Former-commit-id: db03ee11b8
Former-commit-id: 1af5011c43 [formerly 9690363a37]
Former-commit-id: 67fc5a8ba6
2012-12-06 15:04:31 -06:00
Dustin Johnson
dc02e4e02b Issue #1389 Add AlgorithmUtil which provides binary search capabilities
Change-Id: I2cf29381199e53b8dd8c26cd004628436c04e4e1

Former-commit-id: 8ec458fe67 [formerly 57153db386] [formerly 8ec458fe67 [formerly 57153db386] [formerly 4ede85fff1 [formerly afc804ae775939229da0e891567951ea7bc3aeb5]]]
Former-commit-id: 4ede85fff1
Former-commit-id: b4ee886294 [formerly fb0516194d]
Former-commit-id: 7a40e33222
2012-12-06 14:40:59 -06:00
Ron Anderson
f6b81ee11a Merge "Issue #1310: Resolve model name conflicts in NCEP grid models XML file." into development
Former-commit-id: c2bf362817 [formerly 1966ef815e] [formerly c2bf362817 [formerly 1966ef815e] [formerly efce059be2 [formerly f4f3f9d60d4f8674f899b85bf5b811e55d228a9e]]]
Former-commit-id: efce059be2
Former-commit-id: 303154d7c9 [formerly a2b5cfd392]
Former-commit-id: 8591f63107
2012-12-06 14:29:04 -06:00
Ron Anderson
04dc7bc022 Issue #1393 Add additional jars to org.geotools
Change-Id: I10aaef928d2eb7333d3d65c3871b633d5760e14f

Former-commit-id: 30c396680c [formerly 95696f6396] [formerly 30c396680c [formerly 95696f6396] [formerly 7cd3b46dfd [formerly 910af88ea60686f094bb3de17f5412cb9656111f]]]
Former-commit-id: 7cd3b46dfd
Former-commit-id: 87f3e0f015 [formerly a96fa17142]
Former-commit-id: 010c54b239
2012-12-06 14:17:35 -06:00
Ron Anderson
7fabf1b52e Merge "Issue #1369 fix geotiff import in CAVE" into development
Former-commit-id: 617acaf0ee [formerly 08547b0d36] [formerly 617acaf0ee [formerly 08547b0d36] [formerly f58e79f210 [formerly 2b5b3e68faa94c2d67b7fb4be5b21e58e6925350]]]
Former-commit-id: f58e79f210
Former-commit-id: 426acf7c76 [formerly b011ff05a9]
Former-commit-id: f090343fad
2012-12-06 14:14:26 -06:00
Ron Anderson
f5faab1dd3 Merge "Issue #1328 Fixed bug in GFE time matcher when no grids are available for discrete type" into development
Former-commit-id: 408c47019e [formerly f85dcb12c5] [formerly 408c47019e [formerly f85dcb12c5] [formerly ab1822c6a2 [formerly f281a810241140999419bc27560d6418d3b2bcc8]]]
Former-commit-id: ab1822c6a2
Former-commit-id: 12232c7975 [formerly d3f595a6aa]
Former-commit-id: d37b8616e2
2012-12-06 14:09:52 -06:00
David Gillingham
751611bfe8 Issue #1310: Resolve model name conflicts in NCEP grid models XML file.
Change-Id: I7252e7daa2810ad7ffccca9edd2817df79922458

Former-commit-id: 50ca58d08f [formerly dc98529991] [formerly 50ca58d08f [formerly dc98529991] [formerly effbc7cd1a [formerly 32f70ffe880e64bb062016f537a5efd81f814fb7]]]
Former-commit-id: effbc7cd1a
Former-commit-id: 352f8f12e7 [formerly ebb7411ee8]
Former-commit-id: 949a5cbb91
2012-12-06 13:50:52 -06:00
Roger Ferrel
3afacaa66e Issue #1353 Changes for non-blocking AttributeThresholdDlg, BasinTrendDlg and ConfigSummaryDlg.
Change-Id: Ie5ed937d78478c91eab84998024ee3347f79c95e

Former-commit-id: d99abd8f22 [formerly 7233f6fd64] [formerly d99abd8f22 [formerly 7233f6fd64] [formerly c30152a13d [formerly ea9896b2e8653b5d521c3f2d4a497116d135ea64]]]
Former-commit-id: c30152a13d
Former-commit-id: b736c70e88 [formerly 2a4a7a605f]
Former-commit-id: c7faa655ec
2012-12-06 13:40:48 -06:00
Lee Venable
dbf805159d Merge "Issue #1351. Changes for non-blocking MonitoringAreaConfigDlg according to reviewer's comments. Changes for History Tables." into development
Former-commit-id: 13750a21e2 [formerly a114b7003e] [formerly 13750a21e2 [formerly a114b7003e] [formerly e9cef99c97 [formerly 2bebbe390d9398df6d3304b25265ed276fa757aa]]]
Former-commit-id: e9cef99c97
Former-commit-id: 1d264b4fa8 [formerly 17124560bd]
Former-commit-id: fa3cd5a725
2012-12-06 13:26:24 -06:00
Matt Nash
2a207511e4 Issue #1369 fix geotiff import in CAVE
Change-Id: Iccc051478064e5746c80be5cf8edad7eb8e89f50

Former-commit-id: cb9cd97d1f [formerly fc4d7daab4] [formerly cb9cd97d1f [formerly fc4d7daab4] [formerly 10d399aafe [formerly ab5775f5187c2b0a2180dfeebc32774c3a1adb16]]]
Former-commit-id: 10d399aafe
Former-commit-id: 01dc19b06d [formerly c9372636d9]
Former-commit-id: dc7355a3e4
2012-12-06 12:02:11 -06:00
Slav Korolev
627c3987ea Issue #1351. Changes for non-blocking MonitoringAreaConfigDlg according to reviewer's comments. Changes for History Tables.
Change-Id: Ic68f4afd44a3039707cb80ee71a935aa2f00a6a2

Former-commit-id: 153af1673a [formerly 5e4bbc03a4] [formerly 153af1673a [formerly 5e4bbc03a4] [formerly af101861e4 [formerly 82dc81aa3cbdfcfcd0b3f5f6566bfce0b6fddd22]]]
Former-commit-id: af101861e4
Former-commit-id: fd46994bb9 [formerly a6241ff4d8]
Former-commit-id: 7b66b5258d
2012-12-06 12:42:06 -05:00
Max Schenkelberg
d47f34fb45 Issue #1328 Fixed bug in GFE time matcher when no grids are available for discrete type
Change-Id: I71f9f9b23573394e9f98895164be4aef659ec02a

Former-commit-id: 5693e567ef [formerly 032b0948a4] [formerly 5693e567ef [formerly 032b0948a4] [formerly 2e1bb4f7c6 [formerly a4c781a6c57579f04413dc16a0b3937ac6ce72d4]]]
Former-commit-id: 2e1bb4f7c6
Former-commit-id: 8974e33edc [formerly 2e51e024b8]
Former-commit-id: 37b94ec835
2012-12-06 11:23:22 -06:00