Commit graph

1548 commits

Author SHA1 Message Date
Nate Jensen
2b93ece40d Merge "Issue #1400 fix for local and regional warnings, made the WatchesResource better handle extension" into development
Former-commit-id: acccca74eb [formerly 67d30566c0] [formerly acccca74eb [formerly 67d30566c0] [formerly 823bedcebd [formerly e7b347563598a3f4809cc74096de1f2dc0ef0788]]]
Former-commit-id: 823bedcebd
Former-commit-id: 31d8e9a9ae [formerly 0388c1b179]
Former-commit-id: 6ac9952901
2012-12-13 14:25:56 -06:00
Lee Venable
6002363f85 Merge "Issue #1353 Fix bug in TextWorkstationDlg "Show All" option and TextEditorDialog cancel edit." into development
Former-commit-id: fabb15ab10 [formerly d098b2e271] [formerly fabb15ab10 [formerly d098b2e271] [formerly 3ca1080fa0 [formerly c7e9e83612df941e1c6a99cac5d07a724525bbb3]]]
Former-commit-id: 3ca1080fa0
Former-commit-id: 2c29835b63 [formerly 1be8e81228]
Former-commit-id: d202b932b3
2012-12-13 14:24:55 -06:00
Nate Jensen
c1c0b738e0 Merge "Issue #1369 add pattern to p2-build.xml file to match the new cots product" into development
Former-commit-id: c2bc33e51a [formerly f0340fba98] [formerly c2bc33e51a [formerly f0340fba98] [formerly 59f315f14b [formerly 4663e9a09db1fbf0e3f72dd9893e5daa73698f90]]]
Former-commit-id: 59f315f14b
Former-commit-id: ceceed5b27 [formerly e5ad2acde4]
Former-commit-id: af1c73a788
2012-12-13 14:13:57 -06:00
Roger Ferrel
946b0f7477 Issue #1353 Fix bug in TextWorkstationDlg "Show All" option and TextEditorDialog cancel edit.
Change-Id: Iaff7b8b64e2b1a94680c29087d174a27658c5873

Former-commit-id: 9d770cf725 [formerly 65699f7a26] [formerly 9d770cf725 [formerly 65699f7a26] [formerly 77c60c8925 [formerly 8eee3bf91d4e40b55b36f699ecf7ca37bc6591aa]]]
Former-commit-id: 77c60c8925
Former-commit-id: d3482bd513 [formerly 258dd80db8]
Former-commit-id: e78f65e222
2012-12-13 13:50:47 -06:00
Matt Nash
4284d53e3b Issue #1400 fix for local and regional warnings, made the WatchesResource better handle extension
Change-Id: I6cc0d8eb6079efc224136b67962903b75330c8e1

Former-commit-id: 9d35cdf724 [formerly c992d831af] [formerly 9d35cdf724 [formerly c992d831af] [formerly 3ff52fb9ff [formerly 8e1660c65bbb6ad76bdc44c3327819170c3244f5]]]
Former-commit-id: 3ff52fb9ff
Former-commit-id: 3f76c7ab62 [formerly 7d5f78c785]
Former-commit-id: 86b7a7de3d
2012-12-13 13:00:09 -06:00
Matt Nash
ef3d62999c Issue #1369 add pattern to p2-build.xml file to match the new cots product
Change-Id: I5a30c7fd6067b1c59794983c67b8186775af3849

Former-commit-id: a661c27de7 [formerly cf0090b7d4] [formerly a661c27de7 [formerly cf0090b7d4] [formerly 87b4d4b4e6 [formerly a862d259af867bd15d381e05e421d8d653ae4f21]]]
Former-commit-id: 87b4d4b4e6
Former-commit-id: 5de49c6734 [formerly 83b9a4dfb7]
Former-commit-id: 778191a87a
2012-12-13 12:42:40 -06:00
Richard Peter
2c06db239c Merge "Issue #1415 fix or level node time matching Change-Id: If4d05a6d181856dacc14a103fb51f2755dcf706a" into development
Former-commit-id: d773303870 [formerly 4b2e80da58] [formerly d773303870 [formerly 4b2e80da58] [formerly fffeaecbe5 [formerly 1f04e62af4557d74f9a5378d88571a01060b9891]]]
Former-commit-id: fffeaecbe5
Former-commit-id: 541c2cf5e3 [formerly d0cdd8f533]
Former-commit-id: e051ac15ec
2012-12-13 11:57:37 -06:00
Ben Steffensmeier
c01596aa63 Issue #1415 fix or level node time matching
Change-Id: If4d05a6d181856dacc14a103fb51f2755dcf706a

