Commit graph

1238 commits

Author SHA1 Message Date
Brad Gonzales
675a6f6b05 Issue #1274 Added Token control for java code and scripts started by RFC Crons.
Added tokens for app control to the Apps_Defaults configuration file.
Added AppsDefaults token checks to the cron java code and scripts.
Updated Executor.start() to load system properties from properties files
in a conf resources properties directory and also to load site specific
properties from a conf resources properties site directory.

Amend:
Removed tabs in MainMethod.java.
Updates from peer review.
Removed old commented out code in ohd cron properties file and commented-out code in MainMethod.execute().

Change-Id: I44e74791dadc9af09c99244d8d099cea581863cc

Former-commit-id: 0a60448e8f [formerly 75e77feb58] [formerly 68a3a98547] [formerly 44e9238fa9 [formerly 68a3a98547 [formerly 96bb97c32f664e015a29ac5c3187e6b27160a872]]]
Former-commit-id: 44e9238fa9
Former-commit-id: 62ae708ea7ab6aae87f7de0577fa4c1f706252c9 [formerly 253c19ae05]
Former-commit-id: 7807eca270
2012-10-31 21:20:40 -05:00
Roger Ferrel
a4f3368d3a Issue #1298 Changes for non-blocking MaskDialog, WeatherDialog and DiscreteDialog.
Change-Id: If2ddd15d3abb900cd309f790445bee08ff4e69cc

Former-commit-id: ac49925d87 [formerly 2b80c2c2b5] [formerly d92be142ad] [formerly 3c64544822 [formerly d92be142ad [formerly 17f789e76f77467935002d3b466b764ddb0b81f4]]]
Former-commit-id: 3c64544822
Former-commit-id: 71cceecb3f3563faa80a12b45a9976ddf14bf966 [formerly 1e0241e509]
Former-commit-id: b289472e49
2012-10-30 17:09:52 -05:00
Lee Venable
5226755f8b Merge "Issue #1298 Changes for GFEConfigDialog. Must be used as a blocking dialog." into development
Former-commit-id: 0b9b82f99d [formerly 51c60c1876] [formerly 868fe53216] [formerly 2c86fdb2d0 [formerly 868fe53216 [formerly 08784a33471cc96472370081f31d7d7edb2a61f7]]]
Former-commit-id: 2c86fdb2d0
Former-commit-id: f0a60833c7d918fac07817906b853f6e6861dcc3 [formerly 881a8e726b]
Former-commit-id: 7b0e8774db
2012-10-30 16:46:30 -05:00
Lee Venable
c24bec08e8 Merge "Issue #1298 Changes for non-blocking BrightnessDialog." into development
Former-commit-id: 06ae8809fa [formerly 08e6cd0a31] [formerly 1932ec171b548c2d697ec9747b98a6ec6e7a3882 [formerly 276ce2ad08]] [formerly e47d1beb09 [formerly 276ce2ad08 [formerly 8d14e957dc2152a31c813a9278646904e2a3c777]]]
Former-commit-id: e47d1beb09
Former-commit-id: 27b66859fd05b9181f78df1b75f9d85077739203 [formerly cebd35bb47]
Former-commit-id: f5008c2296
2012-10-30 16:45:35 -05:00
Lee Venable
2ccdedfb17 Merge "Issue #1298 Comments on GridMangerView on why SaveParameterDialog and KillJobsOnExit must stay blocking." into development
Former-commit-id: c98c1c4e22 [formerly eed01fd643] [formerly 33525e4dff] [formerly 0bc4ec2135 [formerly 33525e4dff [formerly 3bb9ad3e1fb050dba420fc634b742a73b4443ba2]]]
Former-commit-id: 0bc4ec2135
Former-commit-id: 095ff9019dff625b0566903fa6dca379274ddee1 [formerly 2d3eeeaacf]
Former-commit-id: 364fb3f463
2012-10-30 16:44:56 -05:00
Roger Ferrel
32f74189d6 Issue #1298 Changes for non-blocking ContourDialog and removal of ButtonEntryDialog.
Change-Id: I6151274f455066c03db49618d6b5801248d48527

