Commit graph

264 commits

Author SHA1 Message Date
Steve Harris
9d4d1baefe Merge branch 'master_13.3.1' (13.3.1-8) into omaha_13.3.1
Conflicts (just history comments):
	cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/AbstractStormTrackResource.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/procedures/ProcedureController.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/gfe/userPython/procedures/TCMWindTool.py
	edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java


Former-commit-id: 27c418812f [formerly 1a999fee5a] [formerly 27c418812f [formerly 1a999fee5a] [formerly c18b96dc4c [formerly 5927ff20543395733d9302eba2e6772315730a80]]]
Former-commit-id: c18b96dc4c
Former-commit-id: ea27f9cd17 [formerly 245afb28c8]
Former-commit-id: fc6748cb3e
2013-03-18 16:43:22 -05:00
Steve Harris
1c2dffd66d 13.3.1-8 baseline
Former-commit-id: bc9df0a8f9 [formerly f97d78994b] [formerly bc9df0a8f9 [formerly f97d78994b] [formerly c15b3ffe20 [formerly 2d0992b2b764d9ba87c69e6e053dc7fea0e4dcc6]]]
Former-commit-id: c15b3ffe20
Former-commit-id: 81a3f29afc [formerly 5f492500ea]
Former-commit-id: 0c94cc97fb
2013-03-18 15:43:32 -05:00
Nate Jensen
c710def06d Merge "Issue #1792 Improve performance of gfe parm time weighted average. Change-Id: I139c873175ee1dbe29968c90e193701122abcead" into omaha_13.3.1
Former-commit-id: 9dbb7660a7 [formerly 29b4cd2fb5] [formerly 9dbb7660a7 [formerly 29b4cd2fb5] [formerly 490ffe2772 [formerly 086546a518276d519aca779d55c160f4f8bcd577]]]
Former-commit-id: 490ffe2772
Former-commit-id: e2e9a845d5 [formerly a933532ad9]
Former-commit-id: 363efaec00
2013-03-14 09:48:16 -05:00
Ben Steffensmeier
7266a995f9 Issue #1792 Improve performance of gfe parm time weighted average.
Change-Id: I139c873175ee1dbe29968c90e193701122abcead

Former-commit-id: a9695abb45 [formerly 22624ba5d3] [formerly a9695abb45 [formerly 22624ba5d3] [formerly 52c167cf00 [formerly 61bdd593778588a18b91be3aa3af07ef28ca2412]]]
Former-commit-id: 52c167cf00
Former-commit-id: 2d622e6053 [formerly 8f6a7c0746]
Former-commit-id: 60bb04a055
2013-03-13 18:52:52 -05:00
Ron Anderson
39e2d27a89 Merge "Issue #1791 Implement bulk getGrids to improve performance. Change-Id: I13ed0e9c803444845c1b3a26600ec923fb7a6e74" into omaha_13.3.1
Former-commit-id: 0c881b4a85 [formerly 3b65608373] [formerly 0c881b4a85 [formerly 3b65608373] [formerly 61f74305e2 [formerly 437a30971b299965540d47f572ad83cd0d7df120]]]
Former-commit-id: 61f74305e2
Former-commit-id: de14cd0baa [formerly a7b6e1689b]
Former-commit-id: b1088415cd
2013-03-13 17:16:37 -05:00
Ben Steffensmeier
f012dd8b0a Issue #1791 Implement bulk getGrids to improve performance.
Change-Id: I13ed0e9c803444845c1b3a26600ec923fb7a6e74

Former-commit-id: 37bae0988b [formerly 4c150b0fd6] [formerly 37bae0988b [formerly 4c150b0fd6] [formerly 89eb902284 [formerly 907f19c70cbfff4f8b266339967cedfbf9907c97]]]
Former-commit-id: 89eb902284
Former-commit-id: f5680beaa9 [formerly 7abf3cfb39]
Former-commit-id: 6d699f7713
2013-03-13 17:09:20 -05:00
Dave Hladky
b85e19282b Issue #1782 Merge branch master_13.3.1 into omaha_13.3.1
Former-commit-id: 765be278bb [formerly 38b952a220] [formerly 765be278bb [formerly 38b952a220] [formerly 5dc454c7ef [formerly 7b2ba6522a24b0baf1ce950c1fee3cf895ba7753]]]
Former-commit-id: 5dc454c7ef
Former-commit-id: 9e97fc9efe [formerly 160e1594b8]
Former-commit-id: cb5ee4a7b8
2013-03-13 13:56:33 -05:00
Steve Harris
88b28c39c1 13.3.1-7 baseline
Former-commit-id: 97d2f521e4 [formerly a72254cc75] [formerly 97d2f521e4 [formerly a72254cc75] [formerly e12ed113ae [formerly aa42eb84d41a7f0577ab8ce8555c0922833f96f1]]]
Former-commit-id: e12ed113ae
Former-commit-id: ed5f1dbab6 [formerly 31c0a97dca]
Former-commit-id: 3084a860cd
2013-03-13 09:50:28 -05:00
Ron Anderson
45e3384b2f Issue #1597 Provide valid default settings. Deploy gfe.xml config file.
Change-Id: Ic34e231a8f10ba55051b89f6081f081b402a01c8