Former-commit-id: 80a3471237 [formerly 3ac43300fc] [formerly 80a3471237 [formerly 3ac43300fc] [formerly 9da83d3f4f [formerly 7ad0749d76328eafcd2f02137c099f7a302e0387]]]
Former-commit-id: 9da83d3f4f
Former-commit-id: 1a3f91949c [formerly 199577ed39]
Former-commit-id: 5826da0d8f
2012-12-13 11:35:15 -06:00
Nate Jensen
c47e4f7cc4 Merge "Issue #1421: Make hdf5 and database purge the same, update H5pyDataStore" into development
Former-commit-id: c2c508d495 [formerly 8953fcf4af] [formerly c2c508d495 [formerly 8953fcf4af] [formerly 8a6844e5a3 [formerly 93c0e07b71d33560678eb3781465e20e9222642d]]]
Former-commit-id: 8a6844e5a3
Former-commit-id: a9395e64ab [formerly 8208937771]
Former-commit-id: d57d70be63
2012-12-13 11:05:12 -06:00
Richard Peter
9b15f27832 Issue #1421: Make hdf5 and database purge the same, update H5pyDataStore
Change-Id: I9cbe9c5cb185b4eb999b0c0a2d6ff6b6d754d0e7

Former-commit-id: 3d4fb31161 [formerly 513dd75a23] [formerly 3d4fb31161 [formerly 513dd75a23] [formerly 08919e73c3 [formerly fb25e736d298225d217a1775891a65de7e0bd50c]]]
Former-commit-id: 08919e73c3
Former-commit-id: e2007e61e1 [formerly f7859723e5]
Former-commit-id: bf19dcd216
2012-12-13 11:02:07 -06:00
Matt Nash
bf2dcdb733 Issue #1369 add geosolutions project to cots feature
Change-Id: I62dd15c2f0d2ee017fcb3ad9483399b688c508f3

Former-commit-id: 6949c1f105 [formerly 1d56d879fb] [formerly 6949c1f105 [formerly 1d56d879fb] [formerly ab07a92d48 [formerly 01033bfd4b1b298095697267be60d978aa5c14a5]]]
Former-commit-id: ab07a92d48
Former-commit-id: 210da024a4 [formerly d24fab93dd]
Former-commit-id: 349ba67388
2012-12-13 09:40:49 -06:00
Ben Steffensmeier
5ac9e8b73c Issue #1401 add the word Grid in front of load properties because that always makes things better.
Former-commit-id: 8b3667d646 [formerly 1848f614fd] [formerly 8b3667d646 [formerly 1848f614fd] [formerly d43336bcbd [formerly 345673524a287d87efbdfcb60ef838dd78c33ae3]]]
Former-commit-id: d43336bcbd
Former-commit-id: 8c66a66834 [formerly ff5a5cac4c]
Former-commit-id: cf30a422fc
2012-12-12 14:33:48 -06:00
Nate Jensen
0c35a32997 Merge "Issue #1329 Committing some of the core classes touched for MPE time refactor. Made GL data mapping work properly with non float types. Made GriddedImageDisplay2 use new TileSetRenderable for processing and memory efficieny" into development
Former-commit-id: 291bb86680 [formerly d0fe7c860f] [formerly 291bb86680 [formerly d0fe7c860f] [formerly 6debcb5ff4 [formerly 9a388df8f163c1bbde711c12dcda1a7c8f70bf06]]]
Former-commit-id: 6debcb5ff4
Former-commit-id: 231ddfb978 [formerly 196fdc6110]
Former-commit-id: 3de4dd0821
2012-12-12 12:27:30 -06:00
Max Schenkelberg
2030832669 Issue #1329 Committing some of the core classes touched for MPE time refactor. Made GL data mapping work properly with non float types. Made GriddedImageDisplay2 use new TileSetRenderable for processing and memory efficieny
Change-Id: Ib12a3a6bb1f20f1e8eeb6dbd170802cf79359cfb