Former-commit-id: b57c7c2db8 [formerly 84a338fd4c] [formerly 0c544da917] [formerly 7c8f48fcb5 [formerly 0c544da917 [formerly c67543535ff38b777f14df1f41d96dbdacddeb09]]]
Former-commit-id: 7c8f48fcb5
Former-commit-id: 1ee29d2b03a202022a4910c759dc7ece8ed4d865 [formerly c0b480bc7f]
Former-commit-id: bc7e45e5e3
2012-10-30 15:19:08 -05:00
Roger Ferrel
e7c15d0f67 Issue #1298 Changes for non-blocking BrightnessDialog.
Change-Id: I84e0778c62c7cdffe33d89c5b2a3a4f205572483

Former-commit-id: 0c3a8eb482 [formerly 9dcaf583f6] [formerly bc1e462d07] [formerly 2fb06a145f [formerly bc1e462d07 [formerly 535d952595adfcd749ee132e45736120aa25cd3d]]]
Former-commit-id: 2fb06a145f
Former-commit-id: 2405427f07db54a3ba0ff37404fe9d0ca77210a9 [formerly 191e4e83db]
Former-commit-id: 769a831689
2012-10-30 14:00:20 -05:00
Roger Ferrel
f141ad90bb Issue #1298 Comments on GridMangerView on why SaveParameterDialog and KillJobsOnExit must stay blocking.
Change-Id: I034b1f02eb3b1ac623c8d2d4b9a953e53534dba0

Former-commit-id: a155a8522e [formerly 3b96d312cd] [formerly 8952e1cef8] [formerly e37a097596 [formerly 8952e1cef8 [formerly 6dc43f8d58b82a4b59a3945cc41ad8dcdda47a11]]]
Former-commit-id: e37a097596
Former-commit-id: 42e63af20cadfda9fc5ab4e408df2ddcc69ae6d4 [formerly b93dcebdc0]
Former-commit-id: 2cbd0000ad
2012-10-30 12:35:48 -05:00
Ben Steffensmeier
0ee5726a56 merge branch Unifeid_Grid into developement
Former-commit-id: c789e1fd94 [formerly 272e057bf1] [formerly d0a2ed32b5] [formerly b6a1563bb2 [formerly d0a2ed32b5 [formerly 85a18d2cfdd70a24356f6e5ae490ec0c3fdb73e7]]]
Former-commit-id: b6a1563bb2
Former-commit-id: e5e3edb870cf3d09a1893575414b5bd00a8d3081 [formerly 92fd247ccc]
Former-commit-id: 1d94435220
2012-10-30 12:24:54 -05:00
Ben Steffensmeier
9a612a2bbc Issue #189 add a Readme to the upgrade scripts.
Former-commit-id: 5151cdf04c [formerly 6d6be13d19] [formerly e435502c5f] [formerly d61ba36e25 [formerly e435502c5f [formerly 29b9bc18abe3754efe2c9011b381d8924ebb3638]]]
Former-commit-id: d61ba36e25
Former-commit-id: af06929ab53dab342ff208c60babf043d1095d23 [formerly 6d1dfbc19a]
Former-commit-id: f86cfa87d5
2012-10-30 12:08:14 -05:00
Roger Ferrel
421336603b Issue #1298 Changes for GFEConfigDialog. Must be used as a blocking dialog.
Change-Id: I5a4ad66d3aff1ab4b77b78ec8db233875aa61620

Former-commit-id: ade948f7c9 [formerly 6291083e5b] [formerly 87d3ff985e] [formerly 5355b7f620 [formerly 87d3ff985e [formerly 13f856685e36155909e7c4f4f9ac36d3a5633e4a]]]
Former-commit-id: 5355b7f620
Former-commit-id: 332c65e134cf000bb6c1c0aa0786b0b5cf049c36 [formerly 089e8af498]
Former-commit-id: baef52459d
2012-10-30 10:34:40 -05:00
Lee Venable
429f3732f6 Merge "Issue #1298 Changes for non-blocking WeatherElementBrowserDialog." into development
Former-commit-id: 4bb79b9b66 [formerly 3c6facf14b] [formerly a7eb12fd9e] [formerly 676856f62f [formerly a7eb12fd9e [formerly d6040334d8c3ea717966b54dc6bcc333d67d5b1b]]]
Former-commit-id: 676856f62f
Former-commit-id: 5ef83c8401a814312c342b360ca5b70b8ab757a3 [formerly b491922ddc]
Former-commit-id: 1a475c55de
2012-10-30 10:26:53 -05:00
Roger Ferrel
87730d6f1b Issue #1298 Changes for non-blocking WeatherElementBrowserDialog.
Change-Id: I3359b2b9f9bbf1e58735891163fa8fd798e4ac1e

