Commit graph

1411 commits

Author SHA1 Message Date
Roger Ferrel
05bcf19c11 Issue #1287 Changes for non-blocking AutoSaveIntervalDialog.
Change-Id: I5ea021d0658e68553542c88c8850fea4b9de696b

Former-commit-id: 04755d4801 [formerly 2048a41563] [formerly 3e852fc9b5] [formerly 17085ba699 [formerly 3e852fc9b5 [formerly d1601fee5b3de86e0120553d17ee18cf0b482e63]]]
Former-commit-id: 17085ba699
Former-commit-id: f7c0825e14808bc4206e2079a6f326e86e2d6e11 [formerly 6b9f409486]
Former-commit-id: 1ce417b106
2012-10-23 13:54:50 -05:00
Richard Peter
6de38e59b2 Issue #1257: Fix GFE HDF5 Retrievel to time correlate results to requested times.
Change-Id: I4fb15e8e712155f6099bd27880fbcbdf1948fc5f

Former-commit-id: f829123ab3 [formerly f94ba53663] [formerly 2e025e09e2] [formerly 0d10680b28 [formerly 2e025e09e2 [formerly 6077558dbd06f8fdb568f03c163352b080a9eb5e]]]
Former-commit-id: 0d10680b28
Former-commit-id: 54e53ef12b0d93e7ceab43255980ea5a0552d734 [formerly 5bc200bb88]
Former-commit-id: 5dd0edf429
2012-10-23 13:52:25 -05:00
Roger Ferrel
624ae21f37 Issue #1287 Changes for non-blocking FormatterLauncherDialog and code cleanup.
Change-Id: If2fbef2f2a128ff151525eed4feaf4273fa99855

Former-commit-id: d0a88b88a3 [formerly 257bdcaa91] [formerly 656f582e22] [formerly 525a5bb8d1 [formerly 656f582e22 [formerly 936092efc2f69ab3e2060334fddd630100da4157]]]
Former-commit-id: 525a5bb8d1
Former-commit-id: c93f8795e80bbe1ad3e4947807e86c58c7778004 [formerly cc5ef23f23]
Former-commit-id: d82d50faf1
2012-10-23 12:40:48 -05:00
Ben Steffensmeier
38ab5f2a6f Issue #189 fix reprojection problems wiht grid resources.
Former-commit-id: 3443fffb63 [formerly 88aefa3fb9] [formerly 9500d6c2fb] [formerly a00a6ac663 [formerly 9500d6c2fb [formerly 12f994bb426f23348f5d448786e946db3b65612e]]]
Former-commit-id: a00a6ac663
Former-commit-id: b6b1bf0e887a67081190fc0353aee83824229c4a [formerly 6e69d766b6]
Former-commit-id: 48fb7f642d
2012-10-23 10:27:16 -05:00
Roger Ferrel
8f11dc7705 Issue #1287 Changes for non-blocking but modal DisplayAttributesDialog.
Change-Id: I57df579cd29ffa2bb54589bf5862121857abedb0

Former-commit-id: bedb0bc955 [formerly 04053afeb7] [formerly 8152c49231] [formerly b0c5e6472b [formerly 8152c49231 [formerly 4dca1f343e38090c21e27f0470cc68042c22c811]]]
Former-commit-id: b0c5e6472b
Former-commit-id: 512070f3948e4d88364c8b0850da3cfb655fd3f9 [formerly 8ac665a0ca]
Former-commit-id: f96c5a1e28
2012-10-22 15:35:50 -05:00
Roger Ferrel
bb352719b2 Issue #1229 Changes for non-blocking CaveSWTWizardDlg.
Change-Id: I2ce93910b6605e5527c321f594bd0a03b13f321d

Former-commit-id: 0f0ca810d1 [formerly 9a5a87635a] [formerly ae3fb5eef5] [formerly 314af882c6 [formerly ae3fb5eef5 [formerly 30b387dc4c5392263ba3e82bca1db64099684ecf]]]
Former-commit-id: 314af882c6
Former-commit-id: e805655e9d61bb611c1c0289ac0dac2abeaf8168 [formerly 39b1fcbb01]
Former-commit-id: d7fe430a7e
2012-10-22 14:07:18 -05:00
Roger Ferrel
6c659b159c Issue #1229 Changes for non-blocking ViewMessagesDialog.
Change-Id: Id1bd1e36a2d16feec60c82997891577c98296fe7

