xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
1828 commits 31 branches 40 tags 3.8 GiB
Commit graph

227 commits

Author SHA1 Message Date
Steve Harris
2107a54161 Merge branch '13.2.1_delivery' into development 
Conflicts:
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java

Former-commit-id: c218786986 [formerly 658bea377b] [formerly c218786986 [formerly 658bea377b] [formerly ec56acde81 [formerly 60b2fd0496097fb1086207cbb01779dbfea877a0]]]
Former-commit-id: ec56acde81
Former-commit-id: 73d9455c65 [formerly 6383bf8ed2]
Former-commit-id: a74d58ce6f
 2013-01-31 10:19:14 -06:00
Steve Harris
99bc358644 Issue #1408 - Merge branch 'ss_builds' (13.2.1-3) into 13.2.1_delivery 
Former-commit-id: e655d297f7 [formerly 0505ed0a72] [formerly e655d297f7 [formerly 0505ed0a72] [formerly 6040272573 [formerly 70ddefcaed9acb5b220faf36693a91ab43a508e2]]]
Former-commit-id: 6040272573
Former-commit-id: 75f6e61e6f [formerly 513d49939f]
Former-commit-id: ba97151132
 2013-01-29 15:57:21 -06:00
Steve Harris
9ab34b7aeb 13.2.1-3 baseline 
Former-commit-id: 283147571f [formerly f45120a1f4] [formerly 283147571f [formerly f45120a1f4] [formerly 7a739c6a5b [formerly fc7291332a08966a746605aef725e1947ec9643c]]]
Former-commit-id: 7a739c6a5b
Former-commit-id: daca1c3e73 [formerly 3edfa1e0be]
Former-commit-id: dbaf4a3e39
 2013-01-29 15:52:43 -06:00
Ron Anderson
96acf099c8 Issue #1535 Fix GFE saving last block of grids twice 
Change-Id: I3411e27c96b5f0dd79c24e7ba75361582cb6652c

Former-commit-id: ed7784818a [formerly aa2c0ffb60] [formerly ed7784818a [formerly aa2c0ffb60] [formerly 5738910b71 [formerly 16eedd6d46196d08d02abc674c81ed95c403457c]]]
Former-commit-id: 5738910b71
Former-commit-id: 670f23e1c2 [formerly d61a24410a]
Former-commit-id: 3d1159c81f
 2013-01-28 19:23:23 -06:00
Steve Harris
a7d7847b06 Merge branch '13.2.1_delivery' into development 
Former-commit-id: 618cf868c5 [formerly f673583915] [formerly 618cf868c5 [formerly f673583915] [formerly 827611474f [formerly 5c6a08af0ad5f6185645e53143bf88d8c27f10d0]]]
Former-commit-id: 827611474f
Former-commit-id: a85c81289e [formerly 25fecb8b4f]
Former-commit-id: 895b25bac4
 2013-01-25 10:54:51 -06:00
Steve Harris
eafa141b90 13.2.1-2 baseline 
Former-commit-id: 0006a2b6cb [formerly 7a7f7c45ca] [formerly 0006a2b6cb [formerly 7a7f7c45ca] [formerly c3e4551dfa [formerly b8762009cb6f3bfa17984c2dcce65d5a48c6a844]]]
Former-commit-id: c3e4551dfa
Former-commit-id: 251a9c0195 [formerly 1153d80c5b]
Former-commit-id: 27706b8dcb
 2013-01-25 09:07:12 -06:00
Ron Anderson
259871dfd8 Issue #1524 Fix discrete color bar. 
Former-commit-id: 3d838584ed [formerly 718f1da85b] [formerly 3d838584ed [formerly 718f1da85b] [formerly 358c8bdf07 [formerly 7edd57ef71e8a22aa25870477844ba063da0b9d3]]]
Former-commit-id: 358c8bdf07
Former-commit-id: 6f7fa3e4e5 [formerly 3ccfdbc4bb]
Former-commit-id: 01f80e2ff2
 2013-01-23 16:37:56 -06:00
David Gillingham
a4db386f6e Issue #1515: Move blocking VCParm calls off of the ParmListener notification threads. 
Change-Id: I1c3c46dde051802fb79b7ead6fb63d766d1d00a6