Former-commit-id: bec091ddc3 [formerly 2f4ead5037] [formerly f65213c542] [formerly 4a13cfb8a6 [formerly f65213c542 [formerly f37d9edd9803c6a2bbf039662b3f2750b1cec8db]]]
Former-commit-id: 4a13cfb8a6
Former-commit-id: 64f82e5c158fa1063d2ff32f378cea60dc6134cd [formerly 551cffe315]
Former-commit-id: 61349397e4
2012-10-30 09:00:10 -05:00
Roger Ferrel
3bf6437369 Issue #1298 Changes for non-blocking TimeShiftDialog.
Change-Id: I60f60daee3b25fec2dabd09dd44c85bd3e57160c

Former-commit-id: a49904ad7b [formerly a6f06c265b] [formerly 1d67e245aa] [formerly 7af20b6130 [formerly 1d67e245aa [formerly 1deeb17d498a883af24fe983b7967918b3c3deb9]]]
Former-commit-id: 7af20b6130
Former-commit-id: fe3124eca9fc7e28227b013f664835fa5eaa47cd [formerly 406de0548d]
Former-commit-id: 8fba446977
2012-10-30 08:27:25 -05:00
Bryan Kowal
5c56416572 Relocating projects due to the dependencies of com.raytheon.uf.edex.esb.camel
Former-commit-id: b9b0c9839c [formerly 943b2b0606] [formerly 61c6acdc540935c05791bdba4bf1a77dd8873873 [formerly 37777f32ea]] [formerly 10c8013cc3 [formerly 37777f32ea [formerly e451f4b49d393b595ec0314970ffae8834a67425]]]
Former-commit-id: 10c8013cc3
Former-commit-id: 113d34290bab02c87b5eba91fe6a4b940a4d16eb [formerly eed6cb8dad]
Former-commit-id: 6dae6015f9
2012-10-29 17:26:56 -05:00
Roger Ferrel
96db12bb33 Issue #1287 Changes for blocking ServiceBackupDlg in stand alone mode and removal no longer uses class.
Change-Id: Ice2b62bd22044f77536e00650962bfb9ea7d4082

Former-commit-id: 78dfc213c2 [formerly af547b7c6f] [formerly 55461bc61d] [formerly 4a2ae2f6db [formerly 55461bc61d [formerly ac8b26304f847a41c7b9befcc0d16b76e9a8e16d]]]
Former-commit-id: 4a2ae2f6db
Former-commit-id: b1818a5a26b7ec3383e45871521da5120f70abd9 [formerly 67d404ad87]
Former-commit-id: 534b308771
2012-10-29 13:31:43 -05:00
Steve Harris
0084fee62b Merge branch 'ss_builds' into development
Former-commit-id: eb8a05a414 [formerly 340ce53e22] [formerly fb46bb053d] [formerly afb534db67 [formerly fb46bb053d [formerly 791639aecd4c192b4bb8d8bb692f2c696cde1daa]]]
Former-commit-id: afb534db67
Former-commit-id: cd588b3fe1018ebb8f94ece1f068009b87ded0d7 [formerly 048c0c88cd]
Former-commit-id: e211bfc043
2012-10-29 12:17:12 -05:00
Steve Harris
89940e8fed 12.11.1-12 baseline
Former-commit-id: 7f6baf2e24 [formerly 565756567f] [formerly 8682e4f6ca] [formerly 9ff9cb8aa3 [formerly 8682e4f6ca [formerly 14a4f6c31948361ff83aa64d6eaca3d958fd1d8f]]]
Former-commit-id: 9ff9cb8aa3
Former-commit-id: 1acfe145013f9afdd8c598af509871593462a766 [formerly 314c03e7b6]
Former-commit-id: d8b6157aab
2012-10-29 12:15:56 -05:00
Lee Venable
f111a337c7 Merge "Issue #1287 Changes for non-blocking TimeScalePeriodsDialog." into development
Former-commit-id: 2cf0d131a3 [formerly 01bd16bbd7] [formerly eb660ac54d] [formerly 4bc57aec7e [formerly eb660ac54d [formerly edfda206905211559bfd5b384ccae129d11bb5cb]]]
Former-commit-id: 4bc57aec7e
Former-commit-id: 048afb4ea87af480a3169c6b815de7e73cf86e14 [formerly 79a5d07605]
Former-commit-id: 55186d5a74
2012-10-29 08:40:34 -05:00
Roger Ferrel
f3c5ad4ba6 Issue #1287 Changes for non-blocking TimeScalePeriodsDialog.
Change-Id: I5bed1a9f3ee792099749b26071ed2816c84f6049