Former-commit-id: f1d5ff7c9e [formerly fdeb45705b] [formerly f1d5ff7c9e [formerly fdeb45705b] [formerly e8f1b460ce [formerly 53a924067c39e7f92b2f3280acf2cb6d15e2af03]]]
Former-commit-id: e8f1b460ce
Former-commit-id: fd86a481a7 [formerly 78a8d8f1a1]
Former-commit-id: 51d7975583
2013-03-04 09:30:04 -06:00
Ron Anderson
6322f61325 Issue #1597 Moved some interpolation messages to Performance Log for consistency.
Change-Id: I1bd047ada89b0e9876549c6153d06c82e4dfc5c8

Former-commit-id: f491d7f7c3 [formerly c9ca7a2943] [formerly f491d7f7c3 [formerly c9ca7a2943] [formerly 079cdbcb29 [formerly 4683ff00b8bc515fc2f802810fc2caba37c282d8]]]
Former-commit-id: 079cdbcb29
Former-commit-id: b2bffcf0de [formerly a5195e137e]
Former-commit-id: ad73782c8b
2013-02-27 14:45:30 -06:00
Ron Anderson
cb2ec02843 Issue #1708 Clean up error handling for scripts with errors. Remove some verbose logging.
Change-Id: Ic05b985cf6cb79299fb55dc9eee4b3205ed3fb27

Former-commit-id: 50f5e44b39 [formerly 36be1c5850] [formerly 50f5e44b39 [formerly 36be1c5850] [formerly c35e06d82c [formerly cb612d51394a261d12826d6d3ea9553f399ed2a9]]]
Former-commit-id: c35e06d82c
Former-commit-id: e240568bb9 [formerly 5bd0dbcfca]
Former-commit-id: d75331a5c9
2013-02-27 12:34:40 -06:00
Ron Anderson
48abd41c6e Issue #1708 Fix redundant excution of evaluateQuery.
Change-Id: Ic41ac2b455755a59c189fa5ec0ca63b45bfca80a

Former-commit-id: 2212f333a3 [formerly a5a273c1c2] [formerly 2212f333a3 [formerly a5a273c1c2] [formerly 274ce762d8 [formerly 2528719c05a9c57ca56a6d6e56ed3ae853d5b860]]]
Former-commit-id: 274ce762d8
Former-commit-id: 93382aeed8 [formerly 84bd642290]
Former-commit-id: 36f44524d0
2013-02-26 19:00:56 -06:00
Ron Anderson
59c7ee5120 Issue #1597 Code cleanup and logging improvement for GFE Performance metrics
Change-Id: Ib4d92b3c5a270e28a75beb5fbb5cf56557165765

Former-commit-id: d43afc8c67 [formerly bfe3c684df] [formerly d43afc8c67 [formerly bfe3c684df] [formerly f37999b1eb [formerly 0b4b49014598aeb94492d0b713afe17732c6e029]]]
Former-commit-id: f37999b1eb
Former-commit-id: 541557e0b0 [formerly 77fbbb6a61]
Former-commit-id: 92abcad349
2013-02-26 18:44:51 -06:00
Matt Nash
feb05cfeda Issue #1506 fix deadlock and edit areas showing up from query
Change-Id: I1a8f8adbb4a6e737c06a6c906cd4db0926254b49

