Richard Peter
6bc665ca3a
Merge "Issue #1390 fix envelope reprojection and add serializeable ojects for referenced envelopes Change-Id: I2e79709d1323ed17879b4f59229361fe935aa0ea" into development
...
Former-commit-id: 2a5171c2f3
[formerly 5117b93ee59b6c291d16e084d7a0be0e492b120f]
Former-commit-id: 63465edb95
2012-12-11 16:38:53 -06:00
Ben Steffensmeier
b32d039c92
Issue #1390 fix envelope reprojection and add serializeable ojects for referenced envelopes
...
Change-Id: I2e79709d1323ed17879b4f59229361fe935aa0ea
Former-commit-id: 11d3ee3014
[formerly a6c7730ba1c0b07fdf21bef19717859fc7238724]
Former-commit-id: b77f1592a7
2012-12-11 16:12:53 -06:00
Ron Anderson
4ba089395c
Merge "Issue #1395 Modifed AwipsCalender and added additional date/time related widgets" into development
...
Former-commit-id: 277c9cb0ec
[formerly c6c26811ad96f862ae3ffb0e6d9056f0d9edecfb]
Former-commit-id: d05dc0c6ca
2012-12-11 16:09:24 -06:00
Roger Ferrel
6929a73900
Issue #1411 Change suggest by Dale Morris for pqact.conf.template.
...
Change-Id: I9101cb4eab47a82f64212f457d7e0eea11479cc4
Former-commit-id: aefa650cda
[formerly b406c990607a06678a58e36118edcddaab073b26]
Former-commit-id: b677a5ba3d
2012-12-11 15:43:54 -06:00
Ron Anderson
cc883294f1
Issue #1395 Modifed AwipsCalender and added additional date/time related widgets
...
Change-Id: I123a63ff4a42d36b2a35229dff719eda49097f7b
Former-commit-id: 43881be47a
[formerly 475861fe615a070f1a3cad18dd798ba6db6b66e8]
Former-commit-id: bc5f445ecf
2012-12-11 13:31:05 -06:00
Nate Jensen
c34ff0c0b8
Merge "Issue #1362 create a new resource handler when nsharp is created in a side pane." into development
...
Former-commit-id: 773ff8c027
[formerly 273aed63277891eb091817c5769fe53ef3813759]
Former-commit-id: decb23f4ae
2012-12-11 12:42:51 -06:00
Dustin Johnson
79fa61bb8a
Issue #1407 EventBus changes to support sending notifications for subscription verification
...
Change-Id: I8f979e44520e32fa908aa700bb0c93596a2dd820
Former-commit-id: 3d900240b7
[formerly 12b51905d9b710ebc6fa54346d82cad9178b0bba]
Former-commit-id: 8b942c31dd
2012-12-11 09:37:20 -06:00
Steve Harris
d4686333a1
Issue #1408 - Merge branch 'ss_builds' (12.12.1-12) (via branch 'mergetest') into development
...
Former-commit-id: ce72ebb094
[formerly 794a9a083b8340d322c915139968ba5a4fe2ee54]
Former-commit-id: ab8b1ae64d
2012-12-11 08:56:54 -06:00
Steve Harris
4d4771ee3a
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: f6988eefff
[formerly e733dd9d05d3704f86e2a711607a1834df1a56f2]
Former-commit-id: 43ddfe98c4
2012-12-11 08:45:53 -06:00
Ben Steffensmeier
50ff73809f
Issue #1362 create a new resource handler when nsharp is created in a side pane.
...
Former-commit-id: 0eb454f0d4
[formerly 62cb0df39d0c24edc80d635f3bf90d2abc564b04]
Former-commit-id: 52497f5630
2012-12-10 17:58:04 -06:00
Brad Gonzales
4e44770674
Issue #1398 moved freezingLevel.cron from cron.properties to com.raytheon.uf.edex.ohd.properties.
...
Change-Id: I7f69e140c32c7650c193344e661062df3d09a54d
Former-commit-id: 6ab74bb6ab
[formerly 5aa303242b0ca1abf08685b6197ddd17d465250c]
Former-commit-id: bcff2c134c
2012-12-10 14:08:54 -06:00
Richard Peter
3781119c4f
Merge "Issue #1367 : Fix static topo route uri" into development
...
Former-commit-id: a33301394c
[formerly 0bfbe098d5ae0bc93f536fd09e6fa5e63c6dd10d]
Former-commit-id: 9a5fc20edb
2012-12-10 12:59:36 -06:00
Lee Venable
3afa901791
Merge "Issue #1353 Changes for non-blocking DamDisplayControlDlg." into development
...
Former-commit-id: 1175e34b0d
[formerly ce03df033eac42f2d035a7483349ba9db315a2e4]
Former-commit-id: ef814e2d0b
2012-12-10 12:55:16 -06:00
Richard Peter
328d065216
Issue #1367 : Fix static topo route uri
...
Change-Id: Iba75a46bcd52356fd190573520639217aaa77d02
Former-commit-id: 7d292d1731
[formerly b4b395876a00f9b1a80314a90c0d88ea913e52bc]
Former-commit-id: 44f90a6f65
2012-12-10 12:40:18 -06:00
Richard Peter
ac41861f0b
Issue #1394 : Reduce GFE Grid Database calls
...
Change-Id: I7462cca18b1b46169b25611dddbad844895be0cd
Former-commit-id: 0670ac79fa
[formerly bc127f06236cb1e09dc0c87fee578e4a0cb60063]
Former-commit-id: 3c3c695f24
2012-12-10 11:59:54 -06:00
Roger Ferrel
f9a8d30c4d
Issue #1353 Changes for non-blocking DamDisplayControlDlg.
...
Change-Id: I8a07b7ed7a7e46d243f0319850e2611e0cd05475
Former-commit-id: 40b8e4ec57
[formerly 25051f8e5de207d39cedcf5ff42ec1f8305c5c9a]
Former-commit-id: 35261a7964
2012-12-10 11:30:06 -06:00
Lee Venable
3a4eb415f2
Merge "Issue #1353 Changes for non-blocking AlertAlarmValuesDlg, GetAppsDefaults, SHEFAppsDefaultsDlg and BestEstimateQpeDlg." into development
...
Former-commit-id: 8e7143967b
[formerly 050d9cebb8de520c7ed0d27c686ebf84dc6d084c]
Former-commit-id: 59b2cf8872
2012-12-10 11:28:34 -06:00
Roger Ferrel
f72e89ad2c
Issue #1353 Changes for non-blocking AlertAlarmValuesDlg, GetAppsDefaults, SHEFAppsDefaultsDlg and BestEstimateQpeDlg.
...
Change-Id: Id2826d4816c26454418d54811b0b0c81dc437481
Former-commit-id: 81966d39fc
[formerly 62cdaba1d9e59c77efe6253105582894cd8596a0]
Former-commit-id: 921566317a
2012-12-07 14:43:53 -06:00
Slav Korolev
829899374d
Issue #1351 . Changes for non-blocking dialog MonitorDisplayThreshDlg. Changes according to comments. Deleted unused file.
...
Change-Id: I62f1d4ad30ca4ed120c0ca94abf140a1e0b90ce6
Former-commit-id: 1a510a9f61
[formerly c063c2bdb4d4cc7c59917e9882fe78cabb63c06d]
Former-commit-id: 48f074eb72
2012-12-07 15:18:03 -05:00
Nate Jensen
80c743ac8b
Merge "Issue #1328 Fixed invalid thread access issue when parm inventory changes and GridCanvas needs to redraw" into development
...
Former-commit-id: a505d78463
[formerly 6ae7f9a4947420a6985ecbe2834f9c9fc9f5cac4]
Former-commit-id: 4867cd2a64
2012-12-07 13:32:29 -06:00
Lee Venable
4ae765fc4f
Merge "Issue #1353 old test code classes." into development
...
Former-commit-id: 4e13d01e67
[formerly 54765a26d6ca098133ff1e0b16c56e94e4053f74]
Former-commit-id: 0d74bf9e67
2012-12-07 13:22:46 -06:00
Nate Jensen
206e288594
Merge "Issue #1396 fix thin client" into development
...
Former-commit-id: f577fc578d
[formerly 4ec3746745f0983226db5e0b9e4969ef0885c44f]
Former-commit-id: 01c27ce5aa
2012-12-07 13:18:41 -06:00
Richard Peter
43584fa1bb
Merge "Issue #1389 Create an adapter class and use Collections.binarySearch()" into development
...
Former-commit-id: 79d6219dc4
[formerly f21715c04be0c4e82975aab413110d00f64b1ebc]
Former-commit-id: 7588d18d02
2012-12-07 13:18:40 -06:00
Richard Peter
1806a444bb
Merge "Issue #1367 broke grib ingest into two routes, better exception message from remote thrift service handler" into development
...
Former-commit-id: 18e4f52967
[formerly 0e79b66173d37d81e13f263c70685189ba924fc3]
Former-commit-id: 7b054e58ed
2012-12-07 13:14:46 -06:00
Lee Venable
6a8ae7c255
Merge "Issue #1353 Changes for non-blocking FFMPSplash and LoadSaveConfigDlg dialogs." into development
...
Former-commit-id: 650420354f
[formerly c94fde29a1e43467378bc11100fbe0fdfcf7a51a]
Former-commit-id: ee2572e7c0
2012-12-07 13:02:53 -06:00
Lee Venable
bf83e5b5c6
Merge "Issue #1351 . Changes for non-blocking FogMonThreshSetupDlg. Changes according to comments." into development
...
Former-commit-id: 37b91cccb0
[formerly 4bab9df17245e28128644fcdbfb8bac6d4c6dc7e]
Former-commit-id: 2c44afd3ab
2012-12-07 12:52:44 -06:00
Nate Jensen
851f8977f3
Issue #1396 fix thin client
...
Change-Id: I58dc3f40594697d8332cc372f45f30bb28927100
Former-commit-id: 03e6f7ee16
[formerly 1afd50427bff0a11ebbf99eb3b29d2d8c3e02c44]
Former-commit-id: 020b84e373
2012-12-07 11:59:13 -06:00
Max Schenkelberg
72f31d5f0c
Issue #1328 Fixed invalid thread access issue when parm inventory changes and GridCanvas needs to redraw
...
Change-Id: I8207e9e3082db861c8040858ef11dc67e63747da
Former-commit-id: d7c9ac3b84
[formerly ba1d1a6bfe57466a6a0fe5864cd87ffefe61a2f8]
Former-commit-id: d833d917db
2012-12-07 11:44:46 -06:00
Roger Ferrel
754afb9c52
Issue #1353 old test code classes.
...
Change-Id: I5b0f7a45ff6e00c669aa1acc6493350f90a66350
Former-commit-id: 327f35c657
[formerly 51f185625e30425c1466a04d46b3eac39dfac4dc]
Former-commit-id: cfb11d2d38
2012-12-07 11:27:31 -06:00
Max Schenkelberg
dbc9141454
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: 424c6e0b1b
[formerly 9a5766f8a6bd61734b2f9e44aaabbef835d1d676]
Former-commit-id: 8fc766ab05
2012-12-07 11:24:44 -06:00
Slav Korolev
349ea52e2b
Issue #1351 . Changes for non-blocking FogMonThreshSetupDlg. Changes according to comments.
...
Change-Id: I605f6819def85f197e37e13803627baec67e6786
Former-commit-id: b650fa6675
[formerly 64fffb1598b943dc9890d2b9ee04a690c006bfe7]
Former-commit-id: a284f0f50f
2012-12-07 12:23:39 -05:00
Dustin Johnson
f655d93b5c
Issue #1389 Create an adapter class and use Collections.binarySearch()
...
Change-Id: Ia51742d40f053aa50d83c4ccdd8acabaa544bdf7
Former-commit-id: fe18156d26
[formerly 64b4b9b03ffd07d8515a5279496e4b520744b39d]
Former-commit-id: c53235fdf2
2012-12-07 10:55:20 -06:00
Roger Ferrel
991c64f0a9
Issue #1353 Changes for non-blocking FFMPSplash and LoadSaveConfigDlg dialogs.
...
Change-Id: Ie8589daa43e45a83835d119bdecc1674c7104ed0
Former-commit-id: 3cb0385a93
[formerly c243a7bdb065db53dee2a01b251e5fbc5f1ec23e]
Former-commit-id: 0c83b2a277
2012-12-07 10:46:14 -06:00
Lee Venable
723e4845e9
Merge "Issue #1353 Changes for non-blocking AttributeThresholdDlg, BasinTrendDlg and ConfigSummaryDlg." into development
...
Former-commit-id: 4630059ce6
[formerly ca3afef8fe6a7a5840a35af569927a1e8e1a6bfd]
Former-commit-id: ecb7946aa1
2012-12-07 08:49:23 -06:00
Ron Anderson
3fa549f595
Merge "Issue #1395 Updated ShadeableCapability to specify opacity (alpha) to be used for shading" into development
...
Former-commit-id: 3d876177d5
[formerly 4af8030874d2737e652fcb89f913c8d327e83bb1]
Former-commit-id: b15783eeee
2012-12-06 17:05:14 -06:00
Richard Peter
f8b40086e1
Merge "Issue #1389 Add AlgorithmUtil which provides binary search capabilities" into development
...
Former-commit-id: 972c7fe492
[formerly a7f30b4c483df3c378b6951e821baee285ac60ff]
Former-commit-id: 6f73ee4582
2012-12-06 17:04:27 -06:00
Ron Anderson
45914e0a46
Issue #1395 Updated ShadeableCapability to specify opacity (alpha) to be used for shading
...
Change-Id: Ifeb87aa3dc83c34c4599f22bbb2ed540e82d6c06
Former-commit-id: b6fcd999f4
[formerly 596a5c305e2c7be6e76c8d623a2fd4d5a5ffb7f7]
Former-commit-id: bb163074fa
2012-12-06 17:02:56 -06:00
Dave Hladky
20bbdee95d
Issue #1367 broke grib ingest into two routes, better exception message from remote thrift service handler
...
Change-Id: I38294e99102b77936f95b97eef28ef3eca126d6d
Former-commit-id: 92e8877af4
[formerly 039fdaacc80f5158240de028541ba6688fa1d468]
Former-commit-id: e34b9a8862
2012-12-06 16:06:14 -06:00
Ron Anderson
330e913cb2
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: 9398573f2f
[formerly 6c2704dffcbadab19611464df580f781bb5ebefd]
Former-commit-id: 5143e82d4a
2012-12-06 15:38:04 -06:00
Ron Anderson
7ec03736a8
Issue #1395 Factored out AbstractMapHandler pattern
...
Change-Id: I24e9e12f10742292b04dbf31571f0adfe24e35cd
Former-commit-id: 87fbaf8ff4
[formerly 522b3bd9cc24c1d75fe5fbdf6222e72ffb8a8468]
Former-commit-id: 91f8c043e1
2012-12-06 15:18:49 -06:00
Ron Anderson
d4935c0a84
Merge "Issue #1393 Add additional jars to org.geotools" into development
...
Former-commit-id: db03ee11b8
[formerly 740a8edeca35a9eca69892f83f02c3dc9a4537d7]
Former-commit-id: 0aa3a3d1cb
2012-12-06 15:04:31 -06:00
Dustin Johnson
8ec458fe67
Issue #1389 Add AlgorithmUtil which provides binary search capabilities
...
Change-Id: I2cf29381199e53b8dd8c26cd004628436c04e4e1
Former-commit-id: 4ede85fff1
[formerly afc804ae775939229da0e891567951ea7bc3aeb5]
Former-commit-id: 57153db386
2012-12-06 14:40:59 -06:00
Ron Anderson
c2bf362817
Merge "Issue #1310 : Resolve model name conflicts in NCEP grid models XML file." into development
...
Former-commit-id: efce059be2
[formerly f4f3f9d60d4f8674f899b85bf5b811e55d228a9e]
Former-commit-id: 1966ef815e
2012-12-06 14:29:04 -06:00
Ron Anderson
30c396680c
Issue #1393 Add additional jars to org.geotools
...
Change-Id: I10aaef928d2eb7333d3d65c3871b633d5760e14f
Former-commit-id: 7cd3b46dfd
[formerly 910af88ea60686f094bb3de17f5412cb9656111f]
Former-commit-id: 95696f6396
2012-12-06 14:17:35 -06:00
Ron Anderson
617acaf0ee
Merge "Issue #1369 fix geotiff import in CAVE" into development
...
Former-commit-id: f58e79f210
[formerly 2b5b3e68faa94c2d67b7fb4be5b21e58e6925350]
Former-commit-id: 08547b0d36
2012-12-06 14:14:26 -06:00
Ron Anderson
408c47019e
Merge "Issue #1328 Fixed bug in GFE time matcher when no grids are available for discrete type" into development
...
Former-commit-id: ab1822c6a2
[formerly f281a810241140999419bc27560d6418d3b2bcc8]
Former-commit-id: f85dcb12c5
2012-12-06 14:09:52 -06:00
David Gillingham
50ca58d08f
Issue #1310 : Resolve model name conflicts in NCEP grid models XML file.
...
Change-Id: I7252e7daa2810ad7ffccca9edd2817df79922458
Former-commit-id: effbc7cd1a
[formerly 32f70ffe880e64bb062016f537a5efd81f814fb7]
Former-commit-id: dc98529991
2012-12-06 13:50:52 -06:00
Roger Ferrel
d99abd8f22
Issue #1353 Changes for non-blocking AttributeThresholdDlg, BasinTrendDlg and ConfigSummaryDlg.
...
Change-Id: Ie5ed937d78478c91eab84998024ee3347f79c95e
Former-commit-id: c30152a13d
[formerly ea9896b2e8653b5d521c3f2d4a497116d135ea64]
Former-commit-id: 7233f6fd64
2012-12-06 13:40:48 -06:00
Lee Venable
13750a21e2
Merge "Issue #1351 . Changes for non-blocking MonitoringAreaConfigDlg according to reviewer's comments. Changes for History Tables." into development
...
Former-commit-id: e9cef99c97
[formerly 2bebbe390d9398df6d3304b25265ed276fa757aa]
Former-commit-id: a114b7003e
2012-12-06 13:26:24 -06:00
Matt Nash
cb9cd97d1f
Issue #1369 fix geotiff import in CAVE
...
Change-Id: Iccc051478064e5746c80be5cf8edad7eb8e89f50
Former-commit-id: 10d399aafe
[formerly ab5775f5187c2b0a2180dfeebc32774c3a1adb16]
Former-commit-id: fc4d7daab4
2012-12-06 12:02:11 -06:00