Steve Harris
3df38c0fc6
Merge branch 'development' of ssh://lightning.omaha.us.ray.com:29418/AWIPS2_baseline into development
...
Former-commit-id: 9bcabe2c5d
[formerly 9bcabe2c5d
[formerly 16bc4b8c4e0261039a6c689afb4220f2ca6d904a]]
Former-commit-id: 098b1e1579
Former-commit-id: 57440abebb
2013-02-25 20:41:26 -06:00
Richard Peter
d1917a79a2
Merge "Issue #1659 Stop derived parameters from sending empty requests for cached times" into development
...
Former-commit-id: be9370576a
[formerly be9370576a
[formerly 53850dcdaf54d9ef74bb08cca5b966c448cc054e]]
Former-commit-id: 1669945cdb
Former-commit-id: aa5f3c80a0
2013-02-25 17:47:14 -06:00
Richard Peter
731710f355
Merge "Issue #1659 Add PDOs to D2DGridResource in constructor to avoid duplicate data requests." into development
...
Former-commit-id: b98bdb3d81
[formerly b98bdb3d81
[formerly bedfb6a21680961421b42bcbcec470e41bb9523d]]
Former-commit-id: 3b718bea52
Former-commit-id: c21a1e9f61
2013-02-25 17:46:26 -06:00
Lee Venable
8af64a568d
Merge "Issue #1625 Updated addOrRemoveCounty method." into development
...
Former-commit-id: e024e4e087
[formerly e024e4e087
[formerly cda14b7c5e6563a9165fa734f35766816bccccf1]]
Former-commit-id: 7f769af427
Former-commit-id: 0125935a7f
2013-02-25 17:25:56 -06:00
Jonathan Sanchez
b275cdf701
Issue #1625 Updated addOrRemoveCounty method.
...
Former-commit-id: cd6dd3c178
[formerly cd6dd3c178
[formerly 18760c0895c1776dd0448b0bb699ab5506c45511]]
Former-commit-id: 8c2c7c97f7
Former-commit-id: d4f4832d1a
2013-02-25 17:15:09 -06:00
Ben Steffensmeier
de75bbf5a7
Issue #1659 Stop derived parameters from sending empty requests for cached times
...
Former-commit-id: 71652af086
[formerly 71652af086
[formerly 9605118022d378eb35c38d784729410d160d46df]]
Former-commit-id: 9edeadc966
Former-commit-id: d6c59cb85a
2013-02-25 17:08:12 -06:00
Ben Steffensmeier
bb8554031f
Issue #1659 Add PDOs to D2DGridResource in constructor to avoid duplicate data requests.
...
Former-commit-id: fd2450c0df
[formerly fd2450c0df
[formerly 4826ccdd4db42342f913cfc9e9fef6bc276dcea9]]
Former-commit-id: 2fa5fb488e
Former-commit-id: e1e7a12ca2
2013-02-25 16:58:25 -06:00
Ben Steffensmeier
02f1f6a065
Issue #1659 Cache station in StationUtils
...
Former-commit-id: 842437870e
[formerly 842437870e
[formerly 5bd8303893ad59a23571c0564984b21da9ffe785]]
Former-commit-id: 39bf907df7
Former-commit-id: 5be0eab696
2013-02-25 16:25:55 -06:00
Steve Harris
1d8b6e0256
Merge branch 'master_13.3.1' into omaha_13.3.1
...
Conflicts:
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
Former-commit-id: b50e384a0f
[formerly b50e384a0f
[formerly 2506058a672fce230e445bcc5bf8ae2f52df0766]]
Former-commit-id: e8135b9c14
Former-commit-id: 2398ef1e85
2013-02-25 16:05:22 -06:00
Steve Harris
140ae3191c
Merge branch 'development' into omaha_13.3.1
...
Former-commit-id: 67f090638f
[formerly 67f090638f
[formerly 52683c1ffba08b80b0d1f2b619161e108ca598b8]]
Former-commit-id: 6ec9e73035
Former-commit-id: 0051276ad1
2013-02-25 15:58:48 -06:00
Mike Duff
ce30c45c88
Issue #1588 - Fix match any/all in data browser dialog
...
Change-Id: I30491d170611f3eec44adcf8b2bd99a445c09a49
Former-commit-id: d00a790d7b
[formerly d00a790d7b
[formerly b9945e70a6b96a2f4b1c24b2308bb424e4cd7ee5]]
Former-commit-id: 086d24acc8
Former-commit-id: 1365596d4d
2013-02-25 15:53:55 -06:00
Dustin Johnson
c67c766b34
Merge "Issue #1620 - Fix set clean issue with job loader." into development
...
Former-commit-id: 83a915210d
[formerly 83a915210d
[formerly a6bcea8679319fc49f59310b6731e23a00fb8554]]
Former-commit-id: eff20112d2
Former-commit-id: 1255b87e2e
2013-02-25 09:43:19 -06:00
Nate Jensen
df183bb4da
Merge "Issue #1617 fixed vb sounding point selection for points which contain the word Point" into development
...
Former-commit-id: b514792bbc
[formerly b514792bbc
[formerly 1fec56c55d81b35df45c2266fc234747df3791df]]
Former-commit-id: 5d828d4d62
Former-commit-id: cb37bab362
2013-02-25 09:31:55 -06:00
Nate Jensen
ff80c774e3
Merge "Issue #1628 lower Xmx on windows in awips.product." into development
...
Former-commit-id: c1becf797a
[formerly c1becf797a
[formerly 8525b4ac1db570160253cf7bb180914967e0b647]]
Former-commit-id: 545caf22fb
Former-commit-id: 87a745eb2f
2013-02-25 09:31:20 -06:00
Mike Duff
a92492ed07
Issue #1552 - Implement FFMP Data Access
...
Peer review comments
Change-Id: Ibf11c96248972a86a6a0d779ba482cd133125b55
Former-commit-id: 8bddd467b1
[formerly 8bddd467b1
[formerly 544c90e8a0b5aba5470e60beac18d86d972c05cd]]
Former-commit-id: 81649d346a
Former-commit-id: b1a549a99f
2013-02-25 09:29:16 -06:00
Steve Harris
1ba778753f
13.3.1-3 baseline
...
Former-commit-id: 6572452887
[formerly 6572452887
[formerly dc9e245f83eb0136157f8ca71f80f7fb9eb04796]]
Former-commit-id: 8a64f142e5
Former-commit-id: 8d741715e3
2013-02-25 10:24:53 -05:00
Steve Harris
2a2a9e03b7
13.3.1-2 baseline
...
Former-commit-id: df6d6f598e
[formerly df6d6f598e
[formerly 09fb11f28bef2c3cd8fb3bfe1b2fe88f3b30af6e]]
Former-commit-id: 3d115ed3be
Former-commit-id: e8a51dc780
2013-02-25 10:18:36 -05:00
Mike Duff
c99aaf6302
Issue #1620 - Fix set clean issue with job loader.
...
Change-Id: I1cf1e109ae3964ef95ebb9a2582622c31e271028
Former-commit-id: af8b97cd3c
[formerly af8b97cd3c
[formerly c436049a244e3a7c0c7fb629673d8f15c46c72a8]]
Former-commit-id: 3340a9ddd8
Former-commit-id: c904dc42ef
2013-02-24 19:13:57 -06:00
Roger Ferrel
b73720e881
Issue #1442 Fix null pointer exception in DecisonTree's searchTree
...
Change-Id: I5bf36da8aa6e8ef2a2efee08e01e232bff8eb7ef
Former-commit-id: 152715160e
[formerly 152715160e
[formerly 9ef63af71325c5b6694f41c78506d618078e0b9e]]
Former-commit-id: 09b5996dac
Former-commit-id: fd95a99596
2013-02-22 12:49:53 -06:00
Ben Steffensmeier
4dad2798e8
Issue #1617 fixed vb sounding point selection for points which contain the word Point
...
Former-commit-id: 1d8ad288b4
[formerly 1d8ad288b4
[formerly d2aa45b1fb765ae3f24d96b39b789195d5c607ed]]
Former-commit-id: 5701309bcb
Former-commit-id: 7c0f1bf788
2013-02-21 16:28:41 -06:00
Steve Harris
f3c3191a1c
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: a0573644c4
[formerly a0573644c4
[formerly e768a3e3a5016a88a4f0a3faa4bc82cfe0d9709c]]
Former-commit-id: 2641d578e2
Former-commit-id: 33dd2589f1
2013-02-21 15:41:39 -06:00
Ben Steffensmeier
b8ecbb9387
Issue #1628 lower Xmx on windows in awips.product.
...
Former-commit-id: 62eaf8e947
[formerly 62eaf8e947
[formerly 39d24c906c0aae925b9c472569c1d9e99dbd6021]]
Former-commit-id: 0bb2c03a83
Former-commit-id: 4209a3cfb1
2013-02-21 14:30:41 -06:00
Nate Jensen
767596401f
Merge "Issue #1635 Second Guidance source verification, general cleanup" into development
...
Former-commit-id: a9c4e54287
[formerly a9c4e54287
[formerly 25ecfc3e6199294275abc8547c482388c55be724]]
Former-commit-id: 73f53bd513
Former-commit-id: d7a57d2b34
2013-02-21 11:41:52 -06:00
Ron Anderson
1ce8dad54c
Merge "Issue #1506 fix for GFE evaluateRefSet() for non-queries" into development
...
Former-commit-id: 03c48b2f7a
[formerly 03c48b2f7a
[formerly 4397b9cad2c75e5d4fa3a1933394fadc8460153a]]
Former-commit-id: 297c132c49
Former-commit-id: ff2370221a
2013-02-21 09:10:07 -06:00
Matt Nash
441c6646ef
Issue #1506 fix for GFE evaluateRefSet() for non-queries
...
Change-Id: I342ce5c5e0449b7f5f4f81865705ed55aff3c5a7
Former-commit-id: 2001d916ac
[formerly 2001d916ac
[formerly 2f9911c6e28fd3b5617353ec8de80c16f812c508]]
Former-commit-id: 492df9c238
Former-commit-id: 5d6a7a6140
2013-02-21 09:01:33 -06:00
Steve Harris
654f15be5c
13.3.1-1 baseline
...
Former-commit-id: 0563d7ac18
[formerly 0563d7ac18
[formerly 841b0cf38549666c4f65f0d0cff3b92d76c9e795]]
Former-commit-id: cabc8cf8b4
Former-commit-id: 92e4c7ba19
2013-02-21 09:36:59 -05:00
Lee Venable
146afe1980
Merge "Issue #1609 update style rules for msl-P contours" into development
...
Former-commit-id: 46aa0595d8
[formerly 46aa0595d8
[formerly cb89924d5a8a751bd96fdfa3e2ccbed74c3ba815]]
Former-commit-id: 7d2452e0ef
Former-commit-id: fbaf19e184
2013-02-20 18:03:30 -06:00
Ben Steffensmeier
c46775f84a
Issue #1609 update style rules for msl-P contours
...
Former-commit-id: e7f73db73c
[formerly e7f73db73c
[formerly 2137a2aae531d5550a59d7c5afd77a8d1fc28bc8]]
Former-commit-id: f029f74a4f
Former-commit-id: 5b9e13aa3d
2013-02-20 17:27:16 -06:00
Steve Harris
b3b56830b0
13.3.1-1 baseline
...
Former-commit-id: 71e8990021
[formerly 71e8990021
[formerly 34684c71436ce4c395ea523eb34ded6792476816]]
Former-commit-id: d2a654625f
Former-commit-id: 46d28be4a4
2013-02-20 16:19:40 -06:00
Dave Hladky
cd74938355
Issue #1635 Second Guidance source verification, general cleanup
...
Change-Id: Ie7807a653862335ae50e11337c47c7c7fcbde526
Former-commit-id: 7b36b055f1
[formerly 7b36b055f1
[formerly 798b106211b1248c7fc932cfb2ebccddf15a0d66]]
Former-commit-id: 41f2ea7efe
Former-commit-id: b1c8f153e0
2013-02-20 16:13:08 -06:00
Mike Duff
c3d920d204
Issue #1589 - Fix saving of custom subset areas in spatial subset tab
...
Change-Id: I4143de4c3ab78a6da4de407d9035e70e264fe95a
Former-commit-id: 1511490c55
[formerly 1511490c55
[formerly 09e0a2450e8e1c860ae3e8d6354320cc0b2b6d88]]
Former-commit-id: f845137930
Former-commit-id: 7fcd553333
2013-02-20 14:57:58 -06:00
Nate Jensen
d5dceaaf93
Issue #1639 Replaced monitor's ConcurrentHashMaps with data structures, removed references to FFMPCacheRecord
...
Change-Id: I24cbcbfe1b3cc5309a78469da9ba021f6953b0eb
Former-commit-id: c2d4f8e164
[formerly c2d4f8e164
[formerly 4582146fd6f0ea348c7f4d01fdb68f6473439761]]
Former-commit-id: e6e2d8905c
Former-commit-id: a7b74e1f79
2013-02-20 13:48:26 -06:00
Ron Anderson
fa5872a35d
Merge "Issue #1616 Add option for interpolation of colormap parameters, disable colormap interpolation by default. Change-Id: I48738965df0da9052f810dfc1f312ed032693390" into development
...
Former-commit-id: f1ad632c3f
[formerly f1ad632c3f
[formerly ec5be70336a0f6bb6874c51b72b67046fbde2c68]]
Former-commit-id: 884d9ff787
Former-commit-id: 2c8d14406b
2013-02-19 18:46:16 -06:00
Steve Harris
5a33182da5
Merge branch 'omaha_13.2.1' (13.2.1-8) into development
...
Former-commit-id: ea50a5db77
[formerly ea50a5db77
[formerly 819f88fb8b26ec0a83164df82b31e9b824b49da8]]
Former-commit-id: d123c044c3
Former-commit-id: 1c08acab38
2013-02-19 12:22:00 -06:00
Roger Ferrel
47c549c5e8
Issue #1633 Change to WarnGenDialog so the checkFollowupSelection method uses Simulated Time.
...
Change-Id: I8d25084a88506f6e9bec72cfd40f02165d421869
Former-commit-id: 1b693994a5
[formerly 1b693994a5
[formerly 011b0822a8942d6dc4307b0a422060d9a97c7f8d]]
Former-commit-id: 1d51a10f4b
Former-commit-id: 211a39c333
2013-02-18 12:15:39 -06:00
Richard Peter
17dfe3e7fa
Merge "Issue #1584 - FFMP performance stats and performance logger Peer review comments Change-Id: I991b3fe21f1b458f45907bdc3b4716afc348992c" into development
...
Former-commit-id: 355e6d2c67
[formerly 355e6d2c67
[formerly a07a434ad71986aa4b474dd88e266035e347efa4]]
Former-commit-id: 4fb1cb27dc
Former-commit-id: 8991c1c86d
2013-02-18 09:35:53 -06:00
Steve Harris
ef8c4d6598
Merge branch 'master_13.2.1' (13.2.1-8) into omaha_13.2.1
...
Former-commit-id: ae66ccc3ee
[formerly ae66ccc3ee
[formerly 5e40606e95d506d213de3916f0f5d3a4eee7884a]]
Former-commit-id: acaef77d90
Former-commit-id: 8da2277243
2013-02-18 09:14:13 -06:00
Steve Harris
edac913af7
13.2.1-8 baseline
...
Former-commit-id: f81b382c04
[formerly f81b382c04
[formerly f64f1b68b75f4903ab4bb7f7d60bbe4f1f59c669]]
Former-commit-id: 053156f02e
Former-commit-id: c6d584758f
2013-02-18 09:09:41 -06:00
Ron Anderson
873a7075ae
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: e70cfc5825
[formerly e70cfc5825
[formerly a1e38ed2f2da79028b04589a548b16543700f08f]]
Former-commit-id: a6d87cdd7e
Former-commit-id: 999ac02aea
2013-02-18 08:31:50 -06:00
Steve Harris
7b6e374314
13.2.1-8 baseline
...
Former-commit-id: 27d88edcb9
[formerly 27d88edcb9
[formerly 1da0393f24829256c090d06ea8f7a0eca5e68bfd]]
Former-commit-id: 535a9402a7
Former-commit-id: a68ce64f45
2013-02-18 09:23:06 -05:00
Mike Duff
72f6e95a67
Issue #1584 - FFMP performance stats and performance logger
...
Peer review comments
Change-Id: I991b3fe21f1b458f45907bdc3b4716afc348992c
Former-commit-id: 0b044dba9c
[formerly 0b044dba9c
[formerly 1334488810c13f02e692c234a52d8f0f505a5846]]
Former-commit-id: 9c1e0ab639
Former-commit-id: 079ec4b6dd
2013-02-18 08:16:57 -06:00
Richard Peter
73501955ff
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: 51533ccab2
[formerly 51533ccab2
[formerly 07f3be5e44386a8138556b0269d3e731c6e1ef5f]]
Former-commit-id: 70f270ff16
Former-commit-id: 2299503559
2013-02-15 16:40:04 -06:00
Richard Peter
b5706ca6cf
Merge "Issue #1608 Fixed group deletes in H5pyDataStore.py" into development
...
Former-commit-id: a40ae4d8b2
[formerly a40ae4d8b2
[formerly 46302aa76056b00ee6a21c8080274ba23d92dcda]]
Former-commit-id: a6fa92923f
Former-commit-id: 5936f671ce
2013-02-15 16:33:00 -06:00
Ron Anderson
50be79358b
Issue #1629 fix error storing preferences in GIS Viewer
...
Change-Id: Id677dd9206c16f8c95b022e31fcac7acc6b07eb6
Former-commit-id: 689c32a9c3
[formerly 689c32a9c3
[formerly 7d73fd3f0f2d8ebbbf75d5928b06202f5f7cd42a]]
Former-commit-id: 354d8b0366
Former-commit-id: 4334fab2f9
2013-02-15 13:44:52 -06:00
David Gillingham
345288aa13
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: 871364d630
[formerly 871364d630
[formerly 463af46e64ed667efbc840d85f9babf3449780cc]]
Former-commit-id: da091b723d
Former-commit-id: 244bc9b270
2013-02-15 12:50:48 -06:00
Jonathan Sanchez
f948e7b5b6
Issue #1624 Temporary fix for NullPointerException.
...
Former-commit-id: f507d23fed
[formerly f507d23fed
[formerly f95a402347ae45ad133206bfea796b240decf0a6]]
Former-commit-id: fea6b44036
Former-commit-id: 1486022395
2013-02-15 12:31:21 -06:00
Lee Venable
8b3c710869
Merge "Issue #1607 Added time variables for CORs." into development
...
Former-commit-id: d94233499a
[formerly d94233499a
[formerly 7a6200d4bfe21feb6e29603dd638876f50a66162]]
Former-commit-id: 91e016aa34
Former-commit-id: 38bbca4895
2013-02-15 12:08:15 -06:00
Nate Jensen
1501b0f1e3
Merge "Issue #1614 Refactor data access framework to use single request. Change-Id: Id3ed7afcf79dfb2ddeca1d9c2b632f90cc44d798" into development
...
Former-commit-id: f748815e22
[formerly f748815e22
[formerly 55acd96d99a61170cbbc2b202e9562912b6fb0c3]]
Former-commit-id: f79f7db348
Former-commit-id: a60cf277bc
2013-02-15 11:56:11 -06:00
Ben Steffensmeier
f868f66f76
Issue #1614 Refactor data access framework to use single request.
...
Change-Id: Id3ed7afcf79dfb2ddeca1d9c2b632f90cc44d798
Former-commit-id: 1393f3e3cf
[formerly 1393f3e3cf
[formerly 5a9ae7df15633492b0d9fb648876cfb2bb2946b6]]
Former-commit-id: 0933a5f596
Former-commit-id: f0f3c71d50
2013-02-15 11:39:56 -06:00
Ron Anderson
95fd1b2d64
Issue #1629 Attempt to fix error saving preferences in GIS Viewer
...
Change-Id: I982637de1cc898d9887849a8276a3693b9579d5b
Former-commit-id: d574da6155
[formerly d574da6155
[formerly f0d1aa59c4971ed523e4f26b440134a417aec5d0]]
Former-commit-id: b76653a885
Former-commit-id: df84bf7f86
2013-02-15 11:13:43 -06:00