Former-commit-id: b2324bd5c0 [formerly 74c8f86b27] [formerly ea2fdbc1b8] [formerly 99179463f5 [formerly ea2fdbc1b8 [formerly aa32e71beadc5b9302abddedeb53003a66a57261]]]
Former-commit-id: 99179463f5
Former-commit-id: cf1d740cfad84ce558b37e765862679f4fdf7510 [formerly 22ebd6b55a]
Former-commit-id: d414206760
2012-10-29 08:09:57 -05:00
Roger Ferrel
93560866c7 Issue #1287 Changes for non-blocking SiteActivationDlg.
Change-Id: Id059058fda486b57df5d461f3c9eb13981f7f744

Former-commit-id: 992a338818 [formerly b345d95b4d] [formerly 8c5b00fa42] [formerly 2ab4a8508a [formerly 8c5b00fa42 [formerly ae1185cb5825915820314fdc48c897676ead8538]]]
Former-commit-id: 2ab4a8508a
Former-commit-id: c4d0c2b72c4d31247cc0e9fff839a4196b04fc12 [formerly 8fca4cf256]
Former-commit-id: 8adebd22d3
2012-10-29 07:21:00 -05:00
Lee Venable
ba8ac3a79c Merge "Issue #1287 Chagnes for non-blocking TemporalEditorRangeStatisticsDialog." into development
Former-commit-id: 8ee0890c61 [formerly d7c043dffa] [formerly 6c3b12a9d3] [formerly ddbed06f64 [formerly 6c3b12a9d3 [formerly e16cb0c6c05d7e2fc4ab6eac04217f60df5bcc4b]]]
Former-commit-id: ddbed06f64
Former-commit-id: 8a11f6fd16c2ec25228ea5c71f8eae3a83a0f1d7 [formerly 7621f14d95]
Former-commit-id: c79354b0a6
2012-10-26 15:28:37 -05:00
Lee Venable
3c3a8151ca Merge "Issue #1287 Changes for non-blocking SetInterpolationAlgorithmDialog." into development
Former-commit-id: ff00f98411 [formerly 656b6bf04e] [formerly 84e66d2fab] [formerly 0967a6348b [formerly 84e66d2fab [formerly 53a9d4129eadd0156855a5c9248ce2848cb08d95]]]
Former-commit-id: 0967a6348b
Former-commit-id: 480f45e724025506f0544c072eea285b08ef423b [formerly 1407f47d1c]
Former-commit-id: 2280eef896
2012-10-26 15:28:07 -05:00
Lee Venable
811daf9e31 Merge "Issue # 1292 Migrate the common and edex projects required for stats from the 5-Data_Delivery branch to the development branch in the AWIPS2_baseline repository: edexOsgi/com.raytheon.uf.common.event edexOsgi/com.raytheon.uf.common.stats edexOsgi/com.raytheon.uf.edex.event.feature edexOsgi/com.raytheon.uf.edex.event edexOsgi/com.raytheon.uf.edex.stats" into development
Former-commit-id: e0a7c31e6d [formerly 41472f07d2] [formerly 173813c954] [formerly 41c8c88a03 [formerly 173813c954 [formerly f67e7970061c9bc4dde3b4175dcb9b45d204ff34]]]
Former-commit-id: 41c8c88a03
Former-commit-id: af27f802d5e01b5fe7c2aeaea5478d08d00876aa [formerly bd49530415]
Former-commit-id: 15ae8a5add
2012-10-26 15:25:52 -05:00
Roger Ferrel
c462861b2b Issue #1287 Chagnes for non-blocking TemporalEditorRangeStatisticsDialog.
Change-Id: I7726f8934351cea98edbf7751f23f42248e5b17c