Former-commit-id: eab83c0f63 [formerly bf6230441f] [formerly eab83c0f63 [formerly bf6230441f] [formerly 88e518725e [formerly 9cd87997f7ae7b51608ac56fcdf4d282339526aa]]]
Former-commit-id: 88e518725e
Former-commit-id: faedefb85d [formerly a1fd2bd32f]
Former-commit-id: 5e6d400e79
 2013-01-23 10:09:39 -06:00
Steve Harris
c60051d5df Merge branch '13.2.1_delivery' into development 
Former-commit-id: cf384edfbb [formerly 11b9bfc187] [formerly cf384edfbb [formerly 11b9bfc187] [formerly 1af055a04b [formerly 920b282de84def082dac82832d80e67f7bff2b19]]]
Former-commit-id: 1af055a04b
Former-commit-id: 8b578c10dc [formerly 29b9077291]
Former-commit-id: b03d5ce450
 2013-01-22 16:45:48 -06:00
Ron Anderson
d0d1b62ab7 Issue #1518 Fixed unloading of D2D model parameters from Grid Manager and related issues with HashMaps with Parms as keys in GFELegendResource. 
Change-Id: I483bbe92210ceb3015632d6a25d97ac35d7021a6

Former-commit-id: 9a432a1153 [formerly ce3d102cf9] [formerly 9a432a1153 [formerly ce3d102cf9] [formerly 3682a0e7f4 [formerly 4f7a660ae3fba41240e032220b6599e652ae6750]]]
Former-commit-id: 3682a0e7f4
Former-commit-id: 1062e54d2f [formerly 953f86348e]
Former-commit-id: 48099589c0
 2013-01-22 16:12:16 -06:00
Ron Anderson
64d4baf536 Issue #1504 GFE: Model data not always appearing automatically without CAVE restart 
Change-Id: I1e52c111ec50a860a226d85bed6f0ab6dfebed58

Former-commit-id: 74cb9aeb53 [formerly 62671efc2a] [formerly 74cb9aeb53 [formerly 62671efc2a] [formerly 20b0761048 [formerly 1fe63a2d5e20226f6124a9ca27b9f6272c49226c]]]
Former-commit-id: 20b0761048
Former-commit-id: 8e575db69c [formerly 44807ba0d5]
Former-commit-id: cb23960f0e
 2013-01-22 14:47:37 -06:00
Bryan Kowal
91e8aa2419 Fix the merge. 
Former-commit-id: 0858dfdfe4 [formerly fd7c132266] [formerly 0858dfdfe4 [formerly fd7c132266] [formerly a66024e35b [formerly 9f9da21517569f703c9e732016350b64ef14b98a]]]
Former-commit-id: a66024e35b
Former-commit-id: 1e2a4b7801 [formerly 358132c3c4]
Former-commit-id: 61349238a4
 2013-01-22 10:48:04 -06:00
Steve Harris
cae136ee16 Merge branch '13.2.1_delivery' into development 
Conflicts:
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/BaseGfePyController.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/procedures/ProcedureJob.java

Former-commit-id: 340d2009f7 [formerly df9ac3685e] [formerly 340d2009f7 [formerly df9ac3685e] [formerly 3a772f41cf [formerly a0bcc2276fb95097cfc10869f0aa1ee48189fc3a]]]
Former-commit-id: 3a772f41cf
Former-commit-id: 5b516ebb6f [formerly 111d5afb3a]
Former-commit-id: 922d0493fb
 2013-01-22 09:40:50 -06:00
Nate Jensen
152a94adf4 Issue #1509 garbage collect after each procedure run 
Change-Id: I7792d8bc186d6cef0fea38eccb657af040746fd7

Former-commit-id: c5d725bc7e [formerly bd9123fb3a] [formerly c5d725bc7e [formerly bd9123fb3a] [formerly add161ae2f [formerly fa239d3e7413c7441ba4440f0fe10f9e373de3df]]]
Former-commit-id: add161ae2f
Former-commit-id: 414004fabf [formerly 633af5e497]
Former-commit-id: 1a1eb9bf3b
 2013-01-21 09:26:43 -06:00