Former-commit-id: be99f6c7ca [formerly 3e128b266a] [formerly be99f6c7ca [formerly 3e128b266a] [formerly 5db71ca943 [formerly eaeb75b4f2dd1c19f805c8cf4f4d010b455d99e8]]]
Former-commit-id: 5db71ca943
Former-commit-id: d43e0c1c25 [formerly b74d788909]
Former-commit-id: 206116ab66
2012-12-12 11:39:32 -06:00
Nate Jensen
1aa8d304df Issue #1409 Initial implementation of hydro data access
Change-Id: I309694f9477384446658520794e19ca9493473fb

Former-commit-id: c236b4e1ad [formerly 817717fe0a] [formerly c236b4e1ad [formerly 817717fe0a] [formerly 85658e7e1d [formerly ae7ac8a8bfc51d1c7dc3493c8fc036a87772f323]]]
Former-commit-id: 85658e7e1d
Former-commit-id: 94b9d10c81 [formerly 3c2865bbd7]
Former-commit-id: 13dca3b784
2012-12-12 11:20:42 -06:00
Ron Anderson
4a539b10ce Issue #1395 Comment out change in p2-build.xml to fix build
Change-Id: I47d426383734b876d5def9ba03677ef7ff745403

Former-commit-id: c5cd2304a9 [formerly 5327d88a6d] [formerly c5cd2304a9 [formerly 5327d88a6d] [formerly 06fdf91a1c [formerly 4636ad873e7de401e6384dd42857265e962aa8d9]]]
Former-commit-id: 06fdf91a1c
Former-commit-id: f4624af03c [formerly 17b983ba02]
Former-commit-id: a41d5a1ad0
2012-12-12 09:09:28 -06:00
Ben Steffensmeier
9c9170d0e4 Issue #1356 add javadoc to subgrid changes.
Former-commit-id: c44dad8a5c [formerly 6da5ac2873] [formerly c44dad8a5c [formerly 6da5ac2873] [formerly 7e6d6fa794 [formerly 618c8a0accbfde0e95d47b76659f3804b32a7652]]]
Former-commit-id: 7e6d6fa794
Former-commit-id: 5d87636fb2 [formerly 47cb87096a]
Former-commit-id: 77e3f5ea79
2012-12-11 17:40:28 -06:00
Richard Peter
3986341ee0 Merge "Issue #1356 create subgrid for grib files with extra columns" into development
Former-commit-id: 559876930b [formerly 9f9c32fc4e] [formerly 559876930b [formerly 9f9c32fc4e] [formerly 4082968b07 [formerly d489dcb15e98ae3b07665df4fc2edd2bb852c7db]]]
Former-commit-id: 4082968b07
Former-commit-id: f7de6135ca [formerly ada54d8e92]
Former-commit-id: bd1ae5fdfd
2012-12-11 17:05:27 -06:00
Richard Peter
341868bed7 Merge "Issue #1390 fix envelope reprojection and add serializeable ojects for referenced envelopes Change-Id: I2e79709d1323ed17879b4f59229361fe935aa0ea" into development
Former-commit-id: 6bc665ca3a [formerly 63465edb95] [formerly 6bc665ca3a [formerly 63465edb95] [formerly 2a5171c2f3 [formerly 5117b93ee59b6c291d16e084d7a0be0e492b120f]]]
Former-commit-id: 2a5171c2f3
Former-commit-id: 6613cbf5ee [formerly 1100c4fa8b]
Former-commit-id: 27c261761c
2012-12-11 16:38:53 -06:00
Ben Steffensmeier
6334b9ee4e Issue #1390 fix envelope reprojection and add serializeable ojects for referenced envelopes
Change-Id: I2e79709d1323ed17879b4f59229361fe935aa0ea

