Steve Harris
901cbbf56d
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: cd99e680bb
[formerly b50e384a0f
] [formerly e8135b9c14
[formerly 2506058a672fce230e445bcc5bf8ae2f52df0766]]
Former-commit-id: e8135b9c14
Former-commit-id: 2398ef1e85
2013-02-25 16:05:22 -06:00
Steve Harris
e46625f8f2
Merge branch 'development' into omaha_13.3.1
...
Former-commit-id: 0a4564eb97
[formerly 67f090638f
] [formerly 6ec9e73035
[formerly 52683c1ffba08b80b0d1f2b619161e108ca598b8]]
Former-commit-id: 6ec9e73035
Former-commit-id: 0051276ad1
2013-02-25 15:58:48 -06:00
Mike Duff
dccb6b94b9
Issue #1588 - Fix match any/all in data browser dialog
...
Change-Id: I30491d170611f3eec44adcf8b2bd99a445c09a49
Former-commit-id: 0d2c817680
[formerly d00a790d7b
] [formerly 086d24acc8
[formerly b9945e70a6b96a2f4b1c24b2308bb424e4cd7ee5]]
Former-commit-id: 086d24acc8
Former-commit-id: 1365596d4d
2013-02-25 15:53:55 -06:00
Dustin Johnson
b702146272
Merge "Issue #1620 - Fix set clean issue with job loader." into development
...
Former-commit-id: 79718b6a9c
[formerly 83a915210d
] [formerly eff20112d2
[formerly a6bcea8679319fc49f59310b6731e23a00fb8554]]
Former-commit-id: eff20112d2
Former-commit-id: 1255b87e2e
2013-02-25 09:43:19 -06:00
Nate Jensen
3a66566610
Merge "Issue #1617 fixed vb sounding point selection for points which contain the word Point" into development
...
Former-commit-id: 5d7edbc0c1
[formerly b514792bbc
] [formerly 5d828d4d62
[formerly 1fec56c55d81b35df45c2266fc234747df3791df]]
Former-commit-id: 5d828d4d62
Former-commit-id: cb37bab362
2013-02-25 09:31:55 -06:00
Nate Jensen
530d3bfa00
Merge "Issue #1628 lower Xmx on windows in awips.product." into development
...
Former-commit-id: ae20ee7665
[formerly c1becf797a
] [formerly 545caf22fb
[formerly 8525b4ac1db570160253cf7bb180914967e0b647]]
Former-commit-id: 545caf22fb
Former-commit-id: 87a745eb2f
2013-02-25 09:31:20 -06:00
Mike Duff
01ef273417
Issue #1552 - Implement FFMP Data Access
...
Peer review comments
Change-Id: Ibf11c96248972a86a6a0d779ba482cd133125b55
Former-commit-id: 8a8e8f7a73
[formerly 8bddd467b1
] [formerly 81649d346a
[formerly 544c90e8a0b5aba5470e60beac18d86d972c05cd]]
Former-commit-id: 81649d346a
Former-commit-id: b1a549a99f
2013-02-25 09:29:16 -06:00
Steve Harris
05eb25f124
13.3.1-3 baseline
...
Former-commit-id: a55f438dd8
[formerly 6572452887
] [formerly 8a64f142e5
[formerly dc9e245f83eb0136157f8ca71f80f7fb9eb04796]]
Former-commit-id: 8a64f142e5
Former-commit-id: 8d741715e3
2013-02-25 10:24:53 -05:00
Steve Harris
370ed98038
13.3.1-2 baseline
...
Former-commit-id: 3e60b23072
[formerly df6d6f598e
] [formerly 3d115ed3be
[formerly 09fb11f28bef2c3cd8fb3bfe1b2fe88f3b30af6e]]
Former-commit-id: 3d115ed3be
Former-commit-id: e8a51dc780
2013-02-25 10:18:36 -05:00
Mike Duff
9e177f44cd
Issue #1620 - Fix set clean issue with job loader.
...
Change-Id: I1cf1e109ae3964ef95ebb9a2582622c31e271028
Former-commit-id: bfc1e66dfb
[formerly af8b97cd3c
] [formerly 3340a9ddd8
[formerly c436049a244e3a7c0c7fb629673d8f15c46c72a8]]
Former-commit-id: 3340a9ddd8
Former-commit-id: c904dc42ef
2013-02-24 19:13:57 -06:00
Roger Ferrel
186c71e5ac
Issue #1442 Fix null pointer exception in DecisonTree's searchTree
...
Change-Id: I5bf36da8aa6e8ef2a2efee08e01e232bff8eb7ef
Former-commit-id: 07a103c3bb
[formerly 152715160e
] [formerly 09b5996dac
[formerly 9ef63af71325c5b6694f41c78506d618078e0b9e]]
Former-commit-id: 09b5996dac
Former-commit-id: fd95a99596
2013-02-22 12:49:53 -06:00
Ben Steffensmeier
2892e64677
Issue #1617 fixed vb sounding point selection for points which contain the word Point
...
Former-commit-id: be95659d4a
[formerly 1d8ad288b4
] [formerly 5701309bcb
[formerly d2aa45b1fb765ae3f24d96b39b789195d5c607ed]]
Former-commit-id: 5701309bcb
Former-commit-id: 7c0f1bf788
2013-02-21 16:28:41 -06:00
Steve Harris
4f155a183a
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 2641d578e2
[formerly e768a3e3a5016a88a4f0a3faa4bc82cfe0d9709c]]
Former-commit-id: 2641d578e2
Former-commit-id: 33dd2589f1
2013-02-21 15:41:39 -06:00
Ben Steffensmeier
dd2d3da9bb
Issue #1628 lower Xmx on windows in awips.product.
...
Former-commit-id: 86f30a647d
[formerly 62eaf8e947
] [formerly 0bb2c03a83
[formerly 39d24c906c0aae925b9c472569c1d9e99dbd6021]]
Former-commit-id: 0bb2c03a83
Former-commit-id: 4209a3cfb1
2013-02-21 14:30:41 -06:00
Nate Jensen
6f9d3f55e5
Merge "Issue #1635 Second Guidance source verification, general cleanup" into development
...
Former-commit-id: 033b9e3852
[formerly a9c4e54287
] [formerly 73f53bd513
[formerly 25ecfc3e6199294275abc8547c482388c55be724]]
Former-commit-id: 73f53bd513
Former-commit-id: d7a57d2b34
2013-02-21 11:41:52 -06:00
Ron Anderson
e61af5611a
Merge "Issue #1506 fix for GFE evaluateRefSet() for non-queries" into development
...
Former-commit-id: e6ec21bd53
[formerly 03c48b2f7a
] [formerly 297c132c49
[formerly 4397b9cad2c75e5d4fa3a1933394fadc8460153a]]
Former-commit-id: 297c132c49
Former-commit-id: ff2370221a
2013-02-21 09:10:07 -06:00
Matt Nash
84f3da4828
Issue #1506 fix for GFE evaluateRefSet() for non-queries
...
Change-Id: I342ce5c5e0449b7f5f4f81865705ed55aff3c5a7
Former-commit-id: 6f9621adb2
[formerly 2001d916ac
] [formerly 492df9c238
[formerly 2f9911c6e28fd3b5617353ec8de80c16f812c508]]
Former-commit-id: 492df9c238
Former-commit-id: 5d6a7a6140
2013-02-21 09:01:33 -06:00
Steve Harris
0569ff413d
13.3.1-1 baseline
...
Former-commit-id: 96768407a5
[formerly 0563d7ac18
] [formerly cabc8cf8b4
[formerly 841b0cf38549666c4f65f0d0cff3b92d76c9e795]]
Former-commit-id: cabc8cf8b4
Former-commit-id: 92e4c7ba19
2013-02-21 09:36:59 -05:00
Lee Venable
997cebb2df
Merge "Issue #1609 update style rules for msl-P contours" into development
...
Former-commit-id: b82961dda2
[formerly 46aa0595d8
] [formerly 7d2452e0ef
[formerly cb89924d5a8a751bd96fdfa3e2ccbed74c3ba815]]
Former-commit-id: 7d2452e0ef
Former-commit-id: fbaf19e184
2013-02-20 18:03:30 -06:00
Ben Steffensmeier
894c7e7e62
Issue #1609 update style rules for msl-P contours
...
Former-commit-id: 6bf304ab80
[formerly e7f73db73c
] [formerly f029f74a4f
[formerly 2137a2aae531d5550a59d7c5afd77a8d1fc28bc8]]
Former-commit-id: f029f74a4f
Former-commit-id: 5b9e13aa3d
2013-02-20 17:27:16 -06:00
Steve Harris
e4435815c9
13.3.1-1 baseline
...
Former-commit-id: 8ae397085e
[formerly 71e8990021
] [formerly d2a654625f
[formerly 34684c71436ce4c395ea523eb34ded6792476816]]
Former-commit-id: d2a654625f
Former-commit-id: 46d28be4a4
2013-02-20 16:19:40 -06:00
Dave Hladky
261d00c544
Issue #1635 Second Guidance source verification, general cleanup
...
Change-Id: Ie7807a653862335ae50e11337c47c7c7fcbde526
Former-commit-id: e7993c968d
[formerly 7b36b055f1
] [formerly 41f2ea7efe
[formerly 798b106211b1248c7fc932cfb2ebccddf15a0d66]]
Former-commit-id: 41f2ea7efe
Former-commit-id: b1c8f153e0
2013-02-20 16:13:08 -06:00
Mike Duff
de3d5aec9a
Issue #1589 - Fix saving of custom subset areas in spatial subset tab
...
Change-Id: I4143de4c3ab78a6da4de407d9035e70e264fe95a
Former-commit-id: 4c47ee820d
[formerly 1511490c55
] [formerly f845137930
[formerly 09e0a2450e8e1c860ae3e8d6354320cc0b2b6d88]]
Former-commit-id: f845137930
Former-commit-id: 7fcd553333
2013-02-20 14:57:58 -06:00
Nate Jensen
f5a1165062
Issue #1639 Replaced monitor's ConcurrentHashMaps with data structures, removed references to FFMPCacheRecord
...
Change-Id: I24cbcbfe1b3cc5309a78469da9ba021f6953b0eb
Former-commit-id: e0884ed550
[formerly c2d4f8e164
] [formerly e6e2d8905c
[formerly 4582146fd6f0ea348c7f4d01fdb68f6473439761]]
Former-commit-id: e6e2d8905c
Former-commit-id: a7b74e1f79
2013-02-20 13:48:26 -06:00
Ron Anderson
744391e3f6
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 884d9ff787
[formerly ec5be70336a0f6bb6874c51b72b67046fbde2c68]]
Former-commit-id: 884d9ff787
Former-commit-id: 2c8d14406b
2013-02-19 18:46:16 -06:00
Steve Harris
81f1fb83a0
Merge branch 'omaha_13.2.1' (13.2.1-8) into development
...
Former-commit-id: c2327ce33d
[formerly ea50a5db77
] [formerly d123c044c3
[formerly 819f88fb8b26ec0a83164df82b31e9b824b49da8]]
Former-commit-id: d123c044c3
Former-commit-id: 1c08acab38
2013-02-19 12:22:00 -06:00
Roger Ferrel
94eb5757b5
Issue #1633 Change to WarnGenDialog so the checkFollowupSelection method uses Simulated Time.
...
Change-Id: I8d25084a88506f6e9bec72cfd40f02165d421869
Former-commit-id: a2e61d32a1
[formerly 1b693994a5
] [formerly 1d51a10f4b
[formerly 011b0822a8942d6dc4307b0a422060d9a97c7f8d]]
Former-commit-id: 1d51a10f4b
Former-commit-id: 211a39c333
2013-02-18 12:15:39 -06:00
Richard Peter
4f3d9ab931
Merge "Issue #1584 - FFMP performance stats and performance logger Peer review comments Change-Id: I991b3fe21f1b458f45907bdc3b4716afc348992c" into development
...
Former-commit-id: 3c126b0ab1
[formerly 355e6d2c67
] [formerly 4fb1cb27dc
[formerly a07a434ad71986aa4b474dd88e266035e347efa4]]
Former-commit-id: 4fb1cb27dc
Former-commit-id: 8991c1c86d
2013-02-18 09:35:53 -06:00
Steve Harris
2c7ff9b631
Merge branch 'master_13.2.1' (13.2.1-8) into omaha_13.2.1
...
Former-commit-id: 15d6e6ad3b
[formerly ae66ccc3ee
] [formerly acaef77d90
[formerly 5e40606e95d506d213de3916f0f5d3a4eee7884a]]
Former-commit-id: acaef77d90
Former-commit-id: 8da2277243
2013-02-18 09:14:13 -06:00
Steve Harris
8cffb55371
13.2.1-8 baseline
...
Former-commit-id: 18da2e93d7
[formerly f81b382c04
] [formerly 053156f02e
[formerly f64f1b68b75f4903ab4bb7f7d60bbe4f1f59c669]]
Former-commit-id: 053156f02e
Former-commit-id: c6d584758f
2013-02-18 09:09:41 -06:00
Ron Anderson
292614bc25
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 a6d87cdd7e
[formerly a1e38ed2f2da79028b04589a548b16543700f08f]]
Former-commit-id: a6d87cdd7e
Former-commit-id: 999ac02aea
2013-02-18 08:31:50 -06:00
Steve Harris
58bafc0068
13.2.1-8 baseline
...
Former-commit-id: da707ff25c
[formerly 27d88edcb9
] [formerly 535a9402a7
[formerly 1da0393f24829256c090d06ea8f7a0eca5e68bfd]]
Former-commit-id: 535a9402a7
Former-commit-id: a68ce64f45
2013-02-18 09:23:06 -05:00
Mike Duff
3e59308771
Issue #1584 - FFMP performance stats and performance logger
...
Peer review comments
Change-Id: I991b3fe21f1b458f45907bdc3b4716afc348992c
Former-commit-id: 897262630c
[formerly 0b044dba9c
] [formerly 9c1e0ab639
[formerly 1334488810c13f02e692c234a52d8f0f505a5846]]
Former-commit-id: 9c1e0ab639
Former-commit-id: 079ec4b6dd
2013-02-18 08:16:57 -06:00
Richard Peter
1b112227a8
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 70f270ff16
[formerly 07f3be5e44386a8138556b0269d3e731c6e1ef5f]]
Former-commit-id: 70f270ff16
Former-commit-id: 2299503559
2013-02-15 16:40:04 -06:00
Richard Peter
774ea0ede6
Merge "Issue #1608 Fixed group deletes in H5pyDataStore.py" into development
...
Former-commit-id: b3e2ca7b30
[formerly a40ae4d8b2
] [formerly a6fa92923f
[formerly 46302aa76056b00ee6a21c8080274ba23d92dcda]]
Former-commit-id: a6fa92923f
Former-commit-id: 5936f671ce
2013-02-15 16:33:00 -06:00
Ron Anderson
ca6ca60f22
Issue #1629 fix error storing preferences in GIS Viewer
...
Change-Id: Id677dd9206c16f8c95b022e31fcac7acc6b07eb6
Former-commit-id: d4a915b48d
[formerly 689c32a9c3
] [formerly 354d8b0366
[formerly 7d73fd3f0f2d8ebbbf75d5928b06202f5f7cd42a]]
Former-commit-id: 354d8b0366
Former-commit-id: 4334fab2f9
2013-02-15 13:44:52 -06:00
David Gillingham
cc05bdae4e
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 da091b723d
[formerly 463af46e64ed667efbc840d85f9babf3449780cc]]
Former-commit-id: da091b723d
Former-commit-id: 244bc9b270
2013-02-15 12:50:48 -06:00
Jonathan Sanchez
763280dd53
Issue #1624 Temporary fix for NullPointerException.
...
Former-commit-id: 18dd00e488
[formerly f507d23fed
] [formerly fea6b44036
[formerly f95a402347ae45ad133206bfea796b240decf0a6]]
Former-commit-id: fea6b44036
Former-commit-id: 1486022395
2013-02-15 12:31:21 -06:00
Lee Venable
5ec5918e45
Merge "Issue #1607 Added time variables for CORs." into development
...
Former-commit-id: 628d0d9840
[formerly d94233499a
] [formerly 91e016aa34
[formerly 7a6200d4bfe21feb6e29603dd638876f50a66162]]
Former-commit-id: 91e016aa34
Former-commit-id: 38bbca4895
2013-02-15 12:08:15 -06:00
Nate Jensen
d6ba283efc
Merge "Issue #1614 Refactor data access framework to use single request. Change-Id: Id3ed7afcf79dfb2ddeca1d9c2b632f90cc44d798" into development
...
Former-commit-id: 1b1e468e1f
[formerly f748815e22
] [formerly f79f7db348
[formerly 55acd96d99a61170cbbc2b202e9562912b6fb0c3]]
Former-commit-id: f79f7db348
Former-commit-id: a60cf277bc
2013-02-15 11:56:11 -06:00
Ben Steffensmeier
91bbdc3337
Issue #1614 Refactor data access framework to use single request.
...
Change-Id: Id3ed7afcf79dfb2ddeca1d9c2b632f90cc44d798
Former-commit-id: e771076275
[formerly 1393f3e3cf
] [formerly 0933a5f596
[formerly 5a9ae7df15633492b0d9fb648876cfb2bb2946b6]]
Former-commit-id: 0933a5f596
Former-commit-id: f0f3c71d50
2013-02-15 11:39:56 -06:00
Ron Anderson
632bd48a45
Issue #1629 Attempt to fix error saving preferences in GIS Viewer
...
Change-Id: I982637de1cc898d9887849a8276a3693b9579d5b
Former-commit-id: 3033238f1b
[formerly d574da6155
] [formerly b76653a885
[formerly f0d1aa59c4971ed523e4f26b440134a417aec5d0]]
Former-commit-id: b76653a885
Former-commit-id: df84bf7f86
2013-02-15 11:13:43 -06:00
Jonathan Sanchez
352d3dea5a
Issue #1607 Added time variables for CORs.
...
Former-commit-id: 38802d3df8
[formerly 6d968dc09d
] [formerly 3025639923
[formerly 311f633ba47efcf3b13f77867e1fa32a584f3232]]
Former-commit-id: 3025639923
Former-commit-id: bb797eeb74
2013-02-15 09:59:12 -06:00
Ron Anderson
d69d628450
Issue #1608 Fixed group deletes in H5pyDataStore.py
...
Change-Id: I9cd6e186646f9db40b0e498740fb4c63bc99b79a
Former-commit-id: dc7c9edb87
[formerly a2a89fb4e7
] [formerly 7c0a5d74bf
[formerly dc9ac54903107224633b4e18d5caa345649d8266]]
Former-commit-id: 7c0a5d74bf
Former-commit-id: e952a4f179
2013-02-15 09:03:41 -06:00
Dustin Johnson
d0ecd69456
Issue #1596 Do not reschedule bandwidth allocations when a subscription is removed
...
Change-Id: I4016034e6bdc5e8acf4936a0f786906611e7ad41
Former-commit-id: 4be6c12ac6
[formerly 714ea1c8d8
] [formerly 6e2f69939f
[formerly 5f87319abc3712667abc6b454f49882b0f3fb45f]]
Former-commit-id: 6e2f69939f
Former-commit-id: 1ef440f8ee
2013-02-15 08:13:11 -06:00
Nate Jensen
ebb3394719
Merge "Issue #1627 Sped up FFMp load by removing un-needed DB calls." into development
...
Former-commit-id: be680f2523
[formerly 7cf29fbf39
] [formerly 6d8b8dd774
[formerly c83110e509d662da0a4b1975bc1044fb7ffadb9e]]
Former-commit-id: 6d8b8dd774
Former-commit-id: 0ce3009528
2013-02-14 16:39:23 -06:00
Ben Steffensmeier
086f6aabe9
Issue #1616 Add option for interpolation of colormap parameters, disable colormap interpolation by default.
...
Change-Id: I48738965df0da9052f810dfc1f312ed032693390
Former-commit-id: 1940a92596
[formerly aa4c7526ff
] [formerly 8c0e9d3d9e
[formerly ccf08fbd82aac8b1ae1d4f42b455ec7c3f995970]]
Former-commit-id: 8c0e9d3d9e
Former-commit-id: 455aa4628f
2013-02-14 15:34:25 -06:00
Dave Hladky
7f6381ec5c
Issue #1627 Sped up FFMp load by removing un-needed DB calls.
...
Change-Id: Ice81630bd72b7f64d6f0817d2e531877b0072956
Former-commit-id: 83fe9ca104
[formerly 8247da158f
] [formerly a8f6635a6f
[formerly db09538ad0664b8a7f3eb83f062a47490975f7b1]]
Former-commit-id: a8f6635a6f
Former-commit-id: 4cd9b2e8b2
2013-02-14 15:12:29 -06:00
Nate Jensen
b4aea0385c
Merge "Issue #1569 Switched aggregate record writing to pypies. General sweep of ingestDAT" into development
...
Former-commit-id: 5526ee7e8d
[formerly 1144f08e59
] [formerly a3e0bf09ab
[formerly a8fbe37f3f30721d7a14c653993758c1a9f2d2ad]]
Former-commit-id: a3e0bf09ab
Former-commit-id: 3f5b8b56ef
2013-02-14 15:05:14 -06:00
Dave Hladky
a17dee033a
Issue #1569 Switched aggregate record writing to pypies. General sweep of ingestDAT
...
Change-Id: I693debea540667cfda6efe1496dd1084b8d0e950
Former-commit-id: 2655952304
[formerly 7b3a310f67
] [formerly 381aec5976
[formerly 2ea8409800917d8c9a4c76c3b63492a2eb1f2c62]]
Former-commit-id: 381aec5976
Former-commit-id: 5c66cbcd27
2013-02-14 13:58:32 -06:00