David Gillingham
9266b39ced Issue #1486: Commit initial implementation of a generic PythonScript controller class based on GFE's AbstractGfePyController, refactor GFE code to use it. 
Change-Id: I6d04b58fea98c6e4ef032b4867969b8a01e258bc

Former-commit-id: 9e3999a427 [formerly c6e64d83a2] [formerly 9e3999a427 [formerly c6e64d83a2] [formerly d16760c73e [formerly f54f775fa2bb89663e308feb79f5e188dbdd4cb4]]]
Former-commit-id: d16760c73e
Former-commit-id: 09836dacca [formerly a40383de3b]
Former-commit-id: 74bd042c3f
 2013-01-17 17:42:05 -06:00
Roger Ferrel
0435636b1e Issue #1442 Changes to update display when Simulated Time is changed. Corrections to pqact.conf.template. 
Changes based on code review and added listener to GridManager and unit test.

Change-Id: Ida593a7e3cc7d4fd9bd6f44a4455145114484650

Former-commit-id: 972db12324 [formerly 1cd076671c] [formerly 972db12324 [formerly 1cd076671c] [formerly 1e492b81ff [formerly 7f70c2f65453db6bf3097ae8157511c38a36b136]]]
Former-commit-id: 1e492b81ff
Former-commit-id: 86d51634dc [formerly f10521f861]
Former-commit-id: 722708105f
 2013-01-16 16:53:29 -06:00
Richard Peter
e838f2db25 Merge branch 'ss_builds' (13.2.1-1) into development 
Conflicts:
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template

Former-commit-id: a966546e31 [formerly 3fb7d96ec1] [formerly a966546e31 [formerly 3fb7d96ec1] [formerly 1dbb34523b [formerly 1a07daa97b2000f31ea4fd98890a15477b85b5f3]]]
Former-commit-id: 1dbb34523b
Former-commit-id: 79ef100838 [formerly 345dfd2ca9]
Former-commit-id: cd2014bf8d
 2013-01-14 18:07:17 -06:00
Steve Harris
b4556ea28f 13.2.1-1 baseline 
Former-commit-id: 5dfe4d10f1 [formerly e62172c8c7] [formerly 5dfe4d10f1 [formerly e62172c8c7] [formerly 81849e3cbb [formerly 30d12654dea302c2bb0546edcb3b7ddd04ddd046]]]
Former-commit-id: 81849e3cbb
Former-commit-id: e34695538d [formerly 8713dfc5ca]
Former-commit-id: ebff2a6275
 2013-01-14 18:42:21 -05:00
Richard Peter
ef2dc06b69 Issue #1408: Merge branch 'ss_builds' (13.1.2-8) into development 
Conflicts:
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/WeatherElementGroupDialog.java
	ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/src/gov/noaa/nws/ncep/edex/plugin/ncgrib/GridLookupFileName.java
	ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/src/gov/noaa/nws/ncep/edex/plugin/ncgrib/NcgribFileNameProcessor.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/dgdriv_c/dbscandb.c
	ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/dgdriv_c/proto_gemlib.h
	ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/dgdriv_c/uscore.h
	ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/src/gov/noaa/nws/ncep/viz/rsc/ncgrid/rsc/EnsembleSelectComposite.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/src/gov/noaa/nws/ncep/viz/rsc/ncgrid/rsc/NcEnsembleResourceData.java

Former-commit-id: ae3ea75cbf [formerly 1318f53902] [formerly ae3ea75cbf [formerly 1318f53902] [formerly b8e42dabc0 [formerly 90066bd215f4c547dfd483cec7c415c1e6fccece]]]
Former-commit-id: b8e42dabc0
Former-commit-id: fa6247baf7 [formerly aa9e16b038]
Former-commit-id: 096134d917
 2013-01-14 17:38:38 -06:00
Steve Harris
92f1e9416c 13.1.2-8 baseline 
Former-commit-id: b864fdc303 [formerly e6217a17de] [formerly b864fdc303 [formerly e6217a17de] [formerly 06b8eb8db0 [formerly c8797ef99646b2e093ad60cb9a6ee9643405a13f]]]
Former-commit-id: 06b8eb8db0
Former-commit-id: 7d0109a349 [formerly 3caf592e83]
Former-commit-id: 066c14dcd2
 2013-01-11 16:19:07 -05:00