Former-commit-id: c76fd6ee2c [formerly 9647a110c6] [formerly af887de89c] [formerly 37c7d61195 [formerly af887de89c [formerly a8e412f5d0cd625b6c421b0609bc7149d7386f1a]]]
Former-commit-id: 37c7d61195
Former-commit-id: 1c1675bdc83c4a4d2b5c17517c60e40f7a8a43a9 [formerly f4b0b6cd56]
Former-commit-id: fe48147739
2012-10-26 15:03:26 -05:00
Roger Ferrel
21b4d2c8d4 Issue #1287 Changes for non-blocking SetInterpolationAlgorithmDialog.
Change-Id: Ia01b3de6959392afacfc47ac42e794e0b8e357f2

Former-commit-id: 9cd6d6476d [formerly f304b930cd] [formerly c3d2ac5976] [formerly e2b35d015f [formerly c3d2ac5976 [formerly 15e80fd970393b74f6a320a794004f89bf3619a5]]]
Former-commit-id: e2b35d015f
Former-commit-id: 64440e540eee9c7bdb16d9aad723105448665ae1 [formerly 7ce8344826]
Former-commit-id: 1b7481abc3
2012-10-26 14:44:29 -05:00
Roger Ferrel
1bf952eacc Issue #1287 changes for non-blocking ISCRequestReplyDlg and SendISCDialog; removal of no longer used classes.
Change-Id: I25b8caa1a1316a63d051fa29d913330355afcc75

Former-commit-id: fc3ee6eae1 [formerly 2711bab50a] [formerly 006f24d75c7290451ce5b33f4cc18f55ae208157 [formerly 57a547fc66]] [formerly 7a3149dbb3 [formerly 57a547fc66 [formerly 7d57a8ae96ff778892438fb41cd84ce1bb1a8dc7]]]
Former-commit-id: 7a3149dbb3
Former-commit-id: eb6028931d8948c551a8b5861dea4c450f7f2a79 [formerly cd7c3ec006]
Former-commit-id: ca97133b23
2012-10-26 14:27:00 -05:00
Brad Gonzales
ff6f910a9d Issue # 1292 Migrate the common and edex projects required for stats from the 5-Data_Delivery branch to the development branch in the AWIPS2_baseline repository:
edexOsgi/com.raytheon.uf.common.event
edexOsgi/com.raytheon.uf.common.stats
edexOsgi/com.raytheon.uf.edex.event.feature
edexOsgi/com.raytheon.uf.edex.event
edexOsgi/com.raytheon.uf.edex.stats

update the edex feature and edex build.xml to include the edex stat projects.

Change-Id: I8d3232a765124eefa5d6f8387d6ca386163382c4

Former-commit-id: 1ba2a25bce [formerly d26119c383] [formerly b2656df2f8] [formerly 24fc32ee14 [formerly b2656df2f8 [formerly 6db4ef518672ee4fdfde9109ea4b606ccf6c5e55]]]
Former-commit-id: 24fc32ee14
Former-commit-id: ddba220564f0c36e18583d0653bc164afe5c183b [formerly 5949c8b09c]
Former-commit-id: 781265a6a8
2012-10-26 14:00:55 -05:00
Roger Ferrel
3f243d58e3 Issue #1287 Changes for non-blocking WESaveDialog.
Change-Id: Ic2dbc76126b3b38c27cdd3fc07ca1317725d12fd

Former-commit-id: 10afbd06f6 [formerly 6806384d21] [formerly 32154a3789] [formerly 51369fbd50 [formerly 32154a3789 [formerly e02ff1c81c669ae0bcf5c068487a9c35bc542ff2]]]
Former-commit-id: 51369fbd50
Former-commit-id: 37e52a4d636d59f7d5ee10fff82739d69399d1eb [formerly f4bd80afef]
Former-commit-id: eace9f331e
2012-10-26 09:01:46 -05:00
Roger Ferrel
1d3749faee Issue #1287 Changes for non-blocking WERevertDialog.
Change-Id: I7112fadab6eaaac1c7145fd998e8dfca3f975f3b

Former-commit-id: c86686515d [formerly a87a84fdbb] [formerly 117bcc648e] [formerly 4d2c234072 [formerly 117bcc648e [formerly 50b20b90ad974962334fb7dbf9c8fa3c369b01a1]]]
Former-commit-id: 4d2c234072
Former-commit-id: a906c809de71e2844fb78575613da89b87eb8122 [formerly 3a397258ff]
Former-commit-id: ce461c532b
2012-10-26 08:23:04 -05:00
Roger Ferrel
1dcab39afd Issue #1287 Changes for non-blocking PublishDialog.
Change-Id: I551850f82ad40bfa9c49d10c6b8193ec365ccea2