Former-commit-id: 4be89bdd43 [formerly c728f72ea3] [formerly 4be89bdd43 [formerly c728f72ea3] [formerly b749edca54 [formerly 5fd67088da350141cc97d90346272843dfc7ff5d]]]
Former-commit-id: b749edca54
Former-commit-id: daea84a1e8 [formerly 51e6302178]
Former-commit-id: 18ccbd7c5d
2013-02-26 12:20:08 -06:00
Steve Harris
9db68d0585 Merge branch 'development' into omaha_13.3.1
Former-commit-id: 0a4564eb97 [formerly 67f090638f] [formerly 0a4564eb97 [formerly 67f090638f] [formerly 6ec9e73035 [formerly 52683c1ffba08b80b0d1f2b619161e108ca598b8]]]
Former-commit-id: 6ec9e73035
Former-commit-id: e46625f8f2 [formerly 0051276ad1]
Former-commit-id: 140ae3191c
2013-02-25 15:58:48 -06:00
Steve Harris
b5d9e75b95 Merge branch 'development' into omaha_13.3.1
Conflicts:
	cave/com.raytheon.uf.viz.core.maps/META-INF/MANIFEST.MF
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FfmpBasinTableDlg.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/resource/MultiPointResource.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDisplayDlg.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDlg.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesconfigAction.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	cave/com.raytheon.viz.volumebrowser/src/com/raytheon/viz/volumebrowser/vbui/ProductTableComp.java

Former-commit-id: 64744fdb19 [formerly a0573644c4] [formerly 64744fdb19 [formerly a0573644c4] [formerly 2641d578e2 [formerly e768a3e3a5016a88a4f0a3faa4bc82cfe0d9709c]]]
Former-commit-id: 2641d578e2
Former-commit-id: 4f155a183a [formerly 33dd2589f1]
Former-commit-id: f3c3191a1c
2013-02-21 15:41:39 -06:00
Matt Nash
0b9fcbbffe Issue #1506 fix for GFE evaluateRefSet() for non-queries
Change-Id: I342ce5c5e0449b7f5f4f81865705ed55aff3c5a7

Former-commit-id: 6f9621adb2 [formerly 2001d916ac] [formerly 6f9621adb2 [formerly 2001d916ac] [formerly 492df9c238 [formerly 2f9911c6e28fd3b5617353ec8de80c16f812c508]]]
Former-commit-id: 492df9c238
Former-commit-id: 84f3da4828 [formerly 5d6a7a6140]
Former-commit-id: 441c6646ef
2013-02-21 09:01:33 -06:00
Steve Harris
8c828dbd75 13.3.1-1 baseline
Former-commit-id: 8ae397085e [formerly 71e8990021] [formerly 8ae397085e [formerly 71e8990021] [formerly d2a654625f [formerly 34684c71436ce4c395ea523eb34ded6792476816]]]
Former-commit-id: d2a654625f
Former-commit-id: e4435815c9 [formerly 46d28be4a4]
Former-commit-id: b3b56830b0
2013-02-20 16:19:40 -06:00
Ron Anderson
b6cd0dfcf8 Merge "Issue #1616 Add option for interpolation of colormap parameters, disable colormap interpolation by default. Change-Id: I48738965df0da9052f810dfc1f312ed032693390" into development
Former-commit-id: 70050ac749 [formerly f1ad632c3f] [formerly 70050ac749 [formerly f1ad632c3f] [formerly 884d9ff787 [formerly ec5be70336a0f6bb6874c51b72b67046fbde2c68]]]
Former-commit-id: 884d9ff787
Former-commit-id: 744391e3f6 [formerly 2c8d14406b]
Former-commit-id: fa5872a35d
2013-02-19 18:46:16 -06:00
Steve Harris
77a66598fe Merge branch 'omaha_13.2.1' (13.2.1-8) into development
Former-commit-id: c2327ce33d [formerly ea50a5db77] [formerly c2327ce33d [formerly ea50a5db77] [formerly d123c044c3 [formerly 819f88fb8b26ec0a83164df82b31e9b824b49da8]]]
Former-commit-id: d123c044c3
Former-commit-id: 81f1fb83a0 [formerly 1c08acab38]
Former-commit-id: 5a33182da5
2013-02-19 12:22:00 -06:00
Steve Harris
32ad300b47 13.2.1-8 baseline
Former-commit-id: 18da2e93d7 [formerly f81b382c04] [formerly 18da2e93d7 [formerly f81b382c04] [formerly 053156f02e [formerly f64f1b68b75f4903ab4bb7f7d60bbe4f1f59c669]]]
Former-commit-id: 053156f02e
Former-commit-id: 8cffb55371 [formerly c6d584758f]
Former-commit-id: edac913af7
2013-02-18 09:09:41 -06:00
Ron Anderson
0ef1805569 Merge "Issue #1507: Improve responsiveness of menus that list smart tools or procedures by forcing UIControllers to be constructed at startup, not on demand." into development
Former-commit-id: cf0fc8d921 [formerly e70cfc5825] [formerly cf0fc8d921 [formerly e70cfc5825] [formerly a6d87cdd7e [formerly a1e38ed2f2da79028b04589a548b16543700f08f]]]
Former-commit-id: a6d87cdd7e
Former-commit-id: 292614bc25 [formerly 999ac02aea]
Former-commit-id: 873a7075ae
2013-02-18 08:31:50 -06:00
Richard Peter
3b53668cbe Merge "Issue #1506 move away from using QueryScript on the UI thread, except where absolutely necessary we can run a synchronous operation" into development
Former-commit-id: 5bf0e0e999 [formerly 51533ccab2] [formerly 5bf0e0e999 [formerly 51533ccab2] [formerly 70f270ff16 [formerly 07f3be5e44386a8138556b0269d3e731c6e1ef5f]]]
Former-commit-id: 70f270ff16
Former-commit-id: 1b112227a8 [formerly 2299503559]
Former-commit-id: 73501955ff
2013-02-15 16:40:04 -06:00
David Gillingham
f21dbe9026 Issue #1507: Improve responsiveness of menus that list smart tools or procedures by forcing
UIControllers to be constructed at startup, not on demand.