Richard Peter
398b47967d Issue #1408: Merge 13.1.2-6 into development 
Former-commit-id: d0a6ba23e5 [formerly 029ebaa63a] [formerly d0a6ba23e5 [formerly 029ebaa63a] [formerly 328be6ac2b [formerly 7f8ad9de743a19d21a6784fa7563a88c6bdd4d3c]]]
Former-commit-id: 328be6ac2b
Former-commit-id: 80bf1d7a28 [formerly 6a5a0d7d09]
Former-commit-id: 709af3b25e
 2013-01-09 17:55:05 -06:00
Steve Harris
b7f180d9d3 13.1.2-6 baseline 
Former-commit-id: efd3392abe [formerly 8e5f9e0e6c] [formerly efd3392abe [formerly 8e5f9e0e6c] [formerly 59969775ad [formerly 184f16c9f91fb06efa7aeaf5499ace33f4f17bf7]]]
Former-commit-id: 59969775ad
Former-commit-id: 82a1ed77a4 [formerly dbcae57f57]
Former-commit-id: 05bdc0ecd2
 2013-01-06 14:55:11 -06:00
Steve Harris
f52ec0b0a0 13.1.2-2 baseline 
Former-commit-id: 51208e5515 [formerly c0c1d56f3a] [formerly 51208e5515 [formerly c0c1d56f3a] [formerly 4ba416aeb3 [formerly 221d0aaf0e19a054387134e72a76a278159bf4d0]]]
Former-commit-id: 4ba416aeb3
Former-commit-id: cd4185ef5c [formerly 941337c553]
Former-commit-id: b6fa9b4858
 2013-01-06 14:32:24 -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
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
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
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
Steve Harris
f8a9ae24cb 12.12.1-12 baseline 
Former-commit-id: 89def5cf03 [formerly e8e41630e8] [formerly 89def5cf03 [formerly e8e41630e8] [formerly 6d610f8e8a [formerly ae5110532f5ac5c7842a5483a8e2c3dc299ae814]]]
Former-commit-id: 6d610f8e8a
Former-commit-id: 69ab975fab [formerly 7bb37caa23]
Former-commit-id: 190378beeb
 2012-12-06 09:18:28 -06:00
Steve Harris
a10d7d3041 12.12.1-10 baseline 
Former-commit-id: c7ec50d4f9 [formerly 45f5150eb6] [formerly c7ec50d4f9 [formerly 45f5150eb6] [formerly 28018b8d9b [formerly 07d77ee5ca986f9762ec9c3276e8320e3f363ebc]]]
Former-commit-id: 28018b8d9b
Former-commit-id: 8a41d325d2 [formerly 0c67cb78a3]
Former-commit-id: 8ada406bfe
 2012-12-06 09:12:15 -06:00
Max Schenkelberg
a488900f51 Issue #1328 Made GFE use descriptor for time matching and time storage and manipulation 
Amend: Fixed time matcher index error when no data is available in GFE

Change-Id: Ie222ba72cb3890d3dc32699828b45012cd1783e5

Former-commit-id: b744ba68e0 [formerly 624cafb066] [formerly b744ba68e0 [formerly 624cafb066] [formerly 1328deac56 [formerly 974ef3068d48244ca622edc17045266cc34b6468]]]
Former-commit-id: 1328deac56
Former-commit-id: 47c7518388 [formerly c5536a9a84]
Former-commit-id: b1c2bf1cc4
 2012-11-30 14:17:50 -06:00
Roger Ferrel
bb21c0b2f7 Issue #1298 Plugin changes to get localization import of files to work for test procedures. 
Change-Id: I91e5e5abc76789f0b65ebc2dc7c793f7afa32d7d

Former-commit-id: ac09c59d38 [formerly 2a1024ff50] [formerly ac09c59d38 [formerly 2a1024ff50] [formerly 230e24addc [formerly 67b55ee03d17a878375be75bc36bcb5500ca98fd]]]
Former-commit-id: 230e24addc
Former-commit-id: 0011eb0ff4 [formerly ea3b2aebc6]
Former-commit-id: 2cc1b72f9e
 2012-11-27 10:37:06 -06:00