Former-commit-id: 03e8d62864 [formerly 602c6d8d2e] [formerly 763c6ea58c] [formerly e157187c72 [formerly 763c6ea58c [formerly 02e781832ab07685baf2b353df39e156a3190c2c]]]
Former-commit-id: e157187c72
Former-commit-id: 55c77a2f3b4b370ad545d36263e6e444d0f32da0 [formerly 7c63cb3495]
Former-commit-id: 1e6a58354c
2012-10-22 10:25:05 -05:00
Ben Steffensmeier
19cb5107ee Issue #1279 add some comments to the grid wrap chaecking code.
Former-commit-id: 702972f5fd [formerly 58066e92dd] [formerly a78273a16f] [formerly 632bd9e051 [formerly a78273a16f [formerly cd1af813dc843102784b82fe452e6150de021375]]]
Former-commit-id: 632bd9e051
Former-commit-id: 794163792519812003f0c6e8d48ba02736ac5c9d [formerly 9c9bb42707]
Former-commit-id: 91e5550892
2012-10-19 13:49:48 -05:00
David Gillingham
4410953289 Issue #1091: Fix generation of AreaDictionary and CityLocations.
Change-Id: I1cba6765ea91a90c49a2f3d47da63c7c8155689e

Former-commit-id: 4729d5a6c8 [formerly b6c00c9773] [formerly f84bbf5236] [formerly c1905cafa4 [formerly f84bbf5236 [formerly f8a6e05adbe36191ad45f2fe8991547d13b622c3]]]
Former-commit-id: c1905cafa4
Former-commit-id: fc1ee4ef47ea4ac0b08ea2c390d5af20965d22b1 [formerly 221eaea664]
Former-commit-id: b6801be2ad
2012-10-19 12:31:37 -05:00
Ben Steffensmeier
93003573f1 Issue #189 throw a more useful, less fatal error when grib data is loaded into a grid resource.
Former-commit-id: fa272f5227 [formerly 13932f9c1f] [formerly 2fcaf9ff60] [formerly 96ca3108a4 [formerly 2fcaf9ff60 [formerly 74e1f6e724627f452c808173be2968053f7dd6f9]]]
Former-commit-id: 96ca3108a4
Former-commit-id: de16a278b058b482d7252ac11e5ab9bcc74e01e8 [formerly d217ea2e21]
Former-commit-id: b234c6fcbf
2012-10-19 11:53:22 -05:00
Lee Venable
78bbdc1bdd Merge "Issue #1229 Changes for stand along componets using non-blocking dialogs." into development
Former-commit-id: a4b1c629ec [formerly 2c52dde01c] [formerly e73ceb7797] [formerly 505b0e4786 [formerly e73ceb7797 [formerly 49c70dc1f55f0456b96e69d526554be40b2e8fa7]]]
Former-commit-id: 505b0e4786
Former-commit-id: 1f63cdd25d46f120e4572790355261565ce87def [formerly 53d1dce044]
Former-commit-id: 38c2168e52
2012-10-19 11:49:17 -05:00
Richard Peter
d65f12a232 Merge "Issue #189 fix bad merging of D2DGridDatabase" into Unified_Grid
Former-commit-id: 9f623f700c [formerly dc31187b81] [formerly a659be2f2d] [formerly b129c01c00 [formerly a659be2f2d [formerly f352ad66b867aa62981eb0feb25359cba89c87a2]]]
Former-commit-id: b129c01c00
Former-commit-id: 3e489d14d6d33fdbe6c455837f5c1583b6aba06e [formerly 35ed6c1e5f]
Former-commit-id: f7b3cbdef7
2012-10-19 11:13:43 -05:00
Richard Peter
6407ac56e5 Merge "Issue #189 fix for derived parameters when requested times are not available" into Unified_Grid
Former-commit-id: 215bbbc522 [formerly a57a374800] [formerly 062b79c796] [formerly fc0fe05c94 [formerly 062b79c796 [formerly 06d5e4d77404c52271daa922b71d7c66e3036276]]]
Former-commit-id: fc0fe05c94
Former-commit-id: bcaebe9c0cf5359cb4c10e877e3ddfaf6fa57992 [formerly ab658f68a9]
Former-commit-id: 0a1c5f411b
2012-10-19 11:13:12 -05:00
Richard Peter
073bf40c20 Merge "Issue #189 fix unified grid problems found during install/upgrade on testbed" into Unified_Grid
Former-commit-id: 6dee20ba1e [formerly 77ba8fb235] [formerly b58c8f9f38] [formerly b7e9c46d14 [formerly b58c8f9f38 [formerly dd0f0dcdf53081ef2bbce77727f9fee33f63d3f9]]]
Former-commit-id: b7e9c46d14
Former-commit-id: 51570e697a997fe43fa22d8b5d8dd02704e5f366 [formerly c95ad31b34]
Former-commit-id: 6dea7ce9bd
2012-10-19 11:10:52 -05:00
Greg Armendariz
83685abfab Removing duplicate line
Former-commit-id: 4e2a39355e [formerly a752fa4944] [formerly e456a622a5] [formerly b6f47d116f [formerly e456a622a5 [formerly 6bbb49dff7c8f6c31d7053e32466695bc36d8b02]]]
Former-commit-id: b6f47d116f
Former-commit-id: 9ffde0b9d874659c89263ba5d178d74b846a6ccf [formerly 987868d8e3]
Former-commit-id: e6b8019a64
2012-10-19 08:48:32 -05:00
Richard Peter
248e49448b Merge "Issue #1279 change GridCoverage to choose more reasonable longitude ranges, use a 0 central meridian for huge grids to avoid normalization in geotools, fix intersections in GridGeometryProjections to work for unnormalized areas, fix data wrapper world wrap detection to work for any crs which doesn't normalize." into development
Former-commit-id: 7731ae77c6 [formerly 0db5a1253b] [formerly e8fd5ab21c] [formerly 4e02275260 [formerly e8fd5ab21c [formerly 0a4ed6b4f65fd6906636d9857b350c8d4423e177]]]
Former-commit-id: 4e02275260
Former-commit-id: faf10d523fb1830164682e23fb357c99f21c721c [formerly daf1bbb33f]
Former-commit-id: 1b9d2bc7eb
2012-10-18 18:13:11 -05:00
Ben Steffensmeier
39cd45d738 Issue #189 fix bad merging of D2DGridDatabase
Former-commit-id: 957ec4b8d5 [formerly dcb1b45768] [formerly 58d11234e3] [formerly 0e22256a81 [formerly 58d11234e3 [formerly e945bf4020b869e56f2440a449d43acc8b0a9b16]]]
Former-commit-id: 0e22256a81
Former-commit-id: 5acf36479cdf7df4b661c2e05c29981bcae80133 [formerly 168987f453]
Former-commit-id: 3d0a05a19f
2012-10-18 17:08:31 -05:00
Roger Ferrel
d2f48f29a2 Issue #1229 Changes for stand along componets using non-blocking dialogs.
Change-Id: Ie394cc559501359074c15c60779331d9e922379a

