Commit graph

1585 commits

Author SHA1 Message Date
Lee Venable
9bef16f8ab Merge "Issue #1298 Changes for non-blocking GhgAlertDlg." into development
Former-commit-id: 0540d84e4e [formerly 0540d84e4e [formerly e96cd422716fc6da7c0007b58fa75659c7600ad7]]
Former-commit-id: 40f11cfba5
Former-commit-id: aa4b1f4970
2012-11-15 17:43:31 -06:00
Max Schenkelberg
7ffce5cd45 Issue #1243 moved locking for getFile into adapter code for cave since that is the only time a file is actually downloaded and requires locking
Change-Id: I39920677769e1a885ac7b3f1003dd52ae1dc2737

Former-commit-id: 655f54b098 [formerly 655f54b098 [formerly 4648ab539b37a0608ab7ebab5080317bbf618504]]
Former-commit-id: f540f65fd7
Former-commit-id: f1866b2e49
2012-11-15 16:21:42 -06:00
Roger Ferrel
342a35599b Issue #1298 Changes for non-blocking GhgAlertDlg.
Change-Id: I1da7317ad69203a4160c806458fdbf99a7d9108d

Former-commit-id: 800c1a6908 [formerly 800c1a6908 [formerly b3c640da3fad8d1ce07e348b075b9b1a0468da37]]
Former-commit-id: c0554d9686
Former-commit-id: 05f32527bd
2012-11-15 15:51:46 -06:00
Roger Ferrel
418dd35a9d Issue #1298 Changes for non-blocking GhgMonitorDlg.
Change-Id: I69a05b6d62e8d75c998b6cb9059c9f45e6cf39d3

Former-commit-id: dc82ad820b [formerly dc82ad820b [formerly 782113272c208a32e6165c02404138fcaa79d523]]
Former-commit-id: 109dea21e1
Former-commit-id: 2206167b00
2012-11-15 14:37:29 -06:00
Lee Venable
a883fd2e08 Merge "Issue #1298 Changes for non-blocking SelectionDlg." into development
Former-commit-id: ba95731387 [formerly ba95731387 [formerly a1d258382de88af5c139e22d2efb6183261d1e3b]]
Former-commit-id: 2dee27fbf3
Former-commit-id: ed64d2f97a
2012-11-15 13:47:46 -06:00
Benjamin Phillippe
688e19acc1 Issue #1335 Fixed EHCache warnings. Changes to necessary config files
Change-Id: Ib6ad30965f32a046a1414bdfb534ec44ed875ce8

Former-commit-id: 5bf46d468d [formerly 5bf46d468d [formerly 6bb4fb29b5dd8e30a19ec63412fbd05348bd87a0]]
Former-commit-id: 5c31b34e12
Former-commit-id: 6b1b73429b
2012-11-15 13:35:25 -06:00
Roger Ferrel
e424cb4bf2 Issue #1298 Changes for non-blocking SelectionDlg.
Change-Id: I9829945037f8f5ce268eb3731302ae77e83d837b

Former-commit-id: 00693d83bb [formerly 00693d83bb [formerly cd85c4e60fd3863c39a7c61ad73848207e196a05]]
Former-commit-id: 59181213a0
Former-commit-id: fdfcb2ebea
2012-11-15 12:55:49 -06:00
Nate Jensen
e76a412fb4 Merge "Issue #1325 add missing sourcepath for jts" into development
Former-commit-id: 19d74235d9 [formerly 19d74235d9 [formerly ecff6dc0484b6dc65e2c043be4a2b6a7fbb3a503]]
Former-commit-id: c4e1d26056
Former-commit-id: 84e98e2364
2012-11-15 11:02:35 -06:00
Ron Anderson
c55588f57c Issue #1325 add missing sourcepath for jts
Change-Id: I776bcb3cbb2accd0cf6c41b2a91c12102b9a9653

