Commit graph

1372 commits

Author SHA1 Message Date
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
Ron Anderson
dc6b83dccc Issue #1325 Update geotools source path entries per code review.
Change-Id: Ib9a682df979cd1b20510880b594f5c2e496094b0

Former-commit-id: 8a5a2dc532 [formerly 8a5a2dc532 [formerly fc0837f4b3219eaa7ae4a99dee6db1da9a80c3ba]]
Former-commit-id: 795dfdc9dd
Former-commit-id: bad09a9c0d
2012-11-13 12:06:54 -06:00
Mike Duff
4771bb25ac Issue #1317 - Fix problem in edexProcessStats.xml
Change-Id: I6fc99ac9447b47101ca6f8e7acec705dd7235e03

Former-commit-id: 0e32ab85db [formerly 0e32ab85db [formerly 756c1b6b22cdf91c44f4bb1ec75dca8bb8074eef]]
Former-commit-id: e14b372f42
Former-commit-id: 363aa7bec6
2012-11-13 11:44:02 -06:00
Roger Ferrel
d31e866744 Issue #1298 Changes for non-blocking ZoneColorEditorDlg.
Changes from reviewer's comments.

Change-Id: Ie818637b34649c498e289607ab72ac67f7c8cb6f

Former-commit-id: 5ce67ffd9e [formerly 5ce67ffd9e [formerly 6b6c4e0b61fbc7b51bdef738a4bdee7505fc8ea5]]
Former-commit-id: ae52206cc7
Former-commit-id: 30c70cc181
2012-11-13 09:49:16 -06:00
Nate Jensen
b4bfd19895 Merge "Issue #1324 make times display in 24 hour time" into development
Former-commit-id: 8a07ba3c11 [formerly 8a07ba3c11 [formerly 40c13a1ca4345f791c9f6f3849fe896ba27a2830]]
Former-commit-id: e7045022ad
Former-commit-id: 7baf10fc53
2012-11-13 09:28:05 -06:00
Ron Anderson
e825e032e1 Merge "Issue #1325 Update GeoTools for WA4.7" into development
Former-commit-id: 024d384292 [formerly 024d384292 [formerly c7fe4cfae35393df26461d4c4892c2bbfaad0fbe]]
Former-commit-id: 41f68a9cac
Former-commit-id: d07cb8c041
2012-11-13 09:17:32 -06:00
Nate Jensen
61beb174fe Merge "Issue #1323 initial commit of interfaces of data access framework" into development
Former-commit-id: c2631b5ba6 [formerly c2631b5ba6 [formerly 68fbcd4c991c6962c27f5aa07b749f0706bfe668]]
Former-commit-id: ff16f82b18
Former-commit-id: 14a139c813
2012-11-13 09:01:43 -06:00
Nate Jensen
d94afa6a55 Merge "Issue #1108 make ZAGL level deprecated since it is in use in derived parameters, modify derived parameters to handle deprecated master levels." into development
Former-commit-id: 8a1f3a10a4 [formerly 8a1f3a10a4 [formerly ef3483e14907e044a66cb6c5c677b6794bf9b03a]]
Former-commit-id: e51d86ce3a
Former-commit-id: cf8fd9f731
2012-11-12 17:16:07 -06:00
Lee Venable
85b200a973 Merge "Issue #1298 Changes for non-blocking WrapLengthDialog. Changes from reviewer's comments. Fix merge conflict." into development
Former-commit-id: a576274c3c [formerly a576274c3c [formerly 46fbeba87efbee0b558fdd2c8f7e8c5abf004ac5]]
Former-commit-id: d4276e6474
Former-commit-id: fb4b76b003
2012-11-12 16:58:17 -06:00
Max Schenkelberg
9a13824af2 Issue #1308 removed activemq references in spring file, made gfe common xml explicitly depend on time xml
Change-Id: I784b077d1ab2d929ddad1cb69fccc4a8c5e0729e

Former-commit-id: d1099addc6 [formerly d1099addc6 [formerly e696b81840b6c1f0a0df8a9f20b859f23bc5a3e7]]
Former-commit-id: 00822a4f39
Former-commit-id: c4e5092f94
2012-11-12 16:46:21 -06:00
Nate Jensen
5b837a1b13 Issue #1323 initial commit of interfaces of data access framework
Change-Id: I301d94a85a4e86550cd409bc17ef94ea3fdd6e02

Former-commit-id: f255f65b3c [formerly f255f65b3c [formerly d6b63788ef2af3da474a0d3affcafdddec3690a5]]
Former-commit-id: bf72e29752
Former-commit-id: 78a1185b19
2012-11-12 16:45:33 -06:00
Ben Steffensmeier
b77bc6baaa Issue #189 modify upgrade script to work with grid resources within bestRes.
Former-commit-id: 9c17cd2039 [formerly 9c17cd2039 [formerly 784af5833dd3f7514fee15451482cbe7645cef85]]
Former-commit-id: 8d2a0d4b16
Former-commit-id: ff9becd710
2012-11-12 16:37:28 -06:00
Roger Ferrel
d9c7c4ae56 Issue #1298 Changes for non-blocking WrapLengthDialog.
Changes from reviewer's comments.
Fix merge conflict.

Change-Id: If31259188ff9fc1c84a02ca11399dd328dd669d4

Former-commit-id: 66606f88de [formerly 66606f88de [formerly 50327729d4b0b135cf959a9093dc90a32cf091e6]]
Former-commit-id: e982c0f43a
Former-commit-id: de21a3f2ef
2012-11-12 16:27:08 -06:00
Roger Ferrel
3ebaaa8992 Issue #1298 Changes for non-blocking StoreTransmitDlg.
Changes from reviewer's coments.

Change-Id: I34e111ee2abc8ca154334e9017ea448bfa6fa31f

Former-commit-id: 6445081aa9 [formerly 6445081aa9 [formerly 35e8deb27aecf5c805f0c007e70c45d8cc9988cb]]
Former-commit-id: 76109f3bf7
Former-commit-id: e7cd99ff0d
2012-11-12 15:26:03 -06:00