Former-commit-id: b303cbf0ac [formerly 9b48ec6203] [formerly 2d9805411f] [formerly 2c279a6704 [formerly 2d9805411f [formerly 3f007ecd4def67cb8152f60ee0dec9656a90a03d]]]
Former-commit-id: 2c279a6704
Former-commit-id: 6d00c6abc66b85eae2e07e23c634429873c6f894 [formerly 55bd3fcf27]
Former-commit-id: 8f8862c014
2012-10-18 16:09:15 -05:00
Steve Harris
7a7f52d359 Merge branch 'development' of ssh://lightning.omaha.us.ray.com:29418/AWIPS2_baseline into development
Conflicts:
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java

Former-commit-id: f31c78d9c5 [formerly 4823017ff1] [formerly 8a574a91cf] [formerly 0bb64a8706 [formerly 8a574a91cf [formerly f3d80ac86697be7042fa20d52e3116e72b77f2a6]]]
Former-commit-id: 0bb64a8706
Former-commit-id: 22ba8b94629bf27984bd853c6c95b741116469c7 [formerly 2a9f8eaa4d]
Former-commit-id: 6e89edaa37
2012-10-18 16:06:05 -05:00
Steve Harris
81db247276 Merge branch 'ss_builds' (12.11.1-6) into development
Conflicts:
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java