Former-commit-id: 94ec6eaeaf [formerly 94ec6eaeaf [formerly bf8dd91d2e2cb79548cc852c82446cb914e63991]]
Former-commit-id: 457d55ecdf
Former-commit-id: 1157e5a55e
2012-11-15 11:00:02 -06:00
Bryan Kowal
dbe78374bc Issue #1318 - updated ncep database rpm specification file
Change-Id: Ie4b5ef9b76ce96e21e68f40ffc194cb584a1e832

Former-commit-id: b60dda550c [formerly b60dda550c [formerly b3f1b857e5a8efcfea0f5b8985eddd5992724d89]]
Former-commit-id: fe9dcaa216
Former-commit-id: 67c3c140e3
2012-11-15 10:24:38 -06:00
Lee Venable
7278399bd4 Merge "Issue #1298 Changes for non-blocking MoveWeatherElementDialog." into development
Former-commit-id: 2ff812677f [formerly 2ff812677f [formerly 722a841e5ea9a947bb3d46f5f1e231c67ec1f919]]
Former-commit-id: a5a0ef2297
Former-commit-id: 491161b0d0
2012-11-15 09:28:33 -06:00
Bryan Kowal
954534e3d0 Issue #1318 - updated ncep database rpm specification file
Change-Id: Iac80537a3fcc7998f93d5a3db9e842d7eea141d9

Former-commit-id: 99399e880e [formerly 99399e880e [formerly f433daa8ffe59da91acba71ac5893d77ad810404]]
Former-commit-id: 24074da383
Former-commit-id: 3d123e08a7
2012-11-15 09:26:46 -06:00
Roger Ferrel
265adb9b1c Issue #1298 Changes for non-blocking MoveWeatherElementDialog.
Change-Id: I5f41c52d45146a0e9cdfbf613ec3918382f6a455

Former-commit-id: a6fdc7b580 [formerly a6fdc7b580 [formerly dd80807a0469e7c677f8e0d214fcdec715c67518]]
Former-commit-id: acf1881cb7
Former-commit-id: d6c5839e0e
2012-11-14 16:33:27 -06:00
Max Schenkelberg
429ddc7312 Issue #1243 Made localization lock more intelligently to avoid files getting out of sync and causing errors.
Amend: Fixed LocalizationFileOutputStream so it has option to close and save file and made LocalizationFile.write so it is more clear as to
what it is doing. Made CloudHeightData and AdaptivePlotResourceData not create FileUpdateMessages.

Amend: Rebased

Change-Id: I5aff6402004f4b4d3040c8c71f5ee16dfeb33567

Former-commit-id: dcde9e8951 [formerly dcde9e8951 [formerly 85a0b9bb03887b9ef50e67a1ae3a36afd24b3a58]]
Former-commit-id: 28e61c8285
Former-commit-id: 2e20c3e799
2012-11-14 16:19:37 -06:00
Nate Jensen
5751eb424a Merge "Issue #1332: Update pypies createStorageRecord to not pull in parent group node" into development
Former-commit-id: 72a54e9e29 [formerly 72a54e9e29 [formerly 31989b21e8199a739d2764d226b02de056d3f8a3]]
Former-commit-id: ffce7efeb2
Former-commit-id: bfd1f088b0
2012-11-14 16:10:49 -06:00
Nate Jensen
85fdcaf854 Merge "Issue #189 fix contour subgridding for worldwide grids" into development
Former-commit-id: 5055164f55 [formerly 5055164f55 [formerly 553b56aa362b452110a7f5a4f76aec9640d13599]]
Former-commit-id: 340f8e1fa8
Former-commit-id: 6210f94be1
2012-11-14 16:09:51 -06:00
Nate Jensen
25602f0183 Merge "Issue #189 changes to mappings and ncep merge from code review Change-Id: Ia44b66535dbbf36a6e0b99cd547f0dc161af6a47" into development
Former-commit-id: 49c2079963 [formerly 49c2079963 [formerly 219d5cd37e412c47cf12eebb6849c5c233163f16]]
Former-commit-id: 31637efbbc
Former-commit-id: 8944e220f6
2012-11-14 16:09:00 -06:00
Lee Venable
3369913a84 Merge "Issue #1298 Changes for non-blocking DisplayAttributesDialog." into development
Former-commit-id: 695cf85335 [formerly 695cf85335 [formerly 33b0aada5191fd6a757f37029862cdcadf8c0692]]
Former-commit-id: 6134e5d3f7
Former-commit-id: 7ed335793f
2012-11-14 16:06:02 -06:00
Lee Venable
9c177ca2c9 Merge "Issue #1298 Changes for non-blocking TEWxSetValueDialog." into development
Former-commit-id: 8fa3d794fd [formerly 8fa3d794fd [formerly eceb7bed3794368ebb0cd57e466e7beaee88a19d]]
Former-commit-id: edfab7e56f
Former-commit-id: bbba9b1b29
2012-11-14 16:05:20 -06:00
Roger Ferrel
9cf45444c3 Issue #1298 Changes for non-blocking DisplayAttributesDialog.
Change-Id: I2175023db40ad6b24c47ebc2cd16e12572fb1b6d