Change-Id: Ifb492171ac4720e36f68da082c38d31c1de08132

Former-commit-id: 9fae6695e2 [formerly 871364d630] [formerly 9fae6695e2 [formerly 871364d630] [formerly da091b723d [formerly 463af46e64ed667efbc840d85f9babf3449780cc]]]
Former-commit-id: da091b723d
Former-commit-id: cc05bdae4e [formerly 244bc9b270]
Former-commit-id: 345288aa13
2013-02-15 12:50:48 -06:00
Ben Steffensmeier
c300faa186 Issue #1616 Add option for interpolation of colormap parameters, disable colormap interpolation by default.
Change-Id: I48738965df0da9052f810dfc1f312ed032693390

Former-commit-id: 1940a92596 [formerly aa4c7526ff] [formerly 1940a92596 [formerly aa4c7526ff] [formerly 8c0e9d3d9e [formerly ccf08fbd82aac8b1ae1d4f42b455ec7c3f995970]]]
Former-commit-id: 8c0e9d3d9e
Former-commit-id: 086f6aabe9 [formerly 455aa4628f]
Former-commit-id: 49b700da85
2013-02-14 15:34:25 -06:00
Matt Nash
2939e7ea25 Issue #1506 move away from using QueryScript on the UI thread, except where
absolutely necessary we can run a synchronous operation

Change-Id: I4503d4e18e3f458b7df7c2d187e8880d5a3d2cc7

Former-commit-id: 75f51be7b2 [formerly bc954889eb] [formerly 75f51be7b2 [formerly bc954889eb] [formerly 5b136272a3 [formerly f6ef0f0ebc9002caad9a632515402b84280892fc]]]
Former-commit-id: 5b136272a3
Former-commit-id: 126537966c [formerly d29162c654]
Former-commit-id: c2d41ae6a2
2013-02-14 11:47:34 -06:00
David Gillingham
189e346a20 Issue #1515: Better handle notifications received after disposing VCParms.
Change-Id: Ia73102329755303b504871ed55f2a294ef390126

Former-commit-id: 02f2539433 [formerly 5b4de19ebd] [formerly 02f2539433 [formerly 5b4de19ebd] [formerly ddcc84262a [formerly ef9d97a4d0886df2072672b1cebc9b77e689308b]]]
Former-commit-id: ddcc84262a
Former-commit-id: a6883700ee [formerly 874434cea9]
Former-commit-id: dcf5c41129
2013-02-13 11:08:20 -06:00
Steve Harris
dc55ef579a 13.2.1-6 baseline
Former-commit-id: d66ad2f77b [formerly d0752de66c] [formerly d66ad2f77b [formerly d0752de66c] [formerly a46e33f06e [formerly 75e7c2a9423a7caa7f97143fa871be6d0ffe34bb]]]
Former-commit-id: a46e33f06e
Former-commit-id: bbe92e6824 [formerly 30d38334cc]
Former-commit-id: 0c128dd8f0
2013-02-07 16:00:39 -06:00
Steve Harris
a11c8dff6d Merge branch '13.2.1_delivery' into development
Former-commit-id: da43a7a8ca [formerly 4bc8e9ab5c] [formerly da43a7a8ca [formerly 4bc8e9ab5c] [formerly 5ee47e098d [formerly 30e1ae8f245a60c780fcc79f54795ece0b28088f]]]
Former-commit-id: 5ee47e098d
Former-commit-id: b119d66cda [formerly 3ad515e28f]
Former-commit-id: d73efe8e86
2013-02-06 11:12:01 -06:00
Steve Harris
f997ecea38 Merge branch 'ss_builds' (13.2.1-5) into 13.2.1_delivery
Conflicts:
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java