Former-commit-id: 95727755c7 [formerly 3eff876edd] [formerly 6118445ed7c2dbe29fc3fbd891afff9ce39d62fb [formerly a7337d9160]] [formerly 1807100932 [formerly a7337d9160 [formerly de600d1a0e309ddbb4838526a9f92af05282cd1a]]]
Former-commit-id: 1807100932
Former-commit-id: a722324705ed3164c37a327413de2e52d14ffae3 [formerly 892e4df811]
Former-commit-id: 8486da2fd3
2012-10-18 16:01:05 -05:00
Steve Harris
ae73939b02 12.11.1-6 baseline
Former-commit-id: 58cd1e90f8 [formerly 30c786a885] [formerly fba4a443a0] [formerly 5c1f3cdc46 [formerly fba4a443a0 [formerly 18939af3b7cf54a36970d65d528003f4fe489eb7]]]
Former-commit-id: 5c1f3cdc46
Former-commit-id: 4bf85ed3f3986d98a009ad57add9c40fe46fa2f2 [formerly 08fc9f6b14]
Former-commit-id: 8beb6fc0b8
2012-10-18 15:53:01 -05:00
Ben Steffensmeier
2171179d33 Issue #189 fix for derived parameters when requested times are not available
Former-commit-id: e7f9b21dd2 [formerly 452e0d17ff] [formerly 1aac04a5c0] [formerly 2baae0a89f [formerly 1aac04a5c0 [formerly 09d7b089602ac73368202252eaf90f763c0650f4]]]
Former-commit-id: 2baae0a89f
Former-commit-id: 24789f5a6a6569d4ca8bb2a8ec60c2cd110fe5de [formerly e5282e3d10]
Former-commit-id: e50f7f2f26
2012-10-18 15:49:31 -05:00
Steve Harris
dfdf01de85 12.11.1-5 baseline
Former-commit-id: bb8fe6e556 [formerly 362d6ffaca] [formerly 03f3f3c36a] [formerly a0eaf651ff [formerly 03f3f3c36a [formerly a2b34f5c48d7a8e6e73a35d18dd565222bc7caa7]]]
Former-commit-id: a0eaf651ff
Former-commit-id: 3d301c8774eee84c53a845367dfdb251b5c0f118 [formerly e31c1e5bba]
Former-commit-id: 85ad066b70
2012-10-18 15:46:42 -05:00
Roger Ferrel
fe2f118cfa Issue #1229 Changes for non-blocking SWTMessageBox.
Change-Id: Id9954878c2764f4527e85b958a0fec7a05548db9

Former-commit-id: 41589589f1 [formerly e17d8d4c37] [formerly 610444ee88] [formerly 38ae2b122e [formerly 610444ee88 [formerly b073d27b36543630e3fd04623e22cd5242e5ed1f]]]
Former-commit-id: 38ae2b122e
Former-commit-id: 79a3689df05703c4035ceb5aa45c3f269e55e3f0 [formerly db1a29205a]
Former-commit-id: 2ddf95c587
2012-10-18 14:06:02 -05:00
Ben Steffensmeier
17d8918df8 Issue #189 fix unified grid problems found during install/upgrade on testbed
Former-commit-id: e557ea73c3 [formerly f3331dc743] [formerly 830a8bd7c2] [formerly 90b815d412 [formerly 830a8bd7c2 [formerly 4c444ce1a007f844010eb43846070d97d6c811bf]]]
Former-commit-id: 90b815d412
Former-commit-id: 277a0c28dd34718cb8b2c32568f24ebe0b4531a4 [formerly ea2f15c0df]
Former-commit-id: db2c9b41ec
2012-10-18 13:27:37 -05:00
Ben Steffensmeier
b7f3492c1a Issue #1279 change GridCoverage to choose more reasonable longitude ranges, use a 0 central meridian for huge grids to avoid normalization in geotools, fix intersections in GridGeometryProjections to work for unnormalized areas, fix data wrapper world wrap detection to work for any crs which doesn't normalize.
Former-commit-id: 9bef14fdb1 [formerly aac3144f51] [formerly 2f7a04f8ef] [formerly e3cc30e8a8 [formerly 2f7a04f8ef [formerly 908b9ec666e5dfb50ef4fe3899bf2288bf4cecc5]]]
Former-commit-id: e3cc30e8a8
Former-commit-id: f7f14001910f26e749c9069418cd703088ba92a9 [formerly a67d5e2b6c]
Former-commit-id: 6748ebb4ec
2012-10-18 12:39:01 -05:00
Jonathan Sanchez
bc539440c6 Issue #1126 Fixed refactor bugs.
Former-commit-id: a35330587c [formerly a326889adc] [formerly 4cf0b68aa2] [formerly d1bf86e2fe [formerly 4cf0b68aa2 [formerly eb95e6227b229cc8d627b4ac24254c2f2c2e3023]]]
Former-commit-id: d1bf86e2fe
Former-commit-id: 33d730411f9d212a0a9bb0a922c358e16605d846 [formerly 86e07328db]
Former-commit-id: c2f01b17a1
2012-10-18 11:32:01 -05:00
Lee Venable
a2bc7293b8 Merge "Issue #1275 Merged code from 1225 on top of SS changes." into development
Former-commit-id: 5c4f39965f [formerly fa7a0ef83d] [formerly dde9d4b802] [formerly ea61e22d2e [formerly dde9d4b802 [formerly ca3b359ba6a8b3131f32b9341781d19378240402]]]
Former-commit-id: ea61e22d2e
Former-commit-id: 6f7ee1f7f4eb29bca5ab7d62724d2565e87dbeee [formerly fd9338320f]
Former-commit-id: c3d4eca33c
2012-10-18 11:16:37 -05:00
Roger Ferrel
59b171d6dc Issue #1229 Changes for non-blocking SetTimeDialog.
Change-Id: I0a5d497a29b5a6e9e7441e130ce081058e78f4e3

