Steve Harris
ed809a02db
12.12.1-2 baseline
...
Former-commit-id: 6868eb9b23a8560580f8
2012-11-13 17:14:24 -06:00
Lee Venable
2827143110
Merge "Issue #1298 Changes for non-blocking SetValueDialog." into development
...
Former-commit-id: dbdfda1d04989d5dc5e4
2012-11-13 16:02:05 -06:00
Steve Harris
1f1659cb16
Merge "Merge branch 'ss_builds'(12.12.1-1) into development" into development
...
Former-commit-id: 5c23f057b363b0f18a89
2012-11-13 16:02:03 -06:00
Ben Steffensmeier
ed4f88aa22
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: e8090e654b69fc030bb4
2012-11-13 16:00:19 -06:00
Roger Ferrel
cbacc77367
Issue #1298 Changes for non-blocking SetValueDialog.
...
Change-Id: Ida7350ff46cadb910972043a3882ef8d0d6ba20f
Former-commit-id: dceb2cde5d1d5bd95866
2012-11-13 15:53:03 -06:00
Lee Venable
5b4f3c68f1
Merge "Issue #1298 Changes for non-blocking SetDeltaDialog and removal of unused class ShowISCInfoDlg." into development
...
Former-commit-id: 9d149bef29c1e46f52ca
2012-11-13 15:35:13 -06:00
Lee Venable
20548994dd
Merge "Issue #1298 Change CaveJFACEDialog's open method to work similar to CaveSWTDialog's open." into development
...
Former-commit-id: d935fff5850c936a3f8c
2012-11-13 15:34:40 -06:00
Roger Ferrel
6f6b9dd21a
Issue #1298 Changes for non-blocking SetDeltaDialog and removal of unused class ShowISCInfoDlg.
...
Change-Id: Icc9482b5e1063d6a4dcc33c106a582e8a460a6d0
Former-commit-id: b421a301161e8dfdc857
2012-11-13 13:20:28 -06:00
Lee Venable
4b8129ea58
Merge "Issue #1317 - Fix problem in edexProcessStats.xml" into development
...
Former-commit-id: 548973dae05fce4fde98
2012-11-13 13:19:00 -06:00
Roger Ferrel
e3ae2eb355
Issue #1298 Change CaveJFACEDialog's open method to work similar to CaveSWTDialog's open.
...
Change-Id: I5e4cf98b98df3571a94407f2d677766b209d4081
Former-commit-id: 4c3af2a25822f8bc10f0
2012-11-13 12:55:33 -06:00
Ron Anderson
1bb7258935
Issue #1325 Update geotools source path entries per code review.
...
Change-Id: Ib9a682df979cd1b20510880b594f5c2e496094b0
Former-commit-id: 795dfdc9dd8a5a2dc532
2012-11-13 12:06:54 -06:00
Mike Duff
248db814c1
Issue #1317 - Fix problem in edexProcessStats.xml
...
Change-Id: I6fc99ac9447b47101ca6f8e7acec705dd7235e03
Former-commit-id: e14b372f420e32ab85db
2012-11-13 11:44:02 -06:00
Roger Ferrel
fdfa0f2030
Issue #1298 Changes for non-blocking ZoneColorEditorDlg.
...
Changes from reviewer's comments.
Change-Id: Ie818637b34649c498e289607ab72ac67f7c8cb6f
Former-commit-id: ae52206cc75ce67ffd9e
2012-11-13 09:49:16 -06:00
Nate Jensen
ca20259c16
Merge "Issue #1324 make times display in 24 hour time" into development
...
Former-commit-id: e7045022ad8a07ba3c11
2012-11-13 09:28:05 -06:00
Ron Anderson
8632dfa784
Merge "Issue #1325 Update GeoTools for WA4.7" into development
...
Former-commit-id: 41f68a9cac024d384292
2012-11-13 09:17:32 -06:00
Nate Jensen
b43634a58f
Merge "Issue #1323 initial commit of interfaces of data access framework" into development
...
Former-commit-id: ff16f82b18c2631b5ba6
2012-11-13 09:01:43 -06:00
Nate Jensen
254e88a70c
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: e51d86ce3a8a1f3a10a4
2012-11-12 17:16:07 -06:00
Lee Venable
e62c2fb732
Merge "Issue #1298 Changes for non-blocking WrapLengthDialog. Changes from reviewer's comments. Fix merge conflict." into development
...
Former-commit-id: d4276e6474a576274c3c
2012-11-12 16:58:17 -06:00
Max Schenkelberg
30c1802398
Issue #1308 removed activemq references in spring file, made gfe common xml explicitly depend on time xml
...
Change-Id: I784b077d1ab2d929ddad1cb69fccc4a8c5e0729e
Former-commit-id: 00822a4f39d1099addc6
2012-11-12 16:46:21 -06:00
Nate Jensen
b24c9eb456
Issue #1323 initial commit of interfaces of data access framework
...
Change-Id: I301d94a85a4e86550cd409bc17ef94ea3fdd6e02
Former-commit-id: bf72e29752f255f65b3c
2012-11-12 16:45:33 -06:00
Ben Steffensmeier
4a75a9ef3b
Issue #189 modify upgrade script to work with grid resources within bestRes.
...
Former-commit-id: 8d2a0d4b169c17cd2039
2012-11-12 16:37:28 -06:00
Roger Ferrel
ab77dfa758
Issue #1298 Changes for non-blocking WrapLengthDialog.
...
Changes from reviewer's comments.
Fix merge conflict.
Change-Id: If31259188ff9fc1c84a02ca11399dd328dd669d4
Former-commit-id: e982c0f43a66606f88de
2012-11-12 16:27:08 -06:00
Roger Ferrel
13c0fb3f3d
Issue #1298 Changes for non-blocking StoreTransmitDlg.
...
Changes from reviewer's coments.
Change-Id: I34e111ee2abc8ca154334e9017ea448bfa6fa31f
Former-commit-id: 76109f3bf76445081aa9
2012-11-12 15:26:03 -06:00
Ben Steffensmeier
65441372df
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: b5b472dee17d3f479031
2012-11-12 15:15:49 -06:00
Ron Anderson
7aaf4db2dc
Issue #1325 Update GeoTools for WA4.7
...
Change-Id: Ic4a5b2ba0e6567d39c7faf19ed4a5d5b5445fb94
Former-commit-id: 303994ff1bf709ab812a
2012-11-12 15:02:08 -06:00
Roger Ferrel
6ec9c1fac4
Issue #1298 Changes for non-blocking NewToolDialog.
...
Change-Id: I83bcbf9cf19785811d35b97d04442f404429fdb5
Former-commit-id: f48474fc829c9a068908
2012-11-12 14:22:02 -06:00
Lee Venable
72aedbcece
Merge "Issue #1298 Changes for non-blocking NewTextProductDialog." into development
...
Former-commit-id: 7db247e33aab62adea95
2012-11-12 14:13:06 -06:00
Lee Venable
d9022d16a6
Merge "Issue #1298 Changes for non-blocking GridInfoDialog." into development
...
Former-commit-id: 62c42850e8879078484e
2012-11-12 14:09:44 -06:00
Roger Ferrel
ce6d6e277e
Issue #1298 Changes for non-blocking NewTextProductDialog.
...
Change-Id: I0d04cdb18a07f2ea9cfa99e95708ff64a260d99d
Former-commit-id: ee323d9c603676829e8f
2012-11-12 13:20:05 -06:00
Matt Nash
7fa21f5041
Issue #1324 make times display in 24 hour time
...
Change-Id: I6ae145d64cd4e24f15b049eebe23822198ee7ed2
Former-commit-id: 0a2f7c9ed21480e0abfc
2012-11-12 12:53:26 -06:00
Roger Ferrel
1f509c5a54
Issue #1298 Changes for non-blocking GridInfoDialog.
...
Change-Id: Ib0167b1cd63ca568250a75efa5cd0ffc8dc0885a
Former-commit-id: 438731ca2e30ef939e3c
2012-11-12 12:00:03 -06:00
Roger Ferrel
b60cbeda7a
Issue #1298 CaveDialogUtility and changes for non-blocking ShuffleZoneGroupsDialog.
...
Changes from reviewer's comments.
Change-Id: I92ded0550563758c6f2ce4aef1dce08a42f9e079
Former-commit-id: d489a7ef9fd89ce26aeb
2012-11-12 07:14:15 -06:00
Ben Steffensmeier
894998b95f
Issue #1108 fix the order of arguments for grib 1 parameter mappings
...
Former-commit-id: c4f99aae63adf0fec9a2
2012-11-09 13:36:49 -06:00
Lee Venable
125ac804a7
Merge "Issue #1298 Changes for non-blocking IssuanceSiteIdDlg." into development
...
Former-commit-id: dac9544eed109076cb73
2012-11-08 17:06:54 -06:00
Nate Jensen
5e718ca85b
Merge "Issue #1302 Restore jdom.jar, delete net.jcip/.project" into development
...
Former-commit-id: cdd6a986e8a92bfa9393
2012-11-08 14:50:17 -06:00
Dustin Johnson
db4d728eb7
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: 2b6e98954e595c421e47
2012-11-08 14:47:17 -06:00
Ben Steffensmeier
20e618eb4f
Issue #1108 initial implementation of mappings
...
Change-Id: I05a3643e288778dbb97e80f881f2e71f6373067d
Conflicts:
edexOsgi/com.raytheon.uf.common.dataplugin.grid/META-INF/MANIFEST.MF
Former-commit-id: 693090cb36535c73051d
2012-11-08 14:45:36 -06:00
Richard Peter
7f49c5fe04
Merge "Issue #189 add more comments to grib decoder." into development
...
Former-commit-id: 7077a82458db28cc26aa
2012-11-08 14:40:05 -06:00
Ben Steffensmeier
f62cf2713d
Issue #189 merge ncep changes to unified grid.
...
Change-Id: I3dac0d3785f093c095f50799890744919edb1891
Former-commit-id: fbed67a208e6b0751f5c
2012-11-08 14:34:55 -06:00
Richard Peter
10138f3ae8
Merge "Issue #189 fix another Unknown Model" into development
...
Former-commit-id: 675b1666fd7d8dfb9c01
2012-11-08 13:43:37 -06:00
Richard Peter
62e5aff255
Merge "Issue #1317 - Update the stats config files Issue #1317 - Peer review comments." into development
...
Former-commit-id: 2e9cdbe43e3450ca3cd3
2012-11-08 13:30:27 -06:00
Dustin Johnson
1220f5167e
Issue #1302 Fix spring/project errors pointed out by CAVE spring changes
...
Change-Id: I2b39071348bea5394c4f275051f19a2853f61f1c
Former-commit-id: 9784b563cfddaa681d8a
2012-11-08 12:00:15 -06:00
Roger Ferrel
709798659d
Issue #1298 Changes for non-blocking IssuanceSiteIdDlg.
...
Change-Id: I735b63606c3ca6f680f47bd61e55658b18c223ba
Former-commit-id: 89617dda68e26b14a84d
2012-11-08 11:19:51 -06:00
Lee Venable
6c0bb76679
Merge "Issue #1298 Changes for non-blocking SaveDeleteComboDlg." into development
...
Former-commit-id: e791e73a30be460c956e
2012-11-08 11:11:15 -06:00
Nate Jensen
e3487942ac
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: 01072652dc96cb1ecc7f
2012-11-08 11:08:48 -06:00
Lee Venable
c4526c5ba0
Merge "Issue #1298 Changes for non-blocking FuzzValueDialog." into development
...
Former-commit-id: c44f90f675ff5083715b
2012-11-08 10:57:45 -06:00
Roger Ferrel
359ee69fa6
Issue #1298 Changes for non-blocking SaveDeleteComboDlg.
...
Change-Id: Idd57cb86f9d91526de6e460fcd181a16f9d30e9f
Former-commit-id: eae8a68fd5dfb55edb3d
2012-11-08 10:54:41 -06:00
Nate Jensen
ca5db2ec43
Merge "Issue #1302 Address peer review comments for 5-Data_Delivery/development merge" into development
...
Former-commit-id: 48dae3a5e99038ff4e10
2012-11-08 10:34:56 -06:00
Mike Duff
e72c2822ad
Issue #1317 - Update the stats config files
...
Issue #1317 - Peer review comments.
Change-Id: Ic4fa6574a0d71fbdf246483f0ea2553d4d058c9f
Former-commit-id: 50f0c4c2261372c08cdc
2012-11-08 10:15:41 -06:00
Max Schenkelberg
5f0b4286ba
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: c80dbffad89aa4221fdf
2012-11-08 10:08:38 -06:00