Former-commit-id: 7ca75756ae [formerly 7ca75756ae [formerly 260f5085bba45ab5b3ad10dd3945a64195eb2d7b]]
Former-commit-id: 212045c1a6
Former-commit-id: d069f186e1
2012-11-14 14:56:42 -06:00
Dustin Johnson
ff33643234 Merge branch 'ss_builds' (12.12.1-4) into development
Conflicts:
	ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/display/SymbolSetElement.java

Change-Id: I377f89aa76f5bdb6004f8c63b7d54209e1722a71

Former-commit-id: bff32bbe58 [formerly bff32bbe58 [formerly 2f676ffcab1c9efa612a52283d05e56f9c748569]]
Former-commit-id: 0d1d663f41
Former-commit-id: e25b7c312b
2012-11-14 14:41:57 -06:00
Roger Ferrel
eb20af7237 Issue #1298 Changes for non-blocking TEWxSetValueDialog.
Change-Id: I2d46c885ef0aa7aa8019665e8822d62ed221be8b

Former-commit-id: 7f22145bf2 [formerly 7f22145bf2 [formerly f489ae636459e2dfcf7092d0ede7a37e84398cb2]]
Former-commit-id: dd8f8a9fa7
Former-commit-id: 89653eb5e1
2012-11-14 14:20:40 -06:00
Steve Harris
493f335c0b 12.12.1-4 baseline
Former-commit-id: 85130eb611 [formerly 85130eb611 [formerly 4a7e3fabdef8d948216483965c1f62e5216bf362]]
Former-commit-id: 57578da521
Former-commit-id: 628ca9e5c6
2012-11-14 14:19:20 -06:00
Roger Ferrel
55b052c849 Issue #1298 Changes for non-blocking TEDiscreteSetValueDialog.
Change-Id: I4e015b94f20b5075c4dc22d2165718d02109e0a8

Former-commit-id: e267248b57 [formerly e267248b57 [formerly 5c0eef28a67b874f184fd391d9220957030e43c7]]
Former-commit-id: 2331b8e1f5
Former-commit-id: 3f0dc83f89
2012-11-14 14:02:01 -06:00
Lee Venable
9cbd7cdcbe Merge "Issue #1298 Convert UserEntryDialog to CaveSWTDialog but keep it a blocking dialog." into development
Former-commit-id: e755889643 [formerly e755889643 [formerly dbb1bc97d99827f7e97039f7a333ae0fc00353f0]]
Former-commit-id: e9ae25e781
Former-commit-id: 09591687a9
2012-11-14 13:30:42 -06:00
Lee Venable
5e37d88424 Merge "Issue #1298 Changes for non-blocking WeatherElementGroupDialog. Changes from reviewer comments." into development
Former-commit-id: 341dc89480 [formerly 341dc89480 [formerly 3106b10a003ca5985e29c69ee0f02185c88edc12]]
Former-commit-id: 7634ea221b
Former-commit-id: 389f9c6a87
2012-11-14 13:29:53 -06:00
Richard Peter
cd85a43b4a Issue #1332: Update pypies createStorageRecord to not pull in parent group node
Change-Id: Ieb4b45bce2f5c0eca41301eacbd7782b3c310edd