Former-commit-id: 55954ce256 [formerly abd0476b6a] [formerly 40fb3f9729] [formerly 4cd2f1c851 [formerly 40fb3f9729 [formerly 5e4edda802714c236334500a12c2020386770dd2]]]
Former-commit-id: 4cd2f1c851
Former-commit-id: a77c3dafa757a1372691237bce3bc51d14c2aa81 [formerly 7a095d2d99]
Former-commit-id: d51dc93248
2012-10-18 07:36:31 -05:00
Bryan Kowal
bd615f81a7 Updates due to the dependencies of com.raytheon.viz.pointdata
Former-commit-id: 68a9aa26d7 [formerly fb1551d0ff] [formerly 0d15294ef7] [formerly c40473c4b8 [formerly 0d15294ef7 [formerly d53baa69e9db62dd3ee4fead01589d087bdda97b]]]
Former-commit-id: c40473c4b8
Former-commit-id: 9cefbfcdb86b630e992a7a3601e114a581bbc1ad [formerly ffd200b558]
Former-commit-id: 8fcc0462a9
2012-10-17 17:42:39 -05:00
Roger Ferrel
2244937369 Issue #1229 Changes for non-blocking LabelOffsetDialog.
Change-Id: Ic0d821549a300c53e29f4c321af3c51e22fb308e

Former-commit-id: b8b908e88a [formerly 3af99829a6] [formerly 66379c3210] [formerly d319101ed9 [formerly 66379c3210 [formerly f1131f2d9d1d5e0194a65e787e2628e733563683]]]
Former-commit-id: d319101ed9
Former-commit-id: a9fe91c0e3e73e4f0133a7162ed7354d9298871b [formerly 928e9f6a1d]
Former-commit-id: 4d39ffd53d
2012-10-17 15:12:55 -05:00
Lee Venable
1f47975269 Merge "Issue #1229 Changes for non-blocking ImagingDialog." into development
Former-commit-id: 17e4c05356 [formerly de3314a441] [formerly 77de744b4e] [formerly 74a9c05db5 [formerly 77de744b4e [formerly 2a7f9d1d5bab1c3edc8c6ac2f424e0b8865bc4c6]]]
Former-commit-id: 74a9c05db5
Former-commit-id: 9290c16a1f15df507eacc2bcdc7801069b95fe52 [formerly 3b3c636de4]
Former-commit-id: bc0ef0922e
2012-10-17 14:07:37 -05:00
Richard Peter
afe520cfaa Merge "Issue #1265 remove pypies gzip handling" into development
Former-commit-id: d0f2925f45 [formerly 935ddb3224] [formerly 3723250e50] [formerly cd9306a537 [formerly 3723250e50 [formerly fd47306a1247721d53b227bf94cc94818b4efc39]]]
Former-commit-id: cd9306a537
Former-commit-id: 35e5f6584a432fb89498c0f0d47d57ccd6381cb1 [formerly c7894c5cda]
Former-commit-id: aa26b2a623
2012-10-17 14:07:28 -05:00
Roger Ferrel
f470c8fb1d Issue #1229 Changes for non-blocking ImagingDialog.
Change-Id: Iddcbf248949a082f734f6b5de8d8941089746468