Former-commit-id: b32d039c92 [formerly b77f1592a7] [formerly b32d039c92 [formerly b77f1592a7] [formerly 11d3ee3014 [formerly a6c7730ba1c0b07fdf21bef19717859fc7238724]]]
Former-commit-id: 11d3ee3014
Former-commit-id: a693a33f97 [formerly 9277840fad]
Former-commit-id: 765457b0db
2012-12-11 16:12:53 -06:00
Ron Anderson
ea5a6d9537 Merge "Issue #1395 Modifed AwipsCalender and added additional date/time related widgets" into development
Former-commit-id: 4ba089395c [formerly d05dc0c6ca] [formerly 4ba089395c [formerly d05dc0c6ca] [formerly 277c9cb0ec [formerly c6c26811ad96f862ae3ffb0e6d9056f0d9edecfb]]]
Former-commit-id: 277c9cb0ec
Former-commit-id: 14849786eb [formerly 087af45be8]
Former-commit-id: a0e7ae0f08
2012-12-11 16:09:24 -06:00
Ben Steffensmeier
0da60e90b9 Issue #1356 create subgrid for grib files with extra columns
Former-commit-id: dd560f4d15 [formerly c3e1005dc8] [formerly dd560f4d15 [formerly c3e1005dc8] [formerly a7a13d27cd [formerly c9c82e37fa21a01a7357c2e065aea435b325587f]]]
Former-commit-id: a7a13d27cd
Former-commit-id: ddcb3e675d [formerly 64922c17c5]
Former-commit-id: 9eba37d4fb
2012-12-11 16:00:03 -06:00
Roger Ferrel
42c5a7b343 Issue #1411 Change suggest by Dale Morris for pqact.conf.template.
Change-Id: I9101cb4eab47a82f64212f457d7e0eea11479cc4

Former-commit-id: 6929a73900 [formerly b677a5ba3d] [formerly 6929a73900 [formerly b677a5ba3d] [formerly aefa650cda [formerly b406c990607a06678a58e36118edcddaab073b26]]]
Former-commit-id: aefa650cda
Former-commit-id: 662d51cda1 [formerly f64a99d554]
Former-commit-id: d7a28eedfd
2012-12-11 15:43:54 -06:00
Ron Anderson
958957d603 Issue #1395 Modifed AwipsCalender and added additional date/time related widgets
Change-Id: I123a63ff4a42d36b2a35229dff719eda49097f7b

Former-commit-id: cc883294f1 [formerly bc5f445ecf] [formerly cc883294f1 [formerly bc5f445ecf] [formerly 43881be47a [formerly 475861fe615a070f1a3cad18dd798ba6db6b66e8]]]
Former-commit-id: 43881be47a
Former-commit-id: 01081fe723 [formerly 641d268bd8]
Former-commit-id: bd7162eca5
2012-12-11 13:31:05 -06:00
Nate Jensen
ff01a406c8 Merge "Issue #1362 create a new resource handler when nsharp is created in a side pane." into development
Former-commit-id: c34ff0c0b8 [formerly decb23f4ae] [formerly c34ff0c0b8 [formerly decb23f4ae] [formerly 773ff8c027 [formerly 273aed63277891eb091817c5769fe53ef3813759]]]
Former-commit-id: 773ff8c027
Former-commit-id: a3fb320e10 [formerly 5b1ca237b2]
Former-commit-id: 22c47a870a
2012-12-11 12:42:51 -06:00
Dustin Johnson
d346b7fb3e Issue #1407 EventBus changes to support sending notifications for subscription verification
Change-Id: I8f979e44520e32fa908aa700bb0c93596a2dd820

Former-commit-id: 79fa61bb8a [formerly 8b942c31dd] [formerly 79fa61bb8a [formerly 8b942c31dd] [formerly 3d900240b7 [formerly 12b51905d9b710ebc6fa54346d82cad9178b0bba]]]
Former-commit-id: 3d900240b7
Former-commit-id: 4de56a0141 [formerly e72d5dc09d]
Former-commit-id: 88625668bb
2012-12-11 09:37:20 -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
Ben Steffensmeier
cc5e452d3f Issue #1362 create a new resource handler when nsharp is created in a side pane.
Former-commit-id: 50ff73809f [formerly 52497f5630] [formerly 50ff73809f [formerly 52497f5630] [formerly 0eb454f0d4 [formerly 62cb0df39d0c24edc80d635f3bf90d2abc564b04]]]
Former-commit-id: 0eb454f0d4
Former-commit-id: d2f5643093 [formerly 84fa621b55]
Former-commit-id: c45e8c3123
2012-12-10 17:58:04 -06:00
Brad Gonzales
5959f06dbd Issue #1398 moved freezingLevel.cron from cron.properties to com.raytheon.uf.edex.ohd.properties.
Change-Id: I7f69e140c32c7650c193344e661062df3d09a54d