Former-commit-id: 73c2fa6ed3 [formerly 73c2fa6ed3 [formerly 926250abd96f2b5e30b6a863735a10203491a257]]
Former-commit-id: d2aff4118b
Former-commit-id: 859d3840bb
2012-11-14 12:51:53 -06:00
Ben Steffensmeier
84abe4fa4f Issue #189 changes to mappings and ncep merge from code review
Change-Id: Ia44b66535dbbf36a6e0b99cd547f0dc161af6a47

Former-commit-id: 2c8f3f09ac [formerly 2c8f3f09ac [formerly 9ed60c53dd17891f81e5c01c3b86933c8aff2ba4]]
Former-commit-id: 2d864c3b09
Former-commit-id: 91254adfd6
2012-11-14 12:22:53 -06:00
Dustin Johnson
3129d3bd3a Issue #1322 Common baseline changes to support BandwidthManager
Amend:
  Revert EDEXLocalizationAdapter and duplicate getPath() in test version.

Change-Id: I72205aadeba1f894ee49cb4d146519df10d941f8

Former-commit-id: 7d9e7567bd [formerly 7d9e7567bd [formerly 07aeec469a83ce07286bc27ea3e6bda41909be8d]]
Former-commit-id: 7c59f9ea41
Former-commit-id: c0c60c2488
2012-11-14 12:19:10 -06:00
Roger Ferrel
a39abc035b Issue #1298 Convert UserEntryDialog to CaveSWTDialog but keep it a blocking dialog.
Change-Id: I5c2ae63c0461d5e3e96a050c0055a625b1271072

Former-commit-id: d16a448e05 [formerly d16a448e05 [formerly eadf4e9a28df6687a8e0bee6c6cef74356cd26d7]]
Former-commit-id: 590eca2cba
Former-commit-id: 950300e16d
2012-11-14 12:04:18 -06:00
Nate Jensen
100e58f002 Merge "Issue #189 modify upgrade script to work with grid resources within bestRes." into development
Former-commit-id: 7f95e486c8 [formerly 7f95e486c8 [formerly 82d0be7824c4dd02d23e4422775d803eec4db115]]
Former-commit-id: 7663818f6c
Former-commit-id: 6aa5904dc9
2012-11-14 11:45:10 -06:00
Ben Steffensmeier
acd5002c94 Issue #189 fix contour subgridding for worldwide grids
Former-commit-id: 3ee95cff21 [formerly 3ee95cff21 [formerly e0fb632cc7e0d089436b64a3f2bc6977a0487708]]
Former-commit-id: 929a785e1b
Former-commit-id: 76996706f4
2012-11-14 11:38:25 -06:00
Roger Ferrel
bdeb05acbb Issue #1298 Changes for non-blocking WeatherElementGroupDialog.
Changes from reviewer comments.

Change-Id: Ib21a454575115f26da165704454caaa76d86b5ac

