Steve Harris
59efd9a217
Merge branch 'ss_builds' (12.12.1-3) into development
...
Former-commit-id: 448dd1c35f448dd1c35f00f3d51546c8cac52915
2012-11-13 17:28:50 -06:00
Steve Harris
314495dc8e
12.12.1-3 baseline
...
Former-commit-id: c999505fbac999505fbab3b5e6d28f2797cbcdd0
2012-11-13 17:27:04 -06:00
Steve Harris
96a4a4f3f5
12.12.1-2 baseline
...
Former-commit-id: a8560580f8a8560580f86868eb9b23df89fe9bed
2012-11-13 17:14:24 -06:00
Lee Venable
5f79e0f562
Merge "Issue #1298 Changes for non-blocking SetValueDialog." into development
...
Former-commit-id: 989d5dc5e4989d5dc5e4dbdfda1d04282e8858da
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: 63b0f18a8963b0f18a895c23f057b31e0ad343d6
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: 69fc030bb469fc030bb4e8090e654b60f78c22e3
2012-11-13 16:00:19 -06:00
Roger Ferrel
0b8ecada1b
Issue #1298 Changes for non-blocking SetValueDialog.
...
Change-Id: Ida7350ff46cadb910972043a3882ef8d0d6ba20f
Former-commit-id: 1d5bd958661d5bd95866dceb2cde5d29eb436b19
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: c1e46f52cac1e46f52ca9d149bef2932f088d986
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: 0c936a3f8c0c936a3f8cd935fff585a78cdc9ee4
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: 1e8dfdc8571e8dfdc857b421a30116d646f32d6e
2012-11-13 13:20:28 -06:00
Lee Venable
901e4fa29c
Merge "Issue #1317 - Fix problem in edexProcessStats.xml" into development
...
Former-commit-id: 5fce4fde985fce4fde98548973dae089e28445e5
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: 22f8bc10f022f8bc10f04c3af2a2588e85e1c8df
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: 8a5a2dc5328a5a2dc532795dfdc9ddbad09a9c0d
2012-11-13 12:06:54 -06:00
Mike Duff
4771bb25ac
Issue #1317 - Fix problem in edexProcessStats.xml
...
Change-Id: I6fc99ac9447b47101ca6f8e7acec705dd7235e03
Former-commit-id: 0e32ab85db0e32ab85dbe14b372f42363aa7bec6
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: 5ce67ffd9e5ce67ffd9eae52206cc730c70cc181
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: 8a07ba3c118a07ba3c11e7045022ad7baf10fc53
2012-11-13 09:28:05 -06:00
Ron Anderson
e825e032e1
Merge "Issue #1325 Update GeoTools for WA4.7" into development
...
Former-commit-id: 024d384292024d38429241f68a9cacd07cb8c041
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: c2631b5ba6c2631b5ba6ff16f82b1814a139c813
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: 8a1f3a10a48a1f3a10a4e51d86ce3acf8fd9f731
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: a576274c3ca576274c3cd4276e6474fb4b76b003
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: d1099addc6d1099addc600822a4f39c4e5092f94
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: f255f65b3cf255f65b3cbf72e2975278a1185b19
2012-11-12 16:45:33 -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: 66606f88de66606f88dee982c0f43ade21a3f2ef
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: 6445081aa96445081aa976109f3bf7e7cd99ff0d
2012-11-12 15:26:03 -06:00
Ben Steffensmeier
94d44ed440
Issue #1108 make ZAGL level deprecated since it is in use in derived parameters, modify derived parameters to handle deprecated master levels.
...
Former-commit-id: 7d3f4790317d3f479031b5b472dee1220f41ec4c
2012-11-12 15:15:49 -06:00
Ron Anderson
80a6ade49c
Issue #1325 Update GeoTools for WA4.7
...
Change-Id: Ic4a5b2ba0e6567d39c7faf19ed4a5d5b5445fb94
Former-commit-id: f709ab812af709ab812a303994ff1b7bf1316e8c
2012-11-12 15:02:08 -06:00
Roger Ferrel
6b0c3820d8
Issue #1298 Changes for non-blocking NewToolDialog.
...
Change-Id: I83bcbf9cf19785811d35b97d04442f404429fdb5
Former-commit-id: 9c9a0689089c9a068908f48474fc82b11413b7f0
2012-11-12 14:22:02 -06:00
Lee Venable
92063028bc
Merge "Issue #1298 Changes for non-blocking NewTextProductDialog." into development
...
Former-commit-id: ab62adea95ab62adea957db247e33aded0bfb92f
2012-11-12 14:13:06 -06:00
Lee Venable
0a39d42de1
Merge "Issue #1298 Changes for non-blocking GridInfoDialog." into development
...
Former-commit-id: 879078484e879078484e62c42850e84f26da9a9a
2012-11-12 14:09:44 -06:00
Roger Ferrel
4f86b0b521
Issue #1298 Changes for non-blocking NewTextProductDialog.
...
Change-Id: I0d04cdb18a07f2ea9cfa99e95708ff64a260d99d
Former-commit-id: 3676829e8f3676829e8fee323d9c6073d9e78e92
2012-11-12 13:20:05 -06:00
Matt Nash
31241c2d94
Issue #1324 make times display in 24 hour time
...
Change-Id: I6ae145d64cd4e24f15b049eebe23822198ee7ed2
Former-commit-id: 1480e0abfc1480e0abfc0a2f7c9ed2d728ffadd0
2012-11-12 12:53:26 -06:00
Roger Ferrel
df5b8485c6
Issue #1298 Changes for non-blocking GridInfoDialog.
...
Change-Id: Ib0167b1cd63ca568250a75efa5cd0ffc8dc0885a
Former-commit-id: 30ef939e3c30ef939e3c438731ca2e195d876753
2012-11-12 12:00:03 -06:00
Roger Ferrel
26afb7f186
Issue #1298 CaveDialogUtility and changes for non-blocking ShuffleZoneGroupsDialog.
...
Changes from reviewer's comments.
Change-Id: I92ded0550563758c6f2ce4aef1dce08a42f9e079
Former-commit-id: d89ce26aebd89ce26aebd489a7ef9fe01a4ae243
2012-11-12 07:14:15 -06:00
Ben Steffensmeier
e2b7486803
Issue #1108 fix the order of arguments for grib 1 parameter mappings
...
Former-commit-id: adf0fec9a2adf0fec9a2c4f99aae6387ec259477
2012-11-09 13:36:49 -06:00
Lee Venable
458133c121
Merge "Issue #1298 Changes for non-blocking IssuanceSiteIdDlg." into development
...
Former-commit-id: 109076cb73109076cb73dac9544eeda267d9020b
2012-11-08 17:06:54 -06:00
Nate Jensen
cbd03947da
Merge "Issue #1302 Restore jdom.jar, delete net.jcip/.project" into development
...
Former-commit-id: a92bfa9393a92bfa9393cdd6a986e85e3c076506
2012-11-08 14:50:17 -06:00
Dustin Johnson
1317e0b3ef
Issue #1302 Restore jdom.jar, delete net.jcip/.project
...
Amend:
Also change the manifest and .classpath for ohd common
Change-Id: I26b4e88d36da6c38da393f2428b79735c881a23b
Former-commit-id: 595c421e47595c421e472b6e98954e0806be04dd
2012-11-08 14:47:17 -06:00
Ben Steffensmeier
74d1381180
Issue #1108 initial implementation of mappings
...
Change-Id: I05a3643e288778dbb97e80f881f2e71f6373067d
Conflicts:
edexOsgi/com.raytheon.uf.common.dataplugin.grid/META-INF/MANIFEST.MF
Former-commit-id: 535c73051d535c73051d693090cb36884c82c4fe
2012-11-08 14:45:36 -06:00
Richard Peter
80862cd12e
Merge "Issue #189 add more comments to grib decoder." into development
...
Former-commit-id: db28cc26aadb28cc26aa7077a82458e1852956e2
2012-11-08 14:40:05 -06:00
Ben Steffensmeier
40a07f8998
Issue #189 merge ncep changes to unified grid.
...
Change-Id: I3dac0d3785f093c095f50799890744919edb1891
Former-commit-id: e6b0751f5ce6b0751f5cfbed67a2087c9341a3a6
2012-11-08 14:34:55 -06:00
Richard Peter
1ce242e9f0
Merge "Issue #189 fix another Unknown Model" into development
...
Former-commit-id: 7d8dfb9c017d8dfb9c01675b1666fded90d0aa23
2012-11-08 13:43:37 -06:00
Richard Peter
e72818025a
Merge "Issue #1317 - Update the stats config files Issue #1317 - Peer review comments." into development
...
Former-commit-id: 3450ca3cd33450ca3cd32e9cdbe43e4e0c207306
2012-11-08 13:30:27 -06:00
Dustin Johnson
cd392c40bf
Issue #1302 Fix spring/project errors pointed out by CAVE spring changes
...
Change-Id: I2b39071348bea5394c4f275051f19a2853f61f1c
Former-commit-id: ddaa681d8addaa681d8a9784b563cf9bb53555a9
2012-11-08 12:00:15 -06:00
Roger Ferrel
f13bedab32
Issue #1298 Changes for non-blocking IssuanceSiteIdDlg.
...
Change-Id: I735b63606c3ca6f680f47bd61e55658b18c223ba
Former-commit-id: e26b14a84de26b14a84d89617dda6805825bd6f3
2012-11-08 11:19:51 -06:00
Lee Venable
b3991fa4c9
Merge "Issue #1298 Changes for non-blocking SaveDeleteComboDlg." into development
...
Former-commit-id: be460c956ebe460c956ee791e73a307b5f085643
2012-11-08 11:11:15 -06:00
Nate Jensen
7430e8dbfe
Merge "Issue #1308 Fixed ScanUtils unneeded dependency on BinLightningDao by switching to PluginDao. Added comments to various classes and fixed bug in menu generation code that would cause menus that use checkCreation(String,String) to regenerate menus every time." into development
...
Former-commit-id: 96cb1ecc7f96cb1ecc7f01072652dc375c864d28
2012-11-08 11:08:48 -06:00
Lee Venable
3bdfe02fe3
Merge "Issue #1298 Changes for non-blocking FuzzValueDialog." into development
...
Former-commit-id: ff5083715bff5083715bc44f90f6754a22ded443
2012-11-08 10:57:45 -06:00
Roger Ferrel
062109f9a7
Issue #1298 Changes for non-blocking SaveDeleteComboDlg.
...
Change-Id: Idd57cb86f9d91526de6e460fcd181a16f9d30e9f
Former-commit-id: dfb55edb3ddfb55edb3deae8a68fd524a2e79b28
2012-11-08 10:54:41 -06:00
Nate Jensen
7d8c983f1e
Merge "Issue #1302 Address peer review comments for 5-Data_Delivery/development merge" into development
...
Former-commit-id: 9038ff4e109038ff4e1048dae3a5e97da4882cfb
2012-11-08 10:34:56 -06:00
Mike Duff
a4574d22b1
Issue #1317 - Update the stats config files
...
Issue #1317 - Peer review comments.
Change-Id: Ic4fa6574a0d71fbdf246483f0ea2553d4d058c9f
Former-commit-id: 1372c08cdc1372c08cdc50f0c4c226688b7cce30
2012-11-08 10:15:41 -06:00