Former-commit-id: 4c906e7d5f [formerly 3d15bf8be1] [formerly c73acb0c30] [formerly 460acb4337 [formerly c73acb0c30 [formerly 185024d06da214041273674716a7efce4b2a98f1]]]
Former-commit-id: 460acb4337
Former-commit-id: 213c6a4d6d36c7d33d3c45f9001f6de42f956f28 [formerly b42cae4034]
Former-commit-id: a9cb110036
2012-10-17 13:53:29 -05:00
Jonathan Sanchez
9972c305ee Issue #1275 Merged code from 1225 on top of SS changes.
Former-commit-id: 833378b654 [formerly 5c181fede4] [formerly 36efd259d5] [formerly 9017f4b046 [formerly 36efd259d5 [formerly ace2ccf5653fcd791bc049ca17986b233a6a54cc]]]
Former-commit-id: 9017f4b046
Former-commit-id: 2f58c83e9cd948bf1985034ca7ec4f68c00e2b44 [formerly ecfc924a4b]
Former-commit-id: fd0b09aa77
2012-10-17 13:30:44 -05:00
Richard Peter
810861c25a Issue #1257: Revert radar file name changes. Change grib path to just be by master level name.
Change-Id: If3515614408906a5dc0e54b4c8d261fae5fcaf26

Former-commit-id: b8d8783a1d [formerly 36c53a2cc8] [formerly 85eb3b7598] [formerly 72acca2422 [formerly 85eb3b7598 [formerly ca23e50157bb0c381dbcd6bf4d4f08bbd0a35f6f]]]
Former-commit-id: 72acca2422
Former-commit-id: 138ec3daed9f4e2b28e4d65ab7a94258646d71aa [formerly 8cb830c1c6]
Former-commit-id: cfcef0a7b1
2012-10-17 13:22:00 -05:00
Nate Jensen
5262954e46 Issue #1265 remove pypies gzip handling
Change-Id: Ia79c1b7b2440849893bacf5cd8290fb5627ed4e5

Former-commit-id: 4fc0bee363 [formerly 7874be59e7] [formerly fa3e87549a] [formerly 2dac2f5dde [formerly fa3e87549a [formerly 6bb4d39b266bedbecff6ecda95bf05e65aa1e58c]]]
Former-commit-id: 2dac2f5dde
Former-commit-id: c7cef0967a0380bf57d4537db4b1d98a735241df [formerly 740146d838]
Former-commit-id: 9dac98930f
2012-10-17 11:32:49 -05:00
Roger Ferrel
85fbb59441 Issues #1229 Changes for non-blocking ColormapDialog.
Change-Id: I95126e4d7e0b450e014764c96caf93cdff9c2d8d

Former-commit-id: bacff2f0f1 [formerly cdf5c546ab] [formerly 8e86f32714] [formerly 6833c7e04c [formerly 8e86f32714 [formerly 88476b683c5c480395edacd2920e32a0589a92e5]]]
Former-commit-id: 6833c7e04c
Former-commit-id: 68aa8f3b270c031298664186936eadb3c07db89b [formerly d5acf40cc2]
Former-commit-id: 1075e8ba16
2012-10-17 10:20:18 -05:00
Roger Ferrel
824a1f8699 Fix for TextEditorDialog in merge of 12.11.1-4 baseline
Change-Id: I5e5e39af2bd7f2bfc9dd10ab0ddf87ff80cb7b76

Former-commit-id: 733b6208c8 [formerly 6053b5fbc1] [formerly f4a2d13df1] [formerly 8934186397 [formerly f4a2d13df1 [formerly 1cf3c76428719ebc7f06612b8525057e9345a56e]]]
Former-commit-id: 8934186397
Former-commit-id: c85c277e05f18e3ca20dcdf0d4f12aaf714a2869 [formerly 6199f7f516]
Former-commit-id: ab10bc88a8
2012-10-17 08:51:52 -05:00
Jonathan Sanchez
64d864f2df Fixing DataAdaptorFactory blunder in merge of 12.11.1-4
Change-Id: Id8cc463b78e66632fd05675abdd144dccef5bb9f