Former-commit-id: 049ecefe1d [formerly 049ecefe1d [formerly d8b828e6bc0a47caa01165cdb22e87f301534e30]]
Former-commit-id: b32480ed08
Former-commit-id: af0ad0433b
2012-11-14 11:36:52 -06:00
Ron Anderson
7a828a608c Merge "Issue #189 use maxRecords in GFEDao.getD2DDatabaseIdsFromDb" into development
Former-commit-id: 86c4a247cd [formerly 86c4a247cd [formerly 46116a80d319050628e6c8a7d01c7c2d0bb5402f]]
Former-commit-id: 0fe91e0d95
Former-commit-id: 652c27918c
2012-11-14 11:23:06 -06:00
Ben Steffensmeier
6093c7cf31 Issue #189 use maxRecords in GFEDao.getD2DDatabaseIdsFromDb
Former-commit-id: 5a1a6f2fdb [formerly 5a1a6f2fdb [formerly 26e79c68560dced9b7148e8eebf4a7394461bd7c]]
Former-commit-id: 1b4236ccc5
Former-commit-id: 159817f538
2012-11-14 11:05:42 -06:00
Steve Harris
71648c8d59 Merge "Issue #1327 Added event-ingest.xml to ingestGrib mode in modes.xml" into development
Former-commit-id: f5c87b04d6 [formerly f5c87b04d6 [formerly ce25af9ad1e713bd85fd24f10188c9f46c83da5c]]
Former-commit-id: 956e1a45da
Former-commit-id: a5ca238e96
2012-11-14 10:19:27 -06:00
Ben Steffensmeier
3736a94482 Issue #1331 fix grib-request spring
Former-commit-id: b128a3f3c5 [formerly b128a3f3c5 [formerly 3b4dda66b20f04915f406df814ca989350794ae7]]
Former-commit-id: c97223458e
Former-commit-id: 60743ec4b1
2012-11-14 10:07:44 -06:00
Brad Gonzales
dfc125236d Issue #1327 Added event-ingest.xml to ingestGrib mode in modes.xml
Change-Id: I6de95db502206b7b4dda198d61844570ed428862

Former-commit-id: 4af27e092f [formerly 4af27e092f [formerly 0f6ddf0e3084a4deb48b8e1e36d0ab4d9af78295]]
Former-commit-id: 1617341e2a
Former-commit-id: c024c94050
2012-11-14 09:39:26 -06:00
Steve Harris
59efd9a217 Merge branch 'ss_builds' (12.12.1-3) into development
Former-commit-id: 448dd1c35f [formerly 448dd1c35f [formerly 7a44f29952ec89991e578c67357e1ef3f3c51d59]]
Former-commit-id: 00f3d51546
Former-commit-id: c8cac52915
2012-11-13 17:28:50 -06:00
Steve Harris
314495dc8e 12.12.1-3 baseline
Former-commit-id: c999505fba [formerly c999505fba [formerly 8481c91f9918a61631198331c324c4c5a76aac0f]]
Former-commit-id: b3b5e6d28f
Former-commit-id: 2797cbcdd0
2012-11-13 17:27:04 -06:00
Steve Harris
96a4a4f3f5 12.12.1-2 baseline
Former-commit-id: a8560580f8 [formerly a8560580f8 [formerly 90019fdb91dad949f125e46de9300ccd44f6e315]]
Former-commit-id: 6868eb9b23
Former-commit-id: df89fe9bed
2012-11-13 17:14:24 -06:00
Lee Venable
5f79e0f562 Merge "Issue #1298 Changes for non-blocking SetValueDialog." into development
Former-commit-id: 989d5dc5e4 [formerly 989d5dc5e4 [formerly 7f22292e89e05b881466efd1d81ef851c454246a]]
Former-commit-id: dbdfda1d04
Former-commit-id: 282e8858da
2012-11-13 16:02:05 -06:00
Steve Harris
07abe90d1c Merge "Merge branch 'ss_builds'(12.12.1-1) into development" into development
Former-commit-id: 63b0f18a89 [formerly 63b0f18a89 [formerly b0c071ca9877eb73e312a530d6abb94563cbc980]]
Former-commit-id: 5c23f057b3
Former-commit-id: 1e0ad343d6
2012-11-13 16:02:03 -06:00
Ben Steffensmeier
7761060a12 Merge branch 'ss_builds'(12.12.1-1) into development
Conflicts:
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/DefineRefSetDialog.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/FormatterLauncherDialog.java
	cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/inv/GribDataCubeAlertMessageParser.java
	edexOsgi/com.raytheon.edex.plugin.grib/res/spring/grib-request.xml
	edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/dao/GribDao.java
	edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/purge/gribPurgeRules.xml
	edexOsgi/com.raytheon.uf.common.gridcoverage/src/com/raytheon/uf/common/gridcoverage/GridCoverage.java
	edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/DynamicSerializationManager.java
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/purge/PurgeRuleSet.java
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/purge/PurgeRuleTree.java
	edexOsgi/com.raytheon.uf.tools.cli/impl/src/purgeallmodeldata/purgeAllModelData.py
	pythonPackages/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/__init__.py