Former-commit-id: 4e44770674 [formerly bcff2c134c] [formerly 4e44770674 [formerly bcff2c134c] [formerly 6ab74bb6ab [formerly 5aa303242b0ca1abf08685b6197ddd17d465250c]]]
Former-commit-id: 6ab74bb6ab
Former-commit-id: 15b3a61287 [formerly 065ddf4d4a]
Former-commit-id: cb35e0f5e8
2012-12-10 14:08:54 -06:00
Richard Peter
9ac5db070a Merge "Issue #1367: Fix static topo route uri" into development
Former-commit-id: 3781119c4f [formerly 9a5fc20edb] [formerly 3781119c4f [formerly 9a5fc20edb] [formerly a33301394c [formerly 0bfbe098d5ae0bc93f536fd09e6fa5e63c6dd10d]]]
Former-commit-id: a33301394c
Former-commit-id: f78c720d68 [formerly 932f49fd2c]
Former-commit-id: 380f4d0f05
2012-12-10 12:59:36 -06:00
Lee Venable
2247ff9461 Merge "Issue #1353 Changes for non-blocking DamDisplayControlDlg." into development
Former-commit-id: 3afa901791 [formerly ef814e2d0b] [formerly 3afa901791 [formerly ef814e2d0b] [formerly 1175e34b0d [formerly ce03df033eac42f2d035a7483349ba9db315a2e4]]]
Former-commit-id: 1175e34b0d
Former-commit-id: 8b25017106 [formerly f122f274ac]
Former-commit-id: e7d5accc85
2012-12-10 12:55:16 -06:00
Richard Peter
8926967471 Issue #1367: Fix static topo route uri
Change-Id: Iba75a46bcd52356fd190573520639217aaa77d02

Former-commit-id: 328d065216 [formerly 44f90a6f65] [formerly 328d065216 [formerly 44f90a6f65] [formerly 7d292d1731 [formerly b4b395876a00f9b1a80314a90c0d88ea913e52bc]]]
Former-commit-id: 7d292d1731
Former-commit-id: b3cccde136 [formerly 8ba7c0ae7c]
Former-commit-id: 468c48e957
2012-12-10 12:40:18 -06:00
Richard Peter
d3b4ae2fdb Issue #1394: Reduce GFE Grid Database calls
Change-Id: I7462cca18b1b46169b25611dddbad844895be0cd

Former-commit-id: ac41861f0b [formerly 3c3c695f24] [formerly ac41861f0b [formerly 3c3c695f24] [formerly 0670ac79fa [formerly bc127f06236cb1e09dc0c87fee578e4a0cb60063]]]
Former-commit-id: 0670ac79fa
Former-commit-id: 912b2ec928 [formerly 0cdb86b6ac]
Former-commit-id: 9e837ef99c
2012-12-10 11:59:54 -06:00
Roger Ferrel
d8640632cd Issue #1353 Changes for non-blocking DamDisplayControlDlg.
Change-Id: I8a07b7ed7a7e46d243f0319850e2611e0cd05475

Former-commit-id: f9a8d30c4d [formerly 35261a7964] [formerly f9a8d30c4d [formerly 35261a7964] [formerly 40b8e4ec57 [formerly 25051f8e5de207d39cedcf5ff42ec1f8305c5c9a]]]
Former-commit-id: 40b8e4ec57
Former-commit-id: 80d7309ea7 [formerly fdad99bcc8]
Former-commit-id: 387c5d0e36
2012-12-10 11:30:06 -06:00
Lee Venable
5e23a89003 Merge "Issue #1353 Changes for non-blocking AlertAlarmValuesDlg, GetAppsDefaults, SHEFAppsDefaultsDlg and BestEstimateQpeDlg." into development
Former-commit-id: 3a4eb415f2 [formerly 59b2cf8872] [formerly 3a4eb415f2 [formerly 59b2cf8872] [formerly 8e7143967b [formerly 050d9cebb8de520c7ed0d27c686ebf84dc6d084c]]]
Former-commit-id: 8e7143967b
Former-commit-id: 17b9e0077c [formerly f3b9d1cb38]
Former-commit-id: b6e267419c
2012-12-10 11:28:34 -06:00
Roger Ferrel
50bf368b38 Issue #1353 Changes for non-blocking AlertAlarmValuesDlg, GetAppsDefaults, SHEFAppsDefaultsDlg and BestEstimateQpeDlg.
Change-Id: Id2826d4816c26454418d54811b0b0c81dc437481