Former-commit-id: 66c3185920 [formerly af51b81d11] [formerly 1e53f0122a] [formerly f578372896 [formerly 1e53f0122a [formerly 89a30cf738bb64b26da16048f61af0585ded97e7]]]
Former-commit-id: f578372896
Former-commit-id: da21be0511d2ce69e4f7a5ad4cdd62679b6f415e [formerly 9524cca5b1]
Former-commit-id: 6c5447b952
2012-10-17 08:50:00 -05:00
Lee Venable
a4c0402b9d Merge "Issue #1229 Changes for non-blocking SaveColorMapDialog." into development
Former-commit-id: fb9b07ce94 [formerly 6e7446c66c] [formerly 526085140a] [formerly a256a54ab7 [formerly 526085140a [formerly 191537fbfc3e1933121cf133f7b906a9f59cab3d]]]
Former-commit-id: a256a54ab7
Former-commit-id: 7cb2760c34c3c9577542005b541d7f6fdaedd277 [formerly 78eb24ee17]
Former-commit-id: e8195b2e52
2012-10-17 08:26:53 -05:00
Steve Harris
6a81945d07 Fixing fields duplicated in merge of 12.11.1-4 baseline
Former-commit-id: 21136b0560 [formerly 18ec4b5933] [formerly 559540ffbbcbfef9a40622bca48b2ab297be7483 [formerly 34e7b3f4a3]] [formerly 8703ff00c7 [formerly 34e7b3f4a3 [formerly 477c64cbd4614e080d84fe1b0b5733274eeee838]]]
Former-commit-id: 8703ff00c7
Former-commit-id: a128d53471bbb82cdb98a297cb2308d5a1ee6417 [formerly dc5eba737d]
Former-commit-id: 31253e2949
2012-10-17 08:21:19 -05:00
Roger Ferrel
98f56ba457 Issue #1229 Changes for non-blocking SaveColorMapDialog.
Change-Id: I5308c5f2ca546c825863f89162f2f1143f0431fc

Former-commit-id: 1c4e87e968 [formerly 086223e764] [formerly 3874545f803dcb6ca00a8d3a25d8f6c9a8e55885 [formerly 5e79024db3]] [formerly 7f3ab5434c [formerly 5e79024db3 [formerly b902eadfca48628bf8944d97019263e94618667a]]]
Former-commit-id: 7f3ab5434c
Former-commit-id: a4ad194b03c39475a030ce5186fa0c8dd107d6d7 [formerly f77e146c65]
Former-commit-id: e4016f2f59
2012-10-17 08:15:21 -05:00
Steve Harris
002e4e0e8b Merge branch 'development' of ssh://lightning.omaha.us.ray.com:29418/AWIPS2_baseline into development
Former-commit-id: 37ab3d9e65 [formerly 4ffbffe349] [formerly a63b40b17a] [formerly 5e5c98b193 [formerly a63b40b17a [formerly ecb6a8876078dcff3414ff2a33aa14bf130fa075]]]
Former-commit-id: 5e5c98b193
Former-commit-id: 15bce86b4c6e1715fae59229b3f9e7dcc1cf5721 [formerly be16909d2d]
Former-commit-id: a3a79a1a82
2012-10-16 21:44:49 -05:00
Roger Ferrel
47fa3c0255 Issue #1229 Changes for non-blocking BackgroundColorDialog.
Change-Id: Ie3d72e33a33ebdd12fe0b66047fd211e049474d9

Former-commit-id: 947b8762e8 [formerly ac30143335] [formerly 057f350d4752f372e69f416f727706cdfbadd9f5 [formerly 59a2dd6a3a]] [formerly d60b4ca396 [formerly 59a2dd6a3a [formerly 23c93af437fa662cc7df98e69a8bd383aabbab41]]]
Former-commit-id: d60b4ca396
Former-commit-id: 20ecbdaaa964dc53cac032342d78e7104ac0ed46 [formerly 757affcc66]
Former-commit-id: f253f2191b
2012-10-16 17:00:11 -05:00
Steve Harris
d88afce365 Merge branch 'ss_builds' (12.11.1-4) into development
Conflicts:
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/procedures/IAlterBundleContributor.java
	cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/dialogs/procedures/AlterBundleDlg.java
	cave/com.raytheon.uf.viz.points/src/com/raytheon/uf/viz/points/ui/dialog/CoordinateInputPanel.java
	cave/com.raytheon.uf.viz.points/src/com/raytheon/uf/viz/points/ui/dialog/PointEditDialog.java
	cave/com.raytheon.uf.viz.points/src/com/raytheon/uf/viz/points/ui/dialog/PointsMgrDialog.java
	cave/com.raytheon.uf.viz.points/src/com/raytheon/uf/viz/points/ui/layer/PointsToolLayer.java
	cave/com.raytheon.uf.viz.radarapps.core/src/com/raytheon/uf/viz/radarapps/products/ui/BaseRadarProductUI.java
	cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/ToolsAlterBundleContributor.java
	cave/com.raytheon.viz.gfe/help/EXAMPLElocalMaps.py
	cave/com.raytheon.viz.gfe/help/EXAMPLElocalMapsAdd.py
	cave/com.raytheon.viz.gfe/help/localMapsConfig.html
	cave/com.raytheon.viz.gfe/help/mapConfig.html
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	cave/com.raytheon.viz.textworkstation/src/com/raytheon/viz/textworkstation/TextWorkstationDlg.java
	edexOsgi/build.edex/esb/data/utility/edex_static/base/config/gfe/Maps.py
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/reference/DbShapeSource.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/reference/MapManager.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/ShapeTable.py
	edexOsgi/com.raytheon.uf.common.geospatial/src/com/raytheon/uf/common/geospatial/util/WorldWrapCorrector.java
	ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/display/rsc/NsharpResourceHandler.java
	rpms/common/yum/arch.x86/comps.xml