Former-commit-id: e312a9313c [formerly 4c40059a5a] [formerly 833b7bb850] [formerly 93472a82e5 [formerly 833b7bb850 [formerly a0b4c4eb635ce39cf1a25c78620d317e59d33061]]]
Former-commit-id: 93472a82e5
Former-commit-id: 654a838d002fad012813ff04c785678e12c6151b [formerly c0497226a6]
Former-commit-id: 47f832734a
2012-10-26 07:07:18 -05:00
Ben Steffensmeier
6eed39bdd8 Issue #189 update grid paths to resemble new grib paths
Former-commit-id: a3319bd2a0 [formerly a08b468d48] [formerly 13cfc7c341] [formerly 7b03228e5c [formerly 13cfc7c341 [formerly 7347ff2138ecbb3ac28a4f09a3e3a42d86f961d7]]]
Former-commit-id: 7b03228e5c
Former-commit-id: d2301eb348535666ec69d5c3e11effe83e1fea8c [formerly 6586ebe4b7]
Former-commit-id: b6482dd206
2012-10-25 18:03:48 -05:00
Ron Anderson
238a1aa07e Issue #1260 Fix data loading from NetCDF databases.
Change-Id: I2b4f0e8d99fa6021d187b756fc1c7abb792c7920

Former-commit-id: a982185c63 [formerly 1767d945fc] [formerly 3874ac688b] [formerly ffc8f1567d [formerly 3874ac688b [formerly 8c7eda363e3ad13853bed43d6f2d1eb5f61fab94]]]
Former-commit-id: ffc8f1567d
Former-commit-id: 0c12e001b4c984752c15275ec5ae8741dd1287c7 [formerly 141c47d4e0]
Former-commit-id: 6c4264972f
2012-10-25 16:59:25 -05:00
Ben Steffensmeier
d3fe2e8c91 Issue #189 changes from code review
Former-commit-id: 25731091d2 [formerly 3c222ab437] [formerly 984d128d33] [formerly 7139c80557 [formerly 984d128d33 [formerly 449762acbbe74173121e19f5c325104221c083a2]]]
Former-commit-id: 7139c80557
Former-commit-id: ed268afbee011a325fcb6afd97574d59f6b6cb4c [formerly b0bf62ce6f]
Former-commit-id: fcc23a917e
2012-10-25 16:33:59 -05:00
Ben Steffensmeier
a02048de74 Merge branch 'ss_builds' (12.11.1-10) into Unified_Grid
Former-commit-id: 12eb4c8246 [formerly 7734a983f5] [formerly b7d61e7543] [formerly 6f2c1ede9e [formerly b7d61e7543 [formerly 8bcb077174ef7bcb923dd974e53e82f12936b580]]]
Former-commit-id: 6f2c1ede9e
Former-commit-id: e669b6159338d2ec7600fa9890fb7e959ebc9cec [formerly 54f414a7e0]
Former-commit-id: 45cc834fc3
2012-10-25 16:17:54 -05:00
Lee Venable
5b3efb85e7 Merge "Issue #1287 Changes for non-blocking RefSetAppearanceDialog." into development
Former-commit-id: f13b5c548d [formerly 4caccdd1a5] [formerly de997956f3] [formerly 02ad711e0c [formerly de997956f3 [formerly 9f7230c0e0aafc6d7bd1f3608f020ed33a9f4a4d]]]
Former-commit-id: 02ad711e0c
Former-commit-id: 90a879864490a20ea4f895d7cdb944056a30d39f [formerly 877692bf63]
Former-commit-id: 4ab0bd782b
2012-10-25 16:06:53 -05:00
Roger Ferrel
9bfaf31fd1 Issue #1287 Changes for non-blocking RefSetAppearanceDialog.
Change-Id: I0b3f5e8c57600f3d20a7662404b014adc874e6fc

Former-commit-id: 65d4525212 [formerly 4d60aac952] [formerly 06b3d2f921] [formerly 2b08397e4b [formerly 06b3d2f921 [formerly 7e64b7aa2a236d07c04b72e1eac2c660e0c87642]]]
Former-commit-id: 2b08397e4b
Former-commit-id: 10e2727afd0d804ee3148ff95c5da173e9ac095c [formerly d119a1c518]
Former-commit-id: 16d822f738
2012-10-25 15:23:45 -05:00
Roger Ferrel
d6da07a8f9 Issue #1287 Changes for non-blocking ProductScriptsDialog.
Change-Id: Ia68cd67bf7dd10eac5e0aacc9dcf68ca96f8b2f8

