Nate Jensen
38b27d23af
Merge "Issue #189 fix contour subgridding for worldwide grids" into development
...
Former-commit-id: 340f8e1fa8
[formerly 5055164f55
[formerly 553b56aa362b452110a7f5a4f76aec9640d13599]]
Former-commit-id: 5055164f55
Former-commit-id: ee7daccb2c
2012-11-14 16:09:51 -06:00
Lee Venable
2c82bf1184
Merge "Issue #1298 Changes for non-blocking DisplayAttributesDialog." into development
...
Former-commit-id: 6134e5d3f7
[formerly 695cf85335
[formerly 33b0aada5191fd6a757f37029862cdcadf8c0692]]
Former-commit-id: 695cf85335
Former-commit-id: 6152ecccda
2012-11-14 16:06:02 -06:00
Lee Venable
39972763e4
Merge "Issue #1298 Changes for non-blocking TEWxSetValueDialog." into development
...
Former-commit-id: edfab7e56f
[formerly 8fa3d794fd
[formerly eceb7bed3794368ebb0cd57e466e7beaee88a19d]]
Former-commit-id: 8fa3d794fd
Former-commit-id: 64d9ba9184
2012-11-14 16:05:20 -06:00
Roger Ferrel
08919ea541
Issue #1298 Changes for non-blocking DisplayAttributesDialog.
...
Change-Id: I2175023db40ad6b24c47ebc2cd16e12572fb1b6d
Former-commit-id: 212045c1a6
[formerly 7ca75756ae
[formerly 260f5085bba45ab5b3ad10dd3945a64195eb2d7b]]
Former-commit-id: 7ca75756ae
Former-commit-id: 82f9c74bef
2012-11-14 14:56:42 -06:00
Dustin Johnson
069c8d4788
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: 0d1d663f41
[formerly bff32bbe58
[formerly 2f676ffcab1c9efa612a52283d05e56f9c748569]]
Former-commit-id: bff32bbe58
Former-commit-id: d27bce13c2
2012-11-14 14:41:57 -06:00
Roger Ferrel
cac846718a
Issue #1298 Changes for non-blocking TEWxSetValueDialog.
...
Change-Id: I2d46c885ef0aa7aa8019665e8822d62ed221be8b
Former-commit-id: dd8f8a9fa7
[formerly 7f22145bf2
[formerly f489ae636459e2dfcf7092d0ede7a37e84398cb2]]
Former-commit-id: 7f22145bf2
Former-commit-id: 679d967382
2012-11-14 14:20:40 -06:00
Steve Harris
b968ab5135
12.12.1-4 baseline
...
Former-commit-id: 57578da521
[formerly 85130eb611
[formerly 4a7e3fabdef8d948216483965c1f62e5216bf362]]
Former-commit-id: 85130eb611
Former-commit-id: b91b7f0fae
2012-11-14 14:19:20 -06:00
Roger Ferrel
a49ee93898
Issue #1298 Changes for non-blocking TEDiscreteSetValueDialog.
...
Change-Id: I4e015b94f20b5075c4dc22d2165718d02109e0a8
Former-commit-id: 2331b8e1f5
[formerly e267248b57
[formerly 5c0eef28a67b874f184fd391d9220957030e43c7]]
Former-commit-id: e267248b57
Former-commit-id: 62faa06ddf
2012-11-14 14:02:01 -06:00
Lee Venable
68a58d808a
Merge "Issue #1298 Convert UserEntryDialog to CaveSWTDialog but keep it a blocking dialog." into development
...
Former-commit-id: e9ae25e781
[formerly e755889643
[formerly dbb1bc97d99827f7e97039f7a333ae0fc00353f0]]
Former-commit-id: e755889643
Former-commit-id: a6e88a6856
2012-11-14 13:30:42 -06:00
Roger Ferrel
a8453f1f81
Issue #1298 Convert UserEntryDialog to CaveSWTDialog but keep it a blocking dialog.
...
Change-Id: I5c2ae63c0461d5e3e96a050c0055a625b1271072
Former-commit-id: 590eca2cba
[formerly d16a448e05
[formerly eadf4e9a28df6687a8e0bee6c6cef74356cd26d7]]
Former-commit-id: d16a448e05
Former-commit-id: 7f3d893c84
2012-11-14 12:04:18 -06:00
Ben Steffensmeier
3165998c1c
Issue #189 fix contour subgridding for worldwide grids
...
Former-commit-id: 929a785e1b
[formerly 3ee95cff21
[formerly e0fb632cc7e0d089436b64a3f2bc6977a0487708]]
Former-commit-id: 3ee95cff21
Former-commit-id: 33d07530c6
2012-11-14 11:38:25 -06:00
Roger Ferrel
4424131662
Issue #1298 Changes for non-blocking WeatherElementGroupDialog.
...
Changes from reviewer comments.
Change-Id: Ib21a454575115f26da165704454caaa76d86b5ac
Former-commit-id: b32480ed08
[formerly 049ecefe1d
[formerly d8b828e6bc0a47caa01165cdb22e87f301534e30]]
Former-commit-id: 049ecefe1d
Former-commit-id: 5e805da0e1
2012-11-14 11:36:52 -06:00
Steve Harris
1ee8938748
Merge branch 'ss_builds' (12.12.1-3) into development
...
Former-commit-id: 00f3d51546
[formerly 448dd1c35f
[formerly 7a44f29952ec89991e578c67357e1ef3f3c51d59]]
Former-commit-id: 448dd1c35f
Former-commit-id: 8fc896f7d4
2012-11-13 17:28:50 -06:00
Steve Harris
48fa2a9106
12.12.1-3 baseline
...
Former-commit-id: b3b5e6d28f
[formerly c999505fba
[formerly 8481c91f9918a61631198331c324c4c5a76aac0f]]
Former-commit-id: c999505fba
Former-commit-id: a81c46987b
2012-11-13 17:27:04 -06:00
Steve Harris
7192b19284
12.12.1-2 baseline
...
Former-commit-id: 6868eb9b23
[formerly a8560580f8
[formerly 90019fdb91dad949f125e46de9300ccd44f6e315]]
Former-commit-id: a8560580f8
Former-commit-id: ed809a02db
2012-11-13 17:14:24 -06:00
Lee Venable
4320165247
Merge "Issue #1298 Changes for non-blocking SetValueDialog." into development
...
Former-commit-id: dbdfda1d04
[formerly 989d5dc5e4
[formerly 7f22292e89e05b881466efd1d81ef851c454246a]]
Former-commit-id: 989d5dc5e4
Former-commit-id: 2827143110
2012-11-13 16:02:05 -06:00
Steve Harris
5569785336
Merge "Merge branch 'ss_builds'(12.12.1-1) into development" into development
...
Former-commit-id: 5c23f057b3
[formerly 63b0f18a89
[formerly b0c071ca9877eb73e312a530d6abb94563cbc980]]
Former-commit-id: 63b0f18a89
Former-commit-id: 1f1659cb16
2012-11-13 16:02:03 -06:00
Ben Steffensmeier
626f398224
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: e8090e654b
[formerly 69fc030bb4
[formerly 911c845199714c07e93f9847ab00fcd6d28a4223]]
Former-commit-id: 69fc030bb4
Former-commit-id: ed4f88aa22
2012-11-13 16:00:19 -06:00
Roger Ferrel
f9265a7f55
Issue #1298 Changes for non-blocking SetValueDialog.
...
Change-Id: Ida7350ff46cadb910972043a3882ef8d0d6ba20f
Former-commit-id: dceb2cde5d
[formerly 1d5bd95866
[formerly 5c94dd5727420ff612ff1fa5bbdb06a041e89459]]
Former-commit-id: 1d5bd95866
Former-commit-id: cbacc77367
2012-11-13 15:53:03 -06:00
Lee Venable
65c0b3953e
Merge "Issue #1298 Changes for non-blocking SetDeltaDialog and removal of unused class ShowISCInfoDlg." into development
...
Former-commit-id: 9d149bef29
[formerly c1e46f52ca
[formerly 795564ae453a7afb423980679c3719a7c453aa74]]
Former-commit-id: c1e46f52ca
Former-commit-id: 5b4f3c68f1
2012-11-13 15:35:13 -06:00
Roger Ferrel
9ec6ee1fe4
Issue #1298 Changes for non-blocking SetDeltaDialog and removal of unused class ShowISCInfoDlg.
...
Change-Id: Icc9482b5e1063d6a4dcc33c106a582e8a460a6d0
Former-commit-id: b421a30116
[formerly 1e8dfdc857
[formerly 149198a0ab46b58518edb02c1bfb19e2f432726c]]
Former-commit-id: 1e8dfdc857
Former-commit-id: 6f6b9dd21a
2012-11-13 13:20:28 -06:00
Roger Ferrel
2209d4d650
Issue #1298 Change CaveJFACEDialog's open method to work similar to CaveSWTDialog's open.
...
Change-Id: I5e4cf98b98df3571a94407f2d677766b209d4081
Former-commit-id: 4c3af2a258
[formerly 22f8bc10f0
[formerly 4da71d30d62eeeee3546c3019850e77cab757c78]]
Former-commit-id: 22f8bc10f0
Former-commit-id: e3ae2eb355
2012-11-13 12:55:33 -06:00
Roger Ferrel
e82a2e2d5c
Issue #1298 Changes for non-blocking ZoneColorEditorDlg.
...
Changes from reviewer's comments.
Change-Id: Ie818637b34649c498e289607ab72ac67f7c8cb6f
Former-commit-id: ae52206cc7
[formerly 5ce67ffd9e
[formerly 6b6c4e0b61fbc7b51bdef738a4bdee7505fc8ea5]]
Former-commit-id: 5ce67ffd9e
Former-commit-id: fdfa0f2030
2012-11-13 09:49:16 -06:00
Nate Jensen
dcff3f4711
Merge "Issue #1324 make times display in 24 hour time" into development
...
Former-commit-id: e7045022ad
[formerly 8a07ba3c11
[formerly 40c13a1ca4345f791c9f6f3849fe896ba27a2830]]
Former-commit-id: 8a07ba3c11
Former-commit-id: ca20259c16
2012-11-13 09:28:05 -06:00
Nate Jensen
35ea1b7773
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: e51d86ce3a
[formerly 8a1f3a10a4
[formerly ef3483e14907e044a66cb6c5c677b6794bf9b03a]]
Former-commit-id: 8a1f3a10a4
Former-commit-id: 254e88a70c
2012-11-12 17:16:07 -06:00
Lee Venable
ca88126428
Merge "Issue #1298 Changes for non-blocking WrapLengthDialog. Changes from reviewer's comments. Fix merge conflict." into development
...
Former-commit-id: d4276e6474
[formerly a576274c3c
[formerly 46fbeba87efbee0b558fdd2c8f7e8c5abf004ac5]]
Former-commit-id: a576274c3c
Former-commit-id: e62c2fb732
2012-11-12 16:58:17 -06:00
Max Schenkelberg
1ed5f10230
Issue #1308 removed activemq references in spring file, made gfe common xml explicitly depend on time xml
...
Change-Id: I784b077d1ab2d929ddad1cb69fccc4a8c5e0729e
Former-commit-id: 00822a4f39
[formerly d1099addc6
[formerly e696b81840b6c1f0a0df8a9f20b859f23bc5a3e7]]
Former-commit-id: d1099addc6
Former-commit-id: 30c1802398
2012-11-12 16:46:21 -06:00
Roger Ferrel
5f0a583d86
Issue #1298 Changes for non-blocking WrapLengthDialog.
...
Changes from reviewer's comments.
Fix merge conflict.
Change-Id: If31259188ff9fc1c84a02ca11399dd328dd669d4
Former-commit-id: e982c0f43a
[formerly 66606f88de
[formerly 50327729d4b0b135cf959a9093dc90a32cf091e6]]
Former-commit-id: 66606f88de
Former-commit-id: ab77dfa758
2012-11-12 16:27:08 -06:00
Roger Ferrel
e6030885a1
Issue #1298 Changes for non-blocking StoreTransmitDlg.
...
Changes from reviewer's coments.
Change-Id: I34e111ee2abc8ca154334e9017ea448bfa6fa31f
Former-commit-id: 76109f3bf7
[formerly 6445081aa9
[formerly 35e8deb27aecf5c805f0c007e70c45d8cc9988cb]]
Former-commit-id: 6445081aa9
Former-commit-id: 13c0fb3f3d
2012-11-12 15:26:03 -06:00
Ben Steffensmeier
dfe697a59c
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: b5b472dee1
[formerly 7d3f479031
[formerly 2242eefb25cd65edb4378b47b9cafbcab8510c53]]
Former-commit-id: 7d3f479031
Former-commit-id: 65441372df
2012-11-12 15:15:49 -06:00
Roger Ferrel
499100c5b6
Issue #1298 Changes for non-blocking NewToolDialog.
...
Change-Id: I83bcbf9cf19785811d35b97d04442f404429fdb5
Former-commit-id: f48474fc82
[formerly 9c9a068908
[formerly b24c130aa9c612822dda92a9820912b0cd7bc852]]
Former-commit-id: 9c9a068908
Former-commit-id: 6ec9c1fac4
2012-11-12 14:22:02 -06:00
Lee Venable
ca20167d7e
Merge "Issue #1298 Changes for non-blocking NewTextProductDialog." into development
...
Former-commit-id: 7db247e33a
[formerly ab62adea95
[formerly bec0ccddba047ab9e9b6fa64bf839e9930dc675b]]
Former-commit-id: ab62adea95
Former-commit-id: 72aedbcece
2012-11-12 14:13:06 -06:00
Lee Venable
6359f32b18
Merge "Issue #1298 Changes for non-blocking GridInfoDialog." into development
...
Former-commit-id: 62c42850e8
[formerly 879078484e
[formerly a2a570c55e93b328735e2d2af887eadada92b6ea]]
Former-commit-id: 879078484e
Former-commit-id: d9022d16a6
2012-11-12 14:09:44 -06:00
Roger Ferrel
5ea786daaf
Issue #1298 Changes for non-blocking NewTextProductDialog.
...
Change-Id: I0d04cdb18a07f2ea9cfa99e95708ff64a260d99d
Former-commit-id: ee323d9c60
[formerly 3676829e8f
[formerly b2d932d2f4bc6430fba99ecfa08fd2adb885b3ac]]
Former-commit-id: 3676829e8f
Former-commit-id: ce6d6e277e
2012-11-12 13:20:05 -06:00
Matt Nash
0894e7800d
Issue #1324 make times display in 24 hour time
...
Change-Id: I6ae145d64cd4e24f15b049eebe23822198ee7ed2
Former-commit-id: 0a2f7c9ed2
[formerly 1480e0abfc
[formerly d7eab0e3c398b9ab90c9aa32e1d45920177620e4]]
Former-commit-id: 1480e0abfc
Former-commit-id: 7fa21f5041
2012-11-12 12:53:26 -06:00
Roger Ferrel
dde8ce56c0
Issue #1298 Changes for non-blocking GridInfoDialog.
...
Change-Id: Ib0167b1cd63ca568250a75efa5cd0ffc8dc0885a
Former-commit-id: 438731ca2e
[formerly 30ef939e3c
[formerly ea26ccdc4e0bccdeb1c61f8bd1566a83ed87d433]]
Former-commit-id: 30ef939e3c
Former-commit-id: 1f509c5a54
2012-11-12 12:00:03 -06:00
Roger Ferrel
259949bc5f
Issue #1298 CaveDialogUtility and changes for non-blocking ShuffleZoneGroupsDialog.
...
Changes from reviewer's comments.
Change-Id: I92ded0550563758c6f2ce4aef1dce08a42f9e079
Former-commit-id: d489a7ef9f
[formerly d89ce26aeb
[formerly ac9b159e639b51da8ae6b527907926d1fe8efdd0]]
Former-commit-id: d89ce26aeb
Former-commit-id: b60cbeda7a
2012-11-12 07:14:15 -06:00
Lee Venable
db5861e92a
Merge "Issue #1298 Changes for non-blocking IssuanceSiteIdDlg." into development
...
Former-commit-id: dac9544eed
[formerly 109076cb73
[formerly 5d3efae3ddbfafd2cbab419daa14a8259b2863e6]]
Former-commit-id: 109076cb73
Former-commit-id: 125ac804a7
2012-11-08 17:06:54 -06:00
Nate Jensen
78d49992a3
Merge "Issue #1302 Restore jdom.jar, delete net.jcip/.project" into development
...
Former-commit-id: cdd6a986e8
[formerly a92bfa9393
[formerly e08068e0f400abe1a6bddef1462f9f67d8dac2de]]
Former-commit-id: a92bfa9393
Former-commit-id: 5e718ca85b
2012-11-08 14:50:17 -06:00
Dustin Johnson
19c2e301b8
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: 2b6e98954e
[formerly 595c421e47
[formerly 49b999039c470a5df095a202b5a67bf036a5b71c]]
Former-commit-id: 595c421e47
Former-commit-id: db4d728eb7
2012-11-08 14:47:17 -06:00
Ben Steffensmeier
a0f6c320cb
Issue #1108 initial implementation of mappings
...
Change-Id: I05a3643e288778dbb97e80f881f2e71f6373067d
Conflicts:
edexOsgi/com.raytheon.uf.common.dataplugin.grid/META-INF/MANIFEST.MF
Former-commit-id: 693090cb36
[formerly 535c73051d
[formerly 8db340a796df354059f3d4142db92dfd5fa527f5]]
Former-commit-id: 535c73051d
Former-commit-id: 20e618eb4f
2012-11-08 14:45:36 -06:00
Roger Ferrel
fb742c6dbf
Issue #1298 Changes for non-blocking IssuanceSiteIdDlg.
...
Change-Id: I735b63606c3ca6f680f47bd61e55658b18c223ba
Former-commit-id: 89617dda68
[formerly e26b14a84d
[formerly a2a52b7754d831406e591763930f419def7cb1eb]]
Former-commit-id: e26b14a84d
Former-commit-id: 709798659d
2012-11-08 11:19:51 -06:00
Lee Venable
72972d37b7
Merge "Issue #1298 Changes for non-blocking SaveDeleteComboDlg." into development
...
Former-commit-id: e791e73a30
[formerly be460c956e
[formerly ac3fa82789459f71be3ef8cea589606e10b6506f]]
Former-commit-id: be460c956e
Former-commit-id: 6c0bb76679
2012-11-08 11:11:15 -06:00
Nate Jensen
00dcf33480
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: 01072652dc
[formerly 96cb1ecc7f
[formerly f6eeb7431fe55886a7958beeec7f8f67de7bf74a]]
Former-commit-id: 96cb1ecc7f
Former-commit-id: e3487942ac
2012-11-08 11:08:48 -06:00
Lee Venable
fae33021a4
Merge "Issue #1298 Changes for non-blocking FuzzValueDialog." into development
...
Former-commit-id: c44f90f675
[formerly ff5083715b
[formerly e8ed91fc876a3f7e6dd67e058c3117cb616c96d2]]
Former-commit-id: ff5083715b
Former-commit-id: c4526c5ba0
2012-11-08 10:57:45 -06:00
Roger Ferrel
853a3e6593
Issue #1298 Changes for non-blocking SaveDeleteComboDlg.
...
Change-Id: Idd57cb86f9d91526de6e460fcd181a16f9d30e9f
Former-commit-id: eae8a68fd5
[formerly dfb55edb3d
[formerly 1305c8a16f0a7adcedcfb3c1b43c206fcd1dfcec]]
Former-commit-id: dfb55edb3d
Former-commit-id: 359ee69fa6
2012-11-08 10:54:41 -06:00
Nate Jensen
d701700a35
Merge "Issue #1302 Address peer review comments for 5-Data_Delivery/development merge" into development
...
Former-commit-id: 48dae3a5e9
[formerly 9038ff4e10
[formerly 92480a9a89c2768e7af9d8d1bcb9afe141d76f55]]
Former-commit-id: 9038ff4e10
Former-commit-id: ca5db2ec43
2012-11-08 10:34:56 -06:00
Max Schenkelberg
001d0710e7
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: c80dbffad8
[formerly 9aa4221fdf
[formerly 598e0268c95155536fb94798cc134d18b2566dbc]]
Former-commit-id: 9aa4221fdf
Former-commit-id: 5f0b4286ba
2012-11-08 10:08:38 -06:00
Dustin Johnson
acd4cf94d8
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: 1dbeb22893
[formerly 064ef82d1e
[formerly c04f7dca6f980ab7f3d77825312ddc34ba3b188d]]
Former-commit-id: 064ef82d1e
Former-commit-id: efd3d3735a
2012-11-08 09:57:16 -06:00
Roger Ferrel
c44dd45f87
Issue #1298 Changes for non-blocking FuzzValueDialog.
...
Change-Id: I7f6c6349b2576a9e692570f2fc118d939ee8efef
Former-commit-id: c3f451f799
[formerly 023252fb84
[formerly 74c370aa04efb9493d995f8f62a07dcd43702465]]
Former-commit-id: 023252fb84
Former-commit-id: 3ad0d7d516
2012-11-08 08:24:38 -06:00