Former-commit-id: c19835d4be [formerly da7a11fe97] [formerly 4610ecc513] [formerly 751563e331 [formerly 4610ecc513 [formerly 07beab271f793ae79fcf9233f9d384702ead22a9]]]
Former-commit-id: 751563e331
Former-commit-id: 4390735c107d9ebc5c839213d322a92aad724790 [formerly 0c0c1144c6]
Former-commit-id: d0e91329b4
2012-10-16 15:48:14 -05:00
Roger Ferrel
d488733f34 Issue #1229 Changes for non-blocking ProcedureListDlg.
Change-Id: I5c955c9d07e104809e2a72de0f5ec998f13d797f

Former-commit-id: 2a3905d036 [formerly 1dc188fb3b] [formerly 1a1f1a0601] [formerly d51ba247d1 [formerly 1a1f1a0601 [formerly ea4c2898013df2107ebded11aa1561035eaf8a00]]]
Former-commit-id: d51ba247d1
Former-commit-id: a72f8583c7b5401510e3347f30a766d38722275a [formerly 85f8c1f282]
Former-commit-id: 3682a16ad2
2012-10-16 15:39:12 -05:00
Steve Harris
c9b563338a 12.11.1-4 baseline
Former-commit-id: 6e44abdba1 [formerly 98171b5de9] [formerly d3497e47eb] [formerly 6958b861f0 [formerly d3497e47eb [formerly dddf20c9518c578d1bebd0b5e01b10c5080fd24e]]]
Former-commit-id: 6958b861f0
Former-commit-id: d50a176f97de36460cafeb5bb47f7dc824e33ce1 [formerly cbbdb231ce]
Former-commit-id: 2c82d9cb07
2012-10-16 13:27:07 -05:00
Lee Venable
8ae9c27a96 Merge "Issue #1229 Changes for non-blocking ProcedureDlg." into development
Former-commit-id: a8bdb7e524 [formerly cc94e2c9e2] [formerly ab5f3fb23a] [formerly 6cd8592d80 [formerly ab5f3fb23a [formerly bbd65e811b2a9ca5f69af1f8fe7eea9c8e2fc70e]]]
Former-commit-id: 6cd8592d80
Former-commit-id: 841aa15e4155e57c272aba6d6e5942753fa061da [formerly 5f702fc834]
Former-commit-id: f8b0807a69
2012-10-16 13:14:02 -05:00
Greg Armendariz
6e831af9c3 Merge changes Ibe8b9a97,If48f637e into development
* changes:
  Issue #1252 - Checked in wrong file. Deleting it. Change-Id: Ibe8b9a9708e37f7e697e7133b98d24a0060ebd37
  Issue #1252 - Updated with changes from Dale Morris


Former-commit-id: 24cfef1397 [formerly 2d18d5791a] [formerly d1772b3705] [formerly b8de817d68 [formerly d1772b3705 [formerly ab6631a9b47cb5bc6716bc3ba9805bd40665f785]]]
Former-commit-id: b8de817d68
Former-commit-id: aeeec4969cf01c7fd65d843c6e49aac72bc82c8b [formerly 2c058c6b8a]
Former-commit-id: 1c5bebe6a9
2012-10-16 12:59:00 -05:00