Former-commit-id: cd0b7e55f0 [formerly 5a4c795bbc] [formerly 17de26adfb] [formerly 73b4ca43c8 [formerly 17de26adfb [formerly df3546eba27a1cbca6204351a7961e1aabc9c787]]]
Former-commit-id: 73b4ca43c8
Former-commit-id: 247a779c0539c91ea705dd5b63cdf044713fdcad [formerly af40c442db]
Former-commit-id: fefd403fd1
2012-10-25 14:13:41 -05:00
Lee Venable
751784bbef Merge "Issue #1287 Changes for non-blocking ProcessMonitorDialog." into development
Former-commit-id: 4d2502b8ae [formerly 4c932a5ad8] [formerly c2e1e42e26] [formerly d7ae341df2 [formerly c2e1e42e26 [formerly 711419494f6ec18c3398bdded18b71d0ac4d37ae]]]
Former-commit-id: d7ae341df2
Former-commit-id: 53577ef213cf993ff2b2a4daf8afa410742060eb [formerly b5eceeda7f]
Former-commit-id: 56ed16dc7f
2012-10-25 14:03:42 -05:00
Nate Jensen
cb57054d1c Merge "Issue #1194 change TimeMatcher so it only uses dtd in cases where dt and dtf are very different." into development
Former-commit-id: 2fe2f38ec2 [formerly 72a4b36e91] [formerly c6ca41e7c3] [formerly 10cdbdbd61 [formerly c6ca41e7c3 [formerly 4187d6fd94a38291047860cc780fb1aa9f59d825]]]
Former-commit-id: 10cdbdbd61
Former-commit-id: e80cdf2ac0a30832830d90f11fc9d3cf407a1a57 [formerly 3c1463c4d9]
Former-commit-id: bab292b06a
2012-10-25 13:39:11 -05:00
Lee Venable
60267437c6 Merge "Issue #1287 Changes SampleSetDialog from review." into development
Former-commit-id: daebdbeb40 [formerly b02ae8d48c] [formerly 66dd846674] [formerly 4aef416119 [formerly 66dd846674 [formerly 7e72d19330025ef611f509c9140103c28cd89b5d]]]
Former-commit-id: 4aef416119
Former-commit-id: 2a792c8715da74ee026a70a183ff235614a97633 [formerly d6c9359dc9]
Former-commit-id: 3b039b4fe7
2012-10-25 13:31:50 -05:00
Lee Venable
dd27aaa11d Merge "Issue #1287 Changes for non-blocking HiddenWeatherElementDialog." into development
Former-commit-id: d77c142b9a [formerly 5ab897b8f0] [formerly e32da5af26] [formerly 90e135a991 [formerly e32da5af26 [formerly 835cb07b70c7120003a8b45a5b628671e4cff956]]]
Former-commit-id: 90e135a991
Former-commit-id: 3ca6516e2a157b359c2aff20b71b632868cd5034 [formerly f9e4fba04d]
Former-commit-id: aa7ef2a8b2
2012-10-25 13:20:44 -05:00
Roger Ferrel
a3c4791bf1 Issue #1287 Changes for non-blocking ProcessMonitorDialog.
Change-Id: Icba40d0766d796da155766005da1f3842920f286