Former-commit-id: f72e89ad2c [formerly 921566317a] [formerly f72e89ad2c [formerly 921566317a] [formerly 81966d39fc [formerly 62cdaba1d9e59c77efe6253105582894cd8596a0]]]
Former-commit-id: 81966d39fc
Former-commit-id: bc26433783 [formerly 053584c4e2]
Former-commit-id: 039b95d202
2012-12-07 14:43:53 -06:00
Slav Korolev
2d3674e3c2 Issue #1351. Changes for non-blocking dialog MonitorDisplayThreshDlg. Changes according to comments. Deleted unused file.
Change-Id: I62f1d4ad30ca4ed120c0ca94abf140a1e0b90ce6

Former-commit-id: 829899374d [formerly 48f074eb72] [formerly 829899374d [formerly 48f074eb72] [formerly 1a510a9f61 [formerly c063c2bdb4d4cc7c59917e9882fe78cabb63c06d]]]
Former-commit-id: 1a510a9f61
Former-commit-id: a0d07a46f9 [formerly 6bf265624d]
Former-commit-id: 0b82d18c64
2012-12-07 15:18:03 -05:00
Nate Jensen
8d184d92cd Merge "Issue #1328 Fixed invalid thread access issue when parm inventory changes and GridCanvas needs to redraw" into development
Former-commit-id: 80c743ac8b [formerly 4867cd2a64] [formerly 80c743ac8b [formerly 4867cd2a64] [formerly a505d78463 [formerly 6ae7f9a4947420a6985ecbe2834f9c9fc9f5cac4]]]
Former-commit-id: a505d78463
Former-commit-id: 7b004618b5 [formerly ef76ea6d61]
Former-commit-id: 50d01007dc
2012-12-07 13:32:29 -06:00
Lee Venable
b0f681e903 Merge "Issue #1353 old test code classes." into development
Former-commit-id: 4ae765fc4f [formerly 0d74bf9e67] [formerly 4ae765fc4f [formerly 0d74bf9e67] [formerly 4e13d01e67 [formerly 54765a26d6ca098133ff1e0b16c56e94e4053f74]]]
Former-commit-id: 4e13d01e67
Former-commit-id: 78a124efe3 [formerly fa143bd2e1]
Former-commit-id: e4c65073b1
2012-12-07 13:22:46 -06:00
Nate Jensen
df8e16bd63 Merge "Issue #1396 fix thin client" into development
Former-commit-id: 206e288594 [formerly 01c27ce5aa] [formerly 206e288594 [formerly 01c27ce5aa] [formerly f577fc578d [formerly 4ec3746745f0983226db5e0b9e4969ef0885c44f]]]
Former-commit-id: f577fc578d
Former-commit-id: 94bc1dc9ae [formerly 7257650eea]
Former-commit-id: fa676a5cf1
2012-12-07 13:18:41 -06:00
Richard Peter
038227b6fb Merge "Issue #1389 Create an adapter class and use Collections.binarySearch()" into development
Former-commit-id: 43584fa1bb [formerly 7588d18d02] [formerly 43584fa1bb [formerly 7588d18d02] [formerly 79d6219dc4 [formerly f21715c04be0c4e82975aab413110d00f64b1ebc]]]
Former-commit-id: 79d6219dc4
Former-commit-id: 1489ae1fdb [formerly 51d849368c]
Former-commit-id: 6ad6bc509f
2012-12-07 13:18:40 -06:00
Richard Peter
e2be79730b Merge "Issue #1367 broke grib ingest into two routes, better exception message from remote thrift service handler" into development
Former-commit-id: 1806a444bb [formerly 7b054e58ed] [formerly 1806a444bb [formerly 7b054e58ed] [formerly 18e4f52967 [formerly 0e79b66173d37d81e13f263c70685189ba924fc3]]]
Former-commit-id: 18e4f52967
Former-commit-id: 40287c3be1 [formerly c6fe3df93d]
Former-commit-id: a9bc67b4ef
2012-12-07 13:14:46 -06:00
Lee Venable
051cf6dcdd Merge "Issue #1353 Changes for non-blocking FFMPSplash and LoadSaveConfigDlg dialogs." into development
Former-commit-id: 6a8ae7c255 [formerly ee2572e7c0] [formerly 6a8ae7c255 [formerly ee2572e7c0] [formerly 650420354f [formerly c94fde29a1e43467378bc11100fbe0fdfcf7a51a]]]
Former-commit-id: 650420354f
Former-commit-id: dfb7dfc55a [formerly e5cf7d4ba5]
Former-commit-id: cdc302da70
2012-12-07 13:02:53 -06:00
Lee Venable
f17c2d0bc0 Merge "Issue #1351. Changes for non-blocking FogMonThreshSetupDlg. Changes according to comments." into development
Former-commit-id: bf83e5b5c6 [formerly 2c44afd3ab] [formerly bf83e5b5c6 [formerly 2c44afd3ab] [formerly 37b91cccb0 [formerly 4bab9df17245e28128644fcdbfb8bac6d4c6dc7e]]]
Former-commit-id: 37b91cccb0
Former-commit-id: b33bdc354e [formerly 78af1aa566]
Former-commit-id: 9ee06391e8
2012-12-07 12:52:44 -06:00
Nate Jensen
0ffbeecd4e Issue #1396 fix thin client
Change-Id: I58dc3f40594697d8332cc372f45f30bb28927100

