Steve Harris
1e0ad343d6
Merge "Merge branch 'ss_builds'(12.12.1-1) into development" into development
...
Former-commit-id: 63b0f18a895c23f057b3
2012-11-13 16:02:03 -06:00
Ben Steffensmeier
60f78c22e3
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: 69fc030bb4e8090e654b
2012-11-13 16:00:19 -06:00
Roger Ferrel
29eb436b19
Issue #1298 Changes for non-blocking SetValueDialog.
...
Change-Id: Ida7350ff46cadb910972043a3882ef8d0d6ba20f
Former-commit-id: 1d5bd95866dceb2cde5d
2012-11-13 15:53:03 -06:00
Lee Venable
32f088d986
Merge "Issue #1298 Changes for non-blocking SetDeltaDialog and removal of unused class ShowISCInfoDlg." into development
...
Former-commit-id: c1e46f52ca9d149bef29
2012-11-13 15:35:13 -06:00
Lee Venable
a78cdc9ee4
Merge "Issue #1298 Change CaveJFACEDialog's open method to work similar to CaveSWTDialog's open." into development
...
Former-commit-id: 0c936a3f8cd935fff585
2012-11-13 15:34:40 -06:00
Roger Ferrel
d646f32d6e
Issue #1298 Changes for non-blocking SetDeltaDialog and removal of unused class ShowISCInfoDlg.
...
Change-Id: Icc9482b5e1063d6a4dcc33c106a582e8a460a6d0
Former-commit-id: 1e8dfdc857b421a30116
2012-11-13 13:20:28 -06:00
Lee Venable
89e28445e5
Merge "Issue #1317 - Fix problem in edexProcessStats.xml" into development
...
Former-commit-id: 5fce4fde98548973dae0
2012-11-13 13:19:00 -06:00
Roger Ferrel
8e85e1c8df
Issue #1298 Change CaveJFACEDialog's open method to work similar to CaveSWTDialog's open.
...
Change-Id: I5e4cf98b98df3571a94407f2d677766b209d4081
Former-commit-id: 22f8bc10f04c3af2a258
2012-11-13 12:55:33 -06:00
Ron Anderson
bad09a9c0d
Issue #1325 Update geotools source path entries per code review.
...
Change-Id: Ib9a682df979cd1b20510880b594f5c2e496094b0
Former-commit-id: 8a5a2dc532795dfdc9dd
2012-11-13 12:06:54 -06:00
Mike Duff
363aa7bec6
Issue #1317 - Fix problem in edexProcessStats.xml
...
Change-Id: I6fc99ac9447b47101ca6f8e7acec705dd7235e03
Former-commit-id: 0e32ab85dbe14b372f42
2012-11-13 11:44:02 -06:00
Roger Ferrel
30c70cc181
Issue #1298 Changes for non-blocking ZoneColorEditorDlg.
...
Changes from reviewer's comments.
Change-Id: Ie818637b34649c498e289607ab72ac67f7c8cb6f
Former-commit-id: 5ce67ffd9eae52206cc7
2012-11-13 09:49:16 -06:00
Nate Jensen
7baf10fc53
Merge "Issue #1324 make times display in 24 hour time" into development
...
Former-commit-id: 8a07ba3c11e7045022ad
2012-11-13 09:28:05 -06:00
Ron Anderson
d07cb8c041
Merge "Issue #1325 Update GeoTools for WA4.7" into development
...
Former-commit-id: 024d38429241f68a9cac
2012-11-13 09:17:32 -06:00
Nate Jensen
14a139c813
Merge "Issue #1323 initial commit of interfaces of data access framework" into development
...
Former-commit-id: c2631b5ba6ff16f82b18
2012-11-13 09:01:43 -06:00
Nate Jensen
cf8fd9f731
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: 8a1f3a10a4e51d86ce3a
2012-11-12 17:16:07 -06:00
Lee Venable
fb4b76b003
Merge "Issue #1298 Changes for non-blocking WrapLengthDialog. Changes from reviewer's comments. Fix merge conflict." into development
...
Former-commit-id: a576274c3cd4276e6474
2012-11-12 16:58:17 -06:00
Max Schenkelberg
c4e5092f94
Issue #1308 removed activemq references in spring file, made gfe common xml explicitly depend on time xml
...
Change-Id: I784b077d1ab2d929ddad1cb69fccc4a8c5e0729e
Former-commit-id: d1099addc600822a4f39
2012-11-12 16:46:21 -06:00
Nate Jensen
78a1185b19
Issue #1323 initial commit of interfaces of data access framework
...
Change-Id: I301d94a85a4e86550cd409bc17ef94ea3fdd6e02
Former-commit-id: f255f65b3cbf72e29752
2012-11-12 16:45:33 -06:00
Ben Steffensmeier
ff9becd710
Issue #189 modify upgrade script to work with grid resources within bestRes.
...
Former-commit-id: 9c17cd20398d2a0d4b16
2012-11-12 16:37:28 -06:00
Roger Ferrel
de21a3f2ef
Issue #1298 Changes for non-blocking WrapLengthDialog.
...
Changes from reviewer's comments.
Fix merge conflict.
Change-Id: If31259188ff9fc1c84a02ca11399dd328dd669d4
Former-commit-id: 66606f88dee982c0f43a
2012-11-12 16:27:08 -06:00
Roger Ferrel
e7cd99ff0d
Issue #1298 Changes for non-blocking StoreTransmitDlg.
...
Changes from reviewer's coments.
Change-Id: I34e111ee2abc8ca154334e9017ea448bfa6fa31f
Former-commit-id: 6445081aa976109f3bf7
2012-11-12 15:26:03 -06:00
Ben Steffensmeier
220f41ec4c
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: 7d3f479031b5b472dee1
2012-11-12 15:15:49 -06:00
Ron Anderson
7bf1316e8c
Issue #1325 Update GeoTools for WA4.7
...
Change-Id: Ic4a5b2ba0e6567d39c7faf19ed4a5d5b5445fb94
Former-commit-id: f709ab812a303994ff1b
2012-11-12 15:02:08 -06:00
Roger Ferrel
b11413b7f0
Issue #1298 Changes for non-blocking NewToolDialog.
...
Change-Id: I83bcbf9cf19785811d35b97d04442f404429fdb5
Former-commit-id: 9c9a068908f48474fc82
2012-11-12 14:22:02 -06:00
Lee Venable
ded0bfb92f
Merge "Issue #1298 Changes for non-blocking NewTextProductDialog." into development
...
Former-commit-id: ab62adea957db247e33a
2012-11-12 14:13:06 -06:00
Lee Venable
4f26da9a9a
Merge "Issue #1298 Changes for non-blocking GridInfoDialog." into development
...
Former-commit-id: 879078484e62c42850e8
2012-11-12 14:09:44 -06:00
Roger Ferrel
73d9e78e92
Issue #1298 Changes for non-blocking NewTextProductDialog.
...
Change-Id: I0d04cdb18a07f2ea9cfa99e95708ff64a260d99d
Former-commit-id: 3676829e8fee323d9c60
2012-11-12 13:20:05 -06:00
Matt Nash
d728ffadd0
Issue #1324 make times display in 24 hour time
...
Change-Id: I6ae145d64cd4e24f15b049eebe23822198ee7ed2
Former-commit-id: 1480e0abfc0a2f7c9ed2
2012-11-12 12:53:26 -06:00
Roger Ferrel
195d876753
Issue #1298 Changes for non-blocking GridInfoDialog.
...
Change-Id: Ib0167b1cd63ca568250a75efa5cd0ffc8dc0885a
Former-commit-id: 30ef939e3c438731ca2e
2012-11-12 12:00:03 -06:00
Roger Ferrel
e01a4ae243
Issue #1298 CaveDialogUtility and changes for non-blocking ShuffleZoneGroupsDialog.
...
Changes from reviewer's comments.
Change-Id: I92ded0550563758c6f2ce4aef1dce08a42f9e079
Former-commit-id: d89ce26aebd489a7ef9f
2012-11-12 07:14:15 -06:00
Ben Steffensmeier
87ec259477
Issue #1108 fix the order of arguments for grib 1 parameter mappings
...
Former-commit-id: adf0fec9a2c4f99aae63
2012-11-09 13:36:49 -06:00
Lee Venable
a267d9020b
Merge "Issue #1298 Changes for non-blocking IssuanceSiteIdDlg." into development
...
Former-commit-id: 109076cb73dac9544eed
2012-11-08 17:06:54 -06:00
Nate Jensen
5e3c076506
Merge "Issue #1302 Restore jdom.jar, delete net.jcip/.project" into development
...
Former-commit-id: a92bfa9393cdd6a986e8
2012-11-08 14:50:17 -06:00
Dustin Johnson
0806be04dd
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: 595c421e472b6e98954e
2012-11-08 14:47:17 -06:00
Ben Steffensmeier
884c82c4fe
Issue #1108 initial implementation of mappings
...
Change-Id: I05a3643e288778dbb97e80f881f2e71f6373067d
Conflicts:
edexOsgi/com.raytheon.uf.common.dataplugin.grid/META-INF/MANIFEST.MF
Former-commit-id: 535c73051d693090cb36
2012-11-08 14:45:36 -06:00
Richard Peter
e1852956e2
Merge "Issue #189 add more comments to grib decoder." into development
...
Former-commit-id: db28cc26aa7077a82458
2012-11-08 14:40:05 -06:00
Ben Steffensmeier
7c9341a3a6
Issue #189 merge ncep changes to unified grid.
...
Change-Id: I3dac0d3785f093c095f50799890744919edb1891
Former-commit-id: e6b0751f5cfbed67a208
2012-11-08 14:34:55 -06:00
Richard Peter
ed90d0aa23
Merge "Issue #189 fix another Unknown Model" into development
...
Former-commit-id: 7d8dfb9c01675b1666fd
2012-11-08 13:43:37 -06:00
Richard Peter
4e0c207306
Merge "Issue #1317 - Update the stats config files Issue #1317 - Peer review comments." into development
...
Former-commit-id: 3450ca3cd32e9cdbe43e
2012-11-08 13:30:27 -06:00
Dustin Johnson
9bb53555a9
Issue #1302 Fix spring/project errors pointed out by CAVE spring changes
...
Change-Id: I2b39071348bea5394c4f275051f19a2853f61f1c
Former-commit-id: ddaa681d8a9784b563cf
2012-11-08 12:00:15 -06:00
Roger Ferrel
05825bd6f3
Issue #1298 Changes for non-blocking IssuanceSiteIdDlg.
...
Change-Id: I735b63606c3ca6f680f47bd61e55658b18c223ba
Former-commit-id: e26b14a84d89617dda68
2012-11-08 11:19:51 -06:00
Lee Venable
7b5f085643
Merge "Issue #1298 Changes for non-blocking SaveDeleteComboDlg." into development
...
Former-commit-id: be460c956ee791e73a30
2012-11-08 11:11:15 -06:00
Nate Jensen
375c864d28
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: 96cb1ecc7f01072652dc
2012-11-08 11:08:48 -06:00
Lee Venable
4a22ded443
Merge "Issue #1298 Changes for non-blocking FuzzValueDialog." into development
...
Former-commit-id: ff5083715bc44f90f675
2012-11-08 10:57:45 -06:00
Roger Ferrel
24a2e79b28
Issue #1298 Changes for non-blocking SaveDeleteComboDlg.
...
Change-Id: Idd57cb86f9d91526de6e460fcd181a16f9d30e9f
Former-commit-id: dfb55edb3deae8a68fd5
2012-11-08 10:54:41 -06:00
Nate Jensen
7da4882cfb
Merge "Issue #1302 Address peer review comments for 5-Data_Delivery/development merge" into development
...
Former-commit-id: 9038ff4e1048dae3a5e9
2012-11-08 10:34:56 -06:00
Mike Duff
688b7cce30
Issue #1317 - Update the stats config files
...
Issue #1317 - Peer review comments.
Change-Id: Ic4fa6574a0d71fbdf246483f0ea2553d4d058c9f
Former-commit-id: 1372c08cdc50f0c4c226
2012-11-08 10:15:41 -06:00
Max Schenkelberg
0a410412db
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.
...
Change-Id: Icc7f89812936f97029e2a06adbc527ec658d8d9b
Former-commit-id: 9aa4221fdfc80dbffad8
2012-11-08 10:08:38 -06:00
Dustin Johnson
4222b24d09
Issue #1302 Address peer review comments for 5-Data_Delivery/development merge
...
Amend:
More peer review comments
Restore PreferencesHandler
Change-Id: Ib995f58c31ce844466674dbe29bf3048b78048f7
Former-commit-id: 064ef82d1e1dbeb22893
2012-11-08 09:57:16 -06:00
Roger Ferrel
de534f5b43
Issue #1298 Changes for non-blocking FuzzValueDialog.
...
Change-Id: I7f6c6349b2576a9e692570f2fc118d939ee8efef
Former-commit-id: 023252fb84c3f451f799
2012-11-08 08:24:38 -06:00