Former-commit-id: 14f23d4227 [formerly a16ac7819c] [formerly 14f23d4227 [formerly a16ac7819c] [formerly 6c6b53679b [formerly 873c1773504d6dd9421b92f6193c32e477e4533c]]]
Former-commit-id: 6c6b53679b
Former-commit-id: 48a0ffda4d [formerly 28ddc9bad8]
Former-commit-id: f028c16f79
2013-02-06 11:08:53 -06:00
Steve Harris
f36867a520 13.2.1-5 baseline
Former-commit-id: a6b3cde1ff [formerly 232734091d] [formerly a6b3cde1ff [formerly 232734091d] [formerly 146fcc6da8 [formerly c56f1fdc3e2419c5dd6bebbbb1e0e688bd5e0092]]]
Former-commit-id: 146fcc6da8
Former-commit-id: 7497a15e22 [formerly 1c602ec3a7]
Former-commit-id: bb0759d5ad
2013-02-06 11:02:32 -06:00
Steve Harris
f8420bc7e1 13.2.1-5 baseline
Former-commit-id: d6a9d68c10 [formerly a11ab8f26e] [formerly d6a9d68c10 [formerly a11ab8f26e] [formerly d26a488ee4 [formerly d117c677ade20193836680bc7905ba7bbf9c67b2]]]
Former-commit-id: d26a488ee4
Former-commit-id: 72ca459f76 [formerly 4a745c9483]
Former-commit-id: 62edcd29eb
2013-02-04 16:31:26 -06:00
Steve Harris
5ae95b956b 13.2.1-4 baseline
Former-commit-id: ae2859d5a2 [formerly 8f2e7d4437] [formerly ae2859d5a2 [formerly 8f2e7d4437] [formerly 0d7f53b6f4 [formerly d4fd198979dbc5d77a6bf836685cb658e7ac6cfe]]]
Former-commit-id: 0d7f53b6f4
Former-commit-id: 3f25b862c8 [formerly 2998f750f4]
Former-commit-id: 0a4ef8c084
2013-01-31 11:40:31 -06:00
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
Steve Harris
ab562e22a4 13.2.1-3 baseline
Former-commit-id: a5a0da5c02 [formerly 7435527b25] [formerly a5a0da5c02 [formerly 7435527b25] [formerly 2b6ac028bd [formerly ba03739c3528638c5383528fd64674ae5af1ed64]]]
Former-commit-id: 2b6ac028bd
Former-commit-id: 9d248cff7a [formerly cc0fdef15c]
Former-commit-id: 082e66584a
2013-01-23 11:24:17 -05:00
Steve Harris
2779f5c6d9 13.2.1-2 baseline
Former-commit-id: 33bc5fd816 [formerly 83e9157df7] [formerly 33bc5fd816 [formerly 83e9157df7] [formerly 328c6dccad [formerly bd9eec1d4e6fd843c7bb594b8adb882d72edc6cf]]]
Former-commit-id: 328c6dccad
Former-commit-id: d9be4dce21 [formerly 47cc08ac79]
Former-commit-id: 547c1dedd1
2013-01-23 11:18:44 -05:00
Steve Harris
08bf724a6c 13.2.1-1 baseline
Former-commit-id: 48d1aa7732 [formerly 9771dfae6b] [formerly 48d1aa7732 [formerly 9771dfae6b] [formerly c63f9bcae0 [formerly 6831a29efca54cfde39ab6a462f76ca2ac206f49]]]
Former-commit-id: c63f9bcae0
Former-commit-id: 8ed6a53113 [formerly f6670806bf]
Former-commit-id: 9146e727f9
2013-01-23 11:13:03 -05: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