Roger Ferrel
619197cbb2 Issue #1298 Changes for non-blocking SelectionDlg. 
Change-Id: I9829945037f8f5ce268eb3731302ae77e83d837b

Former-commit-id: 5f3fab4677 [formerly 00693d83bb] [formerly 5f3fab4677 [formerly 00693d83bb] [formerly 59181213a0 [formerly cd85c4e60fd3863c39a7c61ad73848207e196a05]]]
Former-commit-id: 59181213a0
Former-commit-id: d0cdc594f8 [formerly fdfcb2ebea]
Former-commit-id: e424cb4bf2
 2012-11-15 12:55:49 -06:00
Roger Ferrel
aeb27b3c88 Issue #1298 Changes for non-blocking MoveWeatherElementDialog. 
Change-Id: I5f41c52d45146a0e9cdfbf613ec3918382f6a455

Former-commit-id: fc87eccb77 [formerly a6fdc7b580] [formerly fc87eccb77 [formerly a6fdc7b580] [formerly acf1881cb7 [formerly dd80807a0469e7c677f8e0d214fcdec715c67518]]]
Former-commit-id: acf1881cb7
Former-commit-id: 8881e4d3ec [formerly d6c5839e0e]
Former-commit-id: 265adb9b1c
 2012-11-14 16:33:27 -06:00
Lee Venable
f3cf44ffb4 Merge "Issue #1298 Changes for non-blocking DisplayAttributesDialog." into development 
Former-commit-id: 6152ecccda [formerly 695cf85335] [formerly 6152ecccda [formerly 695cf85335] [formerly 6134e5d3f7 [formerly 33b0aada5191fd6a757f37029862cdcadf8c0692]]]
Former-commit-id: 6134e5d3f7
Former-commit-id: d82072b975 [formerly 7ed335793f]
Former-commit-id: 3369913a84
 2012-11-14 16:06:02 -06:00
Roger Ferrel
9a04b3847b Issue #1298 Changes for non-blocking DisplayAttributesDialog. 
Change-Id: I2175023db40ad6b24c47ebc2cd16e12572fb1b6d

Former-commit-id: 82f9c74bef [formerly 7ca75756ae] [formerly 82f9c74bef [formerly 7ca75756ae] [formerly 212045c1a6 [formerly 260f5085bba45ab5b3ad10dd3945a64195eb2d7b]]]
Former-commit-id: 212045c1a6
Former-commit-id: 7f33d6ba18 [formerly d069f186e1]
Former-commit-id: 9cf45444c3
 2012-11-14 14:56:42 -06:00
Roger Ferrel
52425e6b99 Issue #1298 Changes for non-blocking TEWxSetValueDialog. 
Change-Id: I2d46c885ef0aa7aa8019665e8822d62ed221be8b

Former-commit-id: 679d967382 [formerly 7f22145bf2] [formerly 679d967382 [formerly 7f22145bf2] [formerly dd8f8a9fa7 [formerly f489ae636459e2dfcf7092d0ede7a37e84398cb2]]]
Former-commit-id: dd8f8a9fa7
Former-commit-id: 56ed69fc83 [formerly 89653eb5e1]
Former-commit-id: eb20af7237
 2012-11-14 14:20:40 -06:00
Roger Ferrel
51b30ca9b5 Issue #1298 Changes for non-blocking TEDiscreteSetValueDialog. 
Change-Id: I4e015b94f20b5075c4dc22d2165718d02109e0a8

Former-commit-id: 62faa06ddf [formerly e267248b57] [formerly 62faa06ddf [formerly e267248b57] [formerly 2331b8e1f5 [formerly 5c0eef28a67b874f184fd391d9220957030e43c7]]]
Former-commit-id: 2331b8e1f5
Former-commit-id: ce623db367 [formerly 3f0dc83f89]
Former-commit-id: 55b052c849
 2012-11-14 14:02:01 -06:00