Former-commit-id: 1dd6c389c2 [formerly a6a6bbb22d] [formerly bf86d2c98b] [formerly ff72fd0fbd [formerly bf86d2c98b [formerly 1dea100231893ca5a954c13e2f9e9770fec0f028]]]
Former-commit-id: ff72fd0fbd
Former-commit-id: cde3fdd85f848d282bc0d1c265424c57761dec53 [formerly dd47425456]
Former-commit-id: cb9cc69b18
2012-10-25 13:10:21 -05:00
Lee Venable
4738f32aed Merge "Issue #1287 Chamges for non-blocking GridsInterpolateDialog." into development
Former-commit-id: 386f62b68c [formerly 3f5bf75b08] [formerly 14294c1984] [formerly 38ceefb7ef [formerly 14294c1984 [formerly b9746712b90aa685c91b4f484e5eed9bfc920a8b]]]
Former-commit-id: 38ceefb7ef
Former-commit-id: b9b3c05d0c0719eb12a247c80d2fc261f288b999 [formerly c165d9dec9]
Former-commit-id: 4d0df94c06
2012-10-25 13:08:33 -05:00
Lee Venable
0fbce1b057 Merge "Issue #1287 Changes for non-blocking EditActionsDialog." into development
Former-commit-id: 52f6fb6b88 [formerly 64b36cd0ed] [formerly b6f0ba0094] [formerly ce1b1f3c54 [formerly b6f0ba0094 [formerly 6e973b521040a8bac62c8c78cca7bbc1f91f9229]]]
Former-commit-id: ce1b1f3c54
Former-commit-id: 622f7a42f4c9c87c9765678b79209d58f1fadb9b [formerly 6624a5bcf5]
Former-commit-id: 172ad7e141
2012-10-25 13:04:30 -05:00
Ben Steffensmeier
69bd6e2ed2 Issue #1194 change TimeMatcher so it only uses dtd in cases where dt and dtf are very different.
Former-commit-id: c17578805a [formerly b01de6a051] [formerly 9bbee1eeacd2e9f336cd51720eef76e5c959ee07 [formerly 8400bc010b]] [formerly 9b19ec5b29 [formerly 8400bc010b [formerly 1aa108da3e26e698af4ea0206ca1e7fb1ffcc588]]]
Former-commit-id: 9b19ec5b29
Former-commit-id: 6d559b2d96230015c6f68945edc7880764314c16 [formerly f65f294d2a]
Former-commit-id: 884fa10618
2012-10-25 13:03:41 -05:00
Richard Peter
7179e2fc3e Merge "Issue #1279 add some comments to the grid wrap chaecking code." into development
Former-commit-id: d232355852 [formerly 936aaae5a4] [formerly 0152b058e5] [formerly 6f441fc85e [formerly 0152b058e5 [formerly faf4edee48f169841eb5c1ab3b4ad4dc28f1f338]]]
Former-commit-id: 6f441fc85e
Former-commit-id: 40616ad4b8ef2ffe36fcb4caa18d67dc7b739576 [formerly 12f20ca32e]
Former-commit-id: cbb6deec7a
2012-10-25 12:44:10 -05:00
Roger Ferrel
4b86908205 Issue #1287 Changes for non-blocking HiddenWeatherElementDialog.
Change-Id: Iccc5f755f0eab9ee952b1f6c8d33e1842bcddddf

Former-commit-id: b1e4172918 [formerly 86236eacbf] [formerly ef8f1e5fdd] [formerly 5823279aa8 [formerly ef8f1e5fdd [formerly c9b9cd92c8663d0ee896fbf98434eb1a63df2015]]]
Former-commit-id: 5823279aa8
Former-commit-id: 0d38736194473060d4b9f542e6185d46eb35339b [formerly 66996e056f]
Former-commit-id: 2adcf71c69
2012-10-25 12:29:39 -05:00
Ben Steffensmeier
24de750932 merge Unified_Grid with ss_builds to 12.11.1-7
Former-commit-id: 1a215cb42a [formerly 4f503d3a1e] [formerly 6a9ff88b33] [formerly c2934ae7a5 [formerly 6a9ff88b33 [formerly ab80625b5c573d8ab1350b4c251414ea036ef016]]]
Former-commit-id: c2934ae7a5
Former-commit-id: de67db55a641384b09da8b5dffaf5f786198848b [formerly a77d2097f8]
Former-commit-id: 9b8f2bcdbd
2012-10-25 12:22:11 -05:00
Roger Ferrel
b9ed20feab Issue #1287 Changes SampleSetDialog from review.
Change-Id: Ifcca23bdacabf7495cdc08763b6ebad0b6961f09

Former-commit-id: 63c1494ee8 [formerly 61d530b0e6] [formerly 615b9b8fbb] [formerly 5e4c7c0d53 [formerly 615b9b8fbb [formerly 0eb964cc6bb9e2961b30f39e52a0b178f09d96ca]]]
Former-commit-id: 5e4c7c0d53
Former-commit-id: 364e5ff4235629a7a01d6e796f2921af299ef19b [formerly c302c27ba7]
Former-commit-id: a9f16da620
2012-10-25 11:09:55 -05:00