Change-Id: Iefdb4f7ba08dc052250d432bb0363a9f83031fcc

Former-commit-id: 69fc030bb4 [formerly 69fc030bb4 [formerly 911c845199714c07e93f9847ab00fcd6d28a4223]]
Former-commit-id: e8090e654b
Former-commit-id: 60f78c22e3
2012-11-13 16:00:19 -06:00
Roger Ferrel
0b8ecada1b Issue #1298 Changes for non-blocking SetValueDialog.
Change-Id: Ida7350ff46cadb910972043a3882ef8d0d6ba20f

Former-commit-id: 1d5bd95866 [formerly 1d5bd95866 [formerly 5c94dd5727420ff612ff1fa5bbdb06a041e89459]]
Former-commit-id: dceb2cde5d
Former-commit-id: 29eb436b19
2012-11-13 15:53:03 -06:00
Lee Venable
07c1a3b61b Merge "Issue #1298 Changes for non-blocking SetDeltaDialog and removal of unused class ShowISCInfoDlg." into development
Former-commit-id: c1e46f52ca [formerly c1e46f52ca [formerly 795564ae453a7afb423980679c3719a7c453aa74]]
Former-commit-id: 9d149bef29
Former-commit-id: 32f088d986
2012-11-13 15:35:13 -06:00
Lee Venable
92a2578ebf Merge "Issue #1298 Change CaveJFACEDialog's open method to work similar to CaveSWTDialog's open." into development
Former-commit-id: 0c936a3f8c [formerly 0c936a3f8c [formerly f037a61c9fd0c0d85a7596b95cdd35072f7bafe0]]
Former-commit-id: d935fff585
Former-commit-id: a78cdc9ee4
2012-11-13 15:34:40 -06:00
Roger Ferrel
3eb1da1b66 Issue #1298 Changes for non-blocking SetDeltaDialog and removal of unused class ShowISCInfoDlg.
Change-Id: Icc9482b5e1063d6a4dcc33c106a582e8a460a6d0

Former-commit-id: 1e8dfdc857 [formerly 1e8dfdc857 [formerly 149198a0ab46b58518edb02c1bfb19e2f432726c]]
Former-commit-id: b421a30116
Former-commit-id: d646f32d6e
2012-11-13 13:20:28 -06:00
Lee Venable
901e4fa29c Merge "Issue #1317 - Fix problem in edexProcessStats.xml" into development
Former-commit-id: 5fce4fde98 [formerly 5fce4fde98 [formerly bde192a2c922a9bb239d1558794cf03ec6944118]]
Former-commit-id: 548973dae0
Former-commit-id: 89e28445e5
2012-11-13 13:19:00 -06:00
Roger Ferrel
1b582e49a6 Issue #1298 Change CaveJFACEDialog's open method to work similar to CaveSWTDialog's open.
Change-Id: I5e4cf98b98df3571a94407f2d677766b209d4081

Former-commit-id: 22f8bc10f0 [formerly 22f8bc10f0 [formerly 4da71d30d62eeeee3546c3019850e77cab757c78]]
Former-commit-id: 4c3af2a258
Former-commit-id: 8e85e1c8df
2012-11-13 12:55:33 -06:00