Lee Venable
12e2e49950 Merge "Issue #1298 Convert UserEntryDialog to CaveSWTDialog but keep it a blocking dialog." into development 
Former-commit-id: a6e88a6856 [formerly e755889643] [formerly a6e88a6856 [formerly e755889643] [formerly e9ae25e781 [formerly dbb1bc97d99827f7e97039f7a333ae0fc00353f0]]]
Former-commit-id: e9ae25e781
Former-commit-id: 680373301f [formerly 09591687a9]
Former-commit-id: 9cbd7cdcbe
 2012-11-14 13:30:42 -06:00
Roger Ferrel
51e6ed0bcb Issue #1298 Convert UserEntryDialog to CaveSWTDialog but keep it a blocking dialog. 
Change-Id: I5c2ae63c0461d5e3e96a050c0055a625b1271072

Former-commit-id: 7f3d893c84 [formerly d16a448e05] [formerly 7f3d893c84 [formerly d16a448e05] [formerly 590eca2cba [formerly eadf4e9a28df6687a8e0bee6c6cef74356cd26d7]]]
Former-commit-id: 590eca2cba
Former-commit-id: 78422d9893 [formerly 950300e16d]
Former-commit-id: a39abc035b
 2012-11-14 12:04:18 -06:00
Roger Ferrel
d5e0266a5e Issue #1298 Changes for non-blocking WeatherElementGroupDialog. 
Changes from reviewer comments.

Change-Id: Ib21a454575115f26da165704454caaa76d86b5ac

Former-commit-id: 5e805da0e1 [formerly 049ecefe1d] [formerly 5e805da0e1 [formerly 049ecefe1d] [formerly b32480ed08 [formerly d8b828e6bc0a47caa01165cdb22e87f301534e30]]]
Former-commit-id: b32480ed08
Former-commit-id: be24ca5ed6 [formerly af0ad0433b]
Former-commit-id: bdeb05acbb
 2012-11-14 11:36:52 -06:00
Steve Harris
ae9d9985cd Merge branch 'ss_builds' (12.12.1-3) into development 
Former-commit-id: 8fc896f7d4 [formerly 448dd1c35f] [formerly 8fc896f7d4 [formerly 448dd1c35f] [formerly 00f3d51546 [formerly 7a44f29952ec89991e578c67357e1ef3f3c51d59]]]
Former-commit-id: 00f3d51546
Former-commit-id: 21ecd53719 [formerly c8cac52915]
Former-commit-id: 59efd9a217
 2012-11-13 17:28:50 -06:00
Steve Harris
53d74c66e7 12.12.1-2 baseline 
Former-commit-id: ed809a02db [formerly a8560580f8] [formerly ed809a02db [formerly a8560580f8] [formerly 6868eb9b23 [formerly 90019fdb91dad949f125e46de9300ccd44f6e315]]]
Former-commit-id: 6868eb9b23
Former-commit-id: 111e7607cf [formerly df89fe9bed]
Former-commit-id: 96a4a4f3f5
 2012-11-13 17:14:24 -06:00
Lee Venable
4353b75410 Merge "Issue #1298 Changes for non-blocking SetValueDialog." into development 
Former-commit-id: 2827143110 [formerly 989d5dc5e4] [formerly 2827143110 [formerly 989d5dc5e4] [formerly dbdfda1d04 [formerly 7f22292e89e05b881466efd1d81ef851c454246a]]]
Former-commit-id: dbdfda1d04
Former-commit-id: 77af9b8699 [formerly 282e8858da]
Former-commit-id: 5f79e0f562
 2012-11-13 16:02:05 -06:00
Steve Harris
81015f6f41 Merge "Merge branch 'ss_builds'(12.12.1-1) into development" into development 
Former-commit-id: 1f1659cb16 [formerly 63b0f18a89] [formerly 1f1659cb16 [formerly 63b0f18a89] [formerly 5c23f057b3 [formerly b0c071ca9877eb73e312a530d6abb94563cbc980]]]
Former-commit-id: 5c23f057b3
Former-commit-id: 6db07e2e5e [formerly 1e0ad343d6]
Former-commit-id: 07abe90d1c
 2012-11-13 16:02:03 -06:00
