Nate Jensen
ff16f82b18
Merge "Issue #1323 initial commit of interfaces of data access framework" into development
...
Former-commit-id: 68fbcd4c991c6962c27f5aa07b749f0706bfe668
2012-11-13 09:01:43 -06:00
Nate Jensen
e51d86ce3a
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: ef3483e14907e044a66cb6c5c677b6794bf9b03a
2012-11-12 17:16:07 -06:00
Lee Venable
d4276e6474
Merge "Issue #1298 Changes for non-blocking WrapLengthDialog. Changes from reviewer's comments. Fix merge conflict." into development
...
Former-commit-id: 46fbeba87efbee0b558fdd2c8f7e8c5abf004ac5
2012-11-12 16:58:17 -06:00
Max Schenkelberg
00822a4f39
Issue #1308 removed activemq references in spring file, made gfe common xml explicitly depend on time xml
...
Change-Id: I784b077d1ab2d929ddad1cb69fccc4a8c5e0729e
Former-commit-id: e696b81840b6c1f0a0df8a9f20b859f23bc5a3e7
2012-11-12 16:46:21 -06:00
Nate Jensen
bf72e29752
Issue #1323 initial commit of interfaces of data access framework
...
Change-Id: I301d94a85a4e86550cd409bc17ef94ea3fdd6e02
Former-commit-id: d6b63788ef2af3da474a0d3affcafdddec3690a5
2012-11-12 16:45:33 -06:00
Ben Steffensmeier
8d2a0d4b16
Issue #189 modify upgrade script to work with grid resources within bestRes.
...
Former-commit-id: 784af5833dd3f7514fee15451482cbe7645cef85
2012-11-12 16:37:28 -06:00
Roger Ferrel
e982c0f43a
Issue #1298 Changes for non-blocking WrapLengthDialog.
...
Changes from reviewer's comments.
Fix merge conflict.
Change-Id: If31259188ff9fc1c84a02ca11399dd328dd669d4
Former-commit-id: 50327729d4b0b135cf959a9093dc90a32cf091e6
2012-11-12 16:27:08 -06:00
Roger Ferrel
76109f3bf7
Issue #1298 Changes for non-blocking StoreTransmitDlg.
...
Changes from reviewer's coments.
Change-Id: I34e111ee2abc8ca154334e9017ea448bfa6fa31f
Former-commit-id: 35e8deb27aecf5c805f0c007e70c45d8cc9988cb
2012-11-12 15:26:03 -06:00
Ben Steffensmeier
b5b472dee1
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: 2242eefb25cd65edb4378b47b9cafbcab8510c53
2012-11-12 15:15:49 -06:00
Ron Anderson
303994ff1b
Issue #1325 Update GeoTools for WA4.7
...
Change-Id: Ic4a5b2ba0e6567d39c7faf19ed4a5d5b5445fb94
Former-commit-id: 5700f31e4620e1f7b819386aa8762927ec94c2d7
2012-11-12 15:02:08 -06:00
Roger Ferrel
f48474fc82
Issue #1298 Changes for non-blocking NewToolDialog.
...
Change-Id: I83bcbf9cf19785811d35b97d04442f404429fdb5
Former-commit-id: b24c130aa9c612822dda92a9820912b0cd7bc852
2012-11-12 14:22:02 -06:00
Lee Venable
7db247e33a
Merge "Issue #1298 Changes for non-blocking NewTextProductDialog." into development
...
Former-commit-id: bec0ccddba047ab9e9b6fa64bf839e9930dc675b
2012-11-12 14:13:06 -06:00
Lee Venable
62c42850e8
Merge "Issue #1298 Changes for non-blocking GridInfoDialog." into development
...
Former-commit-id: a2a570c55e93b328735e2d2af887eadada92b6ea
2012-11-12 14:09:44 -06:00
Roger Ferrel
ee323d9c60
Issue #1298 Changes for non-blocking NewTextProductDialog.
...
Change-Id: I0d04cdb18a07f2ea9cfa99e95708ff64a260d99d
Former-commit-id: b2d932d2f4bc6430fba99ecfa08fd2adb885b3ac
2012-11-12 13:20:05 -06:00
Matt Nash
0a2f7c9ed2
Issue #1324 make times display in 24 hour time
...
Change-Id: I6ae145d64cd4e24f15b049eebe23822198ee7ed2
Former-commit-id: d7eab0e3c398b9ab90c9aa32e1d45920177620e4
2012-11-12 12:53:26 -06:00
Roger Ferrel
438731ca2e
Issue #1298 Changes for non-blocking GridInfoDialog.
...
Change-Id: Ib0167b1cd63ca568250a75efa5cd0ffc8dc0885a
Former-commit-id: ea26ccdc4e0bccdeb1c61f8bd1566a83ed87d433
2012-11-12 12:00:03 -06:00
Roger Ferrel
d489a7ef9f
Issue #1298 CaveDialogUtility and changes for non-blocking ShuffleZoneGroupsDialog.
...
Changes from reviewer's comments.
Change-Id: I92ded0550563758c6f2ce4aef1dce08a42f9e079
Former-commit-id: ac9b159e639b51da8ae6b527907926d1fe8efdd0
2012-11-12 07:14:15 -06:00
Ben Steffensmeier
c4f99aae63
Issue #1108 fix the order of arguments for grib 1 parameter mappings
...
Former-commit-id: 7dee708d0da36dd9e9bdb096ed32f4cc4f067bdb
2012-11-09 13:36:49 -06:00
Lee Venable
dac9544eed
Merge "Issue #1298 Changes for non-blocking IssuanceSiteIdDlg." into development
...
Former-commit-id: 5d3efae3ddbfafd2cbab419daa14a8259b2863e6
2012-11-08 17:06:54 -06:00
Nate Jensen
cdd6a986e8
Merge "Issue #1302 Restore jdom.jar, delete net.jcip/.project" into development
...
Former-commit-id: e08068e0f400abe1a6bddef1462f9f67d8dac2de
2012-11-08 14:50:17 -06:00
Dustin Johnson
2b6e98954e
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: 49b999039c470a5df095a202b5a67bf036a5b71c
2012-11-08 14:47:17 -06:00
Ben Steffensmeier
693090cb36
Issue #1108 initial implementation of mappings
...
Change-Id: I05a3643e288778dbb97e80f881f2e71f6373067d
Conflicts:
edexOsgi/com.raytheon.uf.common.dataplugin.grid/META-INF/MANIFEST.MF
Former-commit-id: 8db340a796df354059f3d4142db92dfd5fa527f5
2012-11-08 14:45:36 -06:00
Richard Peter
7077a82458
Merge "Issue #189 add more comments to grib decoder." into development
...
Former-commit-id: 1ad439769c601fe61365f015bc56da0442553be5
2012-11-08 14:40:05 -06:00
Ben Steffensmeier
fbed67a208
Issue #189 merge ncep changes to unified grid.
...
Change-Id: I3dac0d3785f093c095f50799890744919edb1891
Former-commit-id: 99cf68672dcfbf23c89531279cb4fcd1254b0703
2012-11-08 14:34:55 -06:00
Richard Peter
675b1666fd
Merge "Issue #189 fix another Unknown Model" into development
...
Former-commit-id: 1db05733b3a8c0d09dc4613d82dc74e55c0e110a
2012-11-08 13:43:37 -06:00
Richard Peter
2e9cdbe43e
Merge "Issue #1317 - Update the stats config files Issue #1317 - Peer review comments." into development
...
Former-commit-id: 6fce68b90116d30cf090db64032322916276136b
2012-11-08 13:30:27 -06:00
Dustin Johnson
9784b563cf
Issue #1302 Fix spring/project errors pointed out by CAVE spring changes
...
Change-Id: I2b39071348bea5394c4f275051f19a2853f61f1c
Former-commit-id: 217a17fe79d9156f03597d72e51ab47325b00991
2012-11-08 12:00:15 -06:00
Roger Ferrel
89617dda68
Issue #1298 Changes for non-blocking IssuanceSiteIdDlg.
...
Change-Id: I735b63606c3ca6f680f47bd61e55658b18c223ba
Former-commit-id: a2a52b7754d831406e591763930f419def7cb1eb
2012-11-08 11:19:51 -06:00
Lee Venable
e791e73a30
Merge "Issue #1298 Changes for non-blocking SaveDeleteComboDlg." into development
...
Former-commit-id: ac3fa82789459f71be3ef8cea589606e10b6506f
2012-11-08 11:11:15 -06:00
Nate Jensen
01072652dc
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: f6eeb7431fe55886a7958beeec7f8f67de7bf74a
2012-11-08 11:08:48 -06:00
Lee Venable
c44f90f675
Merge "Issue #1298 Changes for non-blocking FuzzValueDialog." into development
...
Former-commit-id: e8ed91fc876a3f7e6dd67e058c3117cb616c96d2
2012-11-08 10:57:45 -06:00
Roger Ferrel
eae8a68fd5
Issue #1298 Changes for non-blocking SaveDeleteComboDlg.
...
Change-Id: Idd57cb86f9d91526de6e460fcd181a16f9d30e9f
Former-commit-id: 1305c8a16f0a7adcedcfb3c1b43c206fcd1dfcec
2012-11-08 10:54:41 -06:00
Nate Jensen
48dae3a5e9
Merge "Issue #1302 Address peer review comments for 5-Data_Delivery/development merge" into development
...
Former-commit-id: 92480a9a89c2768e7af9d8d1bcb9afe141d76f55
2012-11-08 10:34:56 -06:00
Mike Duff
50f0c4c226
Issue #1317 - Update the stats config files
...
Issue #1317 - Peer review comments.
Change-Id: Ic4fa6574a0d71fbdf246483f0ea2553d4d058c9f
Former-commit-id: 8cc9210d25324ab4b5cbd5af3687b371101d282b
2012-11-08 10:15:41 -06:00
Max Schenkelberg
c80dbffad8
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: 598e0268c95155536fb94798cc134d18b2566dbc
2012-11-08 10:08:38 -06:00
Dustin Johnson
1dbeb22893
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: c04f7dca6f980ab7f3d77825312ddc34ba3b188d
2012-11-08 09:57:16 -06:00
Roger Ferrel
c3f451f799
Issue #1298 Changes for non-blocking FuzzValueDialog.
...
Change-Id: I7f6c6349b2576a9e692570f2fc118d939ee8efef
Former-commit-id: 74c370aa04efb9493d995f8f62a07dcd43702465
2012-11-08 08:24:38 -06:00
Roger Ferrel
199475f671
Issue #1298 Chnages for non-blocking FindReplaceDlg.
...
Change-Id: I165d2eb45b2c768b7fca05c1f29d2460b25b18a7
Former-commit-id: 8b38c0ce8e1d5a4d6d7b345ec5e1ba975dde5900
2012-11-08 07:57:56 -06:00
Bryan Kowal
88a5451ce1
Issue #1318 - fix first dat dependency issue.
...
Change-Id: If7e1668799a8523afebb0d4b7de76be6add5aa78
Former-commit-id: 0087827da79fedd354a227bad4e02aa76cebc684
2012-11-08 07:27:39 -06:00
Nate Jensen
6b205399d4
Merge "Issue #1308 Wrote custom OSGI spring handler that could support multiple XML contexts per bundle, merge dependency contexts and scan res spring folder like EDEX. Two changes were required, one for menu generation registration and one for apache beanutils converter registration." into development
...
Former-commit-id: 1902ab64c3ab11c41af906e5d78368689833561f
2012-11-07 18:18:06 -06:00
Lee Venable
8956718961
Merge "Issue #1298 Changes for non-blocking ClearZoneGroupsDialog." into development
...
Former-commit-id: 9b634a3ba62f8c151e6adf85fac26b9174defc7e
2012-11-07 17:38:21 -06:00
Lee Venable
0dff0bf0b7
Merge "Issue #1298 Changes for non-blocking CallToActionsDlg." into development
...
Former-commit-id: 9efe5208b4383d844c32fb7d8207ce48a04d27d6
2012-11-07 17:38:03 -06:00
Brad Gonzales
4c49c9116d
Issue #1309 added units to Aggregate.java and AggregateRecord.java
...
Amend:
Changed ProcessEvent.processingTime and ProcessEvent.processingLatency to longs.
Removed Unit from AggregateRecord.java.
Change-Id: If4f6fccb65c584055d68129874a398d6391155e7
Former-commit-id: 3afbeecdaecfb9ab7cea7e59db688639dbdad972
2012-11-07 15:36:44 -06:00
Roger Ferrel
65d10be5d6
Issue #1298 Changes for non-blocking ClearZoneGroupsDialog.
...
Change-Id: I26b270ccea9cd31f2948180eff33df75fbd95ea0
Former-commit-id: a0531fd85403c43226f5c7ed60d4c8ecdf1fc6d4
2012-11-07 15:07:47 -06:00
Roger Ferrel
81de6cd45b
Issue #1298 Changes for non-blocking CallToActionsDlg.
...
Change-Id: I4a141c0a3d00cab36b792f4471aaf7482c2fa8dc
Former-commit-id: 7e987f7743a068b14e3eb7149f933cdf56e59f61
2012-11-07 14:35:38 -06:00
Steve Harris
e1498006c7
12.12.1-1 baseline
...
Former-commit-id: 7699acd8cfc5cfa4e902ba98d5fdc2f7c474a535
2012-11-07 12:41:20 -06:00
Lee Venable
297d2bbc9c
Merge "Issue #1298 Changes to make EmptyEditAreaWarningDialog and TimeRangeWarningDialog modal and blocking." into development
...
Former-commit-id: badb1ba2ed966e920a0dce9d1612dc07e4a21049
2012-11-07 12:31:39 -06:00
Nate Jensen
edadd4d018
Merge "Issue #1273 product browser can now change order for grid" into development
...
Former-commit-id: f8354c7abdcc3188d1b20ca6804550b7203c7f7f
2012-11-07 12:26:54 -06:00
Roger Ferrel
974431a13a
Issue #1298 Changes to make EmptyEditAreaWarningDialog and TimeRangeWarningDialog modal and blocking.
...
Change-Id: I6c5679269985eeb32d48afa44862632e00939a91
Former-commit-id: 8b12ea9f59036ccd47c55f90a86f7d6b589baa0e
2012-11-07 11:27:36 -06:00
Nate Jensen
433a79e689
Merge "Issue #1276 - v1.0 of multiple WA deployment support" into development
...
Former-commit-id: bab65855839a69e29d90582e021d13ae439242ce
2012-11-07 11:04:45 -06:00