Former-commit-id: 851f8977f3 [formerly 020b84e373] [formerly 851f8977f3 [formerly 020b84e373] [formerly 03e6f7ee16 [formerly 1afd50427bff0a11ebbf99eb3b29d2d8c3e02c44]]]
Former-commit-id: 03e6f7ee16
Former-commit-id: 7c0941e292 [formerly 496fa1ede9]
Former-commit-id: c1de3bcff5
2012-12-07 11:59:13 -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
Roger Ferrel
6406fe0ecb Issue #1353 old test code classes.
Change-Id: I5b0f7a45ff6e00c669aa1acc6493350f90a66350

Former-commit-id: 754afb9c52 [formerly cfb11d2d38] [formerly 754afb9c52 [formerly cfb11d2d38] [formerly 327f35c657 [formerly 51f185625e30425c1466a04d46b3eac39dfac4dc]]]
Former-commit-id: 327f35c657
Former-commit-id: ddab76526a [formerly 125d271d40]
Former-commit-id: 88a2587cbc
2012-12-07 11:27:31 -06:00
Max Schenkelberg
057dc3019a Issue #1328 Fixed time matching error for 4-panel products where No Data Available on some of the panes
Amend: Changed time cache object to have single setter for setting fields, changed map to identity map

Change-Id: I598e9033187b794631d1dbfc78bb018084ec95cf

Former-commit-id: dbc9141454 [formerly 8fc766ab05] [formerly dbc9141454 [formerly 8fc766ab05] [formerly 424c6e0b1b [formerly 9a5766f8a6bd61734b2f9e44aaabbef835d1d676]]]
Former-commit-id: 424c6e0b1b
Former-commit-id: 9a978a9156 [formerly 4cb9cc5632]
Former-commit-id: 87ad71d28d
2012-12-07 11:24:44 -06:00
Slav Korolev
02ea1250da Issue #1351. Changes for non-blocking FogMonThreshSetupDlg. Changes according to comments.
Change-Id: I605f6819def85f197e37e13803627baec67e6786

Former-commit-id: 349ea52e2b [formerly a284f0f50f] [formerly 349ea52e2b [formerly a284f0f50f] [formerly b650fa6675 [formerly 64fffb1598b943dc9890d2b9ee04a690c006bfe7]]]
Former-commit-id: b650fa6675
Former-commit-id: b5fc4b6800 [formerly 1c16ed59c1]
Former-commit-id: 61d69bbccf
2012-12-07 12:23:39 -05:00