Ben Steffensmeier
9f2f2591ee Merge branch 'ss_builds'(12.12.1-1) into development 
Conflicts:
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/DefineRefSetDialog.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/FormatterLauncherDialog.java
	cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/inv/GribDataCubeAlertMessageParser.java
	edexOsgi/com.raytheon.edex.plugin.grib/res/spring/grib-request.xml
	edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/dao/GribDao.java
	edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/purge/gribPurgeRules.xml
	edexOsgi/com.raytheon.uf.common.gridcoverage/src/com/raytheon/uf/common/gridcoverage/GridCoverage.java
	edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/DynamicSerializationManager.java
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/purge/PurgeRuleSet.java
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/purge/PurgeRuleTree.java
	edexOsgi/com.raytheon.uf.tools.cli/impl/src/purgeallmodeldata/purgeAllModelData.py
	pythonPackages/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/__init__.py
Change-Id: Iefdb4f7ba08dc052250d432bb0363a9f83031fcc

Former-commit-id: ed4f88aa22 [formerly 69fc030bb4] [formerly ed4f88aa22 [formerly 69fc030bb4] [formerly e8090e654b [formerly 911c845199714c07e93f9847ab00fcd6d28a4223]]]
Former-commit-id: e8090e654b
Former-commit-id: 109ec1e778 [formerly 60f78c22e3]
Former-commit-id: 7761060a12
 2012-11-13 16:00:19 -06:00
Roger Ferrel
de65e19817 Issue #1298 Changes for non-blocking SetValueDialog. 
Change-Id: Ida7350ff46cadb910972043a3882ef8d0d6ba20f

Former-commit-id: cbacc77367 [formerly 1d5bd95866] [formerly cbacc77367 [formerly 1d5bd95866] [formerly dceb2cde5d [formerly 5c94dd5727420ff612ff1fa5bbdb06a041e89459]]]
Former-commit-id: dceb2cde5d
Former-commit-id: c498e21b23 [formerly 29eb436b19]
Former-commit-id: 0b8ecada1b
 2012-11-13 15:53:03 -06:00
Roger Ferrel
295c73d59e Issue #1298 Changes for non-blocking SetDeltaDialog and removal of unused class ShowISCInfoDlg. 
Change-Id: Icc9482b5e1063d6a4dcc33c106a582e8a460a6d0

Former-commit-id: 6f6b9dd21a [formerly 1e8dfdc857] [formerly 6f6b9dd21a [formerly 1e8dfdc857] [formerly b421a30116 [formerly 149198a0ab46b58518edb02c1bfb19e2f432726c]]]
Former-commit-id: b421a30116
Former-commit-id: 1272837397 [formerly d646f32d6e]
Former-commit-id: 3eb1da1b66
 2012-11-13 13:20:28 -06:00
Roger Ferrel
58dc77407c Issue #1298 Changes for non-blocking ZoneColorEditorDlg. 
Changes from reviewer's comments.

Change-Id: Ie818637b34649c498e289607ab72ac67f7c8cb6f

Former-commit-id: fdfa0f2030 [formerly 5ce67ffd9e] [formerly fdfa0f2030 [formerly 5ce67ffd9e] [formerly ae52206cc7 [formerly 6b6c4e0b61fbc7b51bdef738a4bdee7505fc8ea5]]]
Former-commit-id: ae52206cc7
Former-commit-id: 122a5cf0a4 [formerly 30c70cc181]
Former-commit-id: d31e866744
 2012-11-13 09:49:16 -06:00
Roger Ferrel
3bc3bf17fd Issue #1298 Changes for non-blocking WrapLengthDialog. 
Changes from reviewer's comments.
Fix merge conflict.

Change-Id: If31259188ff9fc1c84a02ca11399dd328dd669d4

Former-commit-id: ab77dfa758 [formerly 66606f88de] [formerly ab77dfa758 [formerly 66606f88de] [formerly e982c0f43a [formerly 50327729d4b0b135cf959a9093dc90a32cf091e6]]]
Former-commit-id: e982c0f43a
Former-commit-id: 3b07bb1ae6 [formerly de21a3f2ef]
Former-commit-id: d9c7c4ae56
 2012-11-12 16:27:08 -06:00