Commit graph

1474 commits

Author SHA1 Message Date
Roger Ferrel
de21a3f2ef Issue #1298 Changes for non-blocking WrapLengthDialog.
Changes from reviewer's comments.
Fix merge conflict.

Change-Id: If31259188ff9fc1c84a02ca11399dd328dd669d4

Former-commit-id: 66606f88de [formerly 50327729d4b0b135cf959a9093dc90a32cf091e6]
Former-commit-id: e982c0f43a
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: 6445081aa9 [formerly 35e8deb27aecf5c805f0c007e70c45d8cc9988cb]
Former-commit-id: 76109f3bf7
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: 7d3f479031 [formerly 2242eefb25cd65edb4378b47b9cafbcab8510c53]
Former-commit-id: b5b472dee1
2012-11-12 15:15:49 -06:00
Ron Anderson
7bf1316e8c Issue #1325 Update GeoTools for WA4.7
Change-Id: Ic4a5b2ba0e6567d39c7faf19ed4a5d5b5445fb94

Former-commit-id: f709ab812a [formerly 5700f31e4620e1f7b819386aa8762927ec94c2d7]
Former-commit-id: 303994ff1b
2012-11-12 15:02:08 -06:00
Roger Ferrel
b11413b7f0 Issue #1298 Changes for non-blocking NewToolDialog.
Change-Id: I83bcbf9cf19785811d35b97d04442f404429fdb5

Former-commit-id: 9c9a068908 [formerly b24c130aa9c612822dda92a9820912b0cd7bc852]
Former-commit-id: f48474fc82
2012-11-12 14:22:02 -06:00
Lee Venable
ded0bfb92f Merge "Issue #1298 Changes for non-blocking NewTextProductDialog." into development
Former-commit-id: ab62adea95 [formerly bec0ccddba047ab9e9b6fa64bf839e9930dc675b]
Former-commit-id: 7db247e33a
2012-11-12 14:13:06 -06:00
Lee Venable
4f26da9a9a Merge "Issue #1298 Changes for non-blocking GridInfoDialog." into development
Former-commit-id: 879078484e [formerly a2a570c55e93b328735e2d2af887eadada92b6ea]
Former-commit-id: 62c42850e8
2012-11-12 14:09:44 -06:00
Roger Ferrel
73d9e78e92 Issue #1298 Changes for non-blocking NewTextProductDialog.
Change-Id: I0d04cdb18a07f2ea9cfa99e95708ff64a260d99d

Former-commit-id: 3676829e8f [formerly b2d932d2f4bc6430fba99ecfa08fd2adb885b3ac]
Former-commit-id: ee323d9c60
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: 1480e0abfc [formerly d7eab0e3c398b9ab90c9aa32e1d45920177620e4]
Former-commit-id: 0a2f7c9ed2
2012-11-12 12:53:26 -06:00
Roger Ferrel
195d876753 Issue #1298 Changes for non-blocking GridInfoDialog.
Change-Id: Ib0167b1cd63ca568250a75efa5cd0ffc8dc0885a

Former-commit-id: 30ef939e3c [formerly ea26ccdc4e0bccdeb1c61f8bd1566a83ed87d433]
Former-commit-id: 438731ca2e
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: d89ce26aeb [formerly ac9b159e639b51da8ae6b527907926d1fe8efdd0]
Former-commit-id: d489a7ef9f
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: adf0fec9a2 [formerly 7dee708d0da36dd9e9bdb096ed32f4cc4f067bdb]
Former-commit-id: c4f99aae63
2012-11-09 13:36:49 -06:00
Lee Venable
a267d9020b Merge "Issue #1298 Changes for non-blocking IssuanceSiteIdDlg." into development
Former-commit-id: 109076cb73 [formerly 5d3efae3ddbfafd2cbab419daa14a8259b2863e6]
Former-commit-id: dac9544eed
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: a92bfa9393 [formerly e08068e0f400abe1a6bddef1462f9f67d8dac2de]
Former-commit-id: cdd6a986e8
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: 595c421e47 [formerly 49b999039c470a5df095a202b5a67bf036a5b71c]
Former-commit-id: 2b6e98954e
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: 535c73051d [formerly 8db340a796df354059f3d4142db92dfd5fa527f5]
Former-commit-id: 693090cb36
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: db28cc26aa [formerly 1ad439769c601fe61365f015bc56da0442553be5]
Former-commit-id: 7077a82458
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: e6b0751f5c [formerly 99cf68672dcfbf23c89531279cb4fcd1254b0703]
Former-commit-id: fbed67a208
2012-11-08 14:34:55 -06:00
Richard Peter
ed90d0aa23 Merge "Issue #189 fix another Unknown Model" into development
Former-commit-id: 7d8dfb9c01 [formerly 1db05733b3a8c0d09dc4613d82dc74e55c0e110a]
Former-commit-id: 675b1666fd
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: 3450ca3cd3 [formerly 6fce68b90116d30cf090db64032322916276136b]
Former-commit-id: 2e9cdbe43e
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: ddaa681d8a [formerly 217a17fe79d9156f03597d72e51ab47325b00991]
Former-commit-id: 9784b563cf
2012-11-08 12:00:15 -06:00
Roger Ferrel
05825bd6f3 Issue #1298 Changes for non-blocking IssuanceSiteIdDlg.
Change-Id: I735b63606c3ca6f680f47bd61e55658b18c223ba

Former-commit-id: e26b14a84d [formerly a2a52b7754d831406e591763930f419def7cb1eb]
Former-commit-id: 89617dda68
2012-11-08 11:19:51 -06:00
Lee Venable
7b5f085643 Merge "Issue #1298 Changes for non-blocking SaveDeleteComboDlg." into development
Former-commit-id: be460c956e [formerly ac3fa82789459f71be3ef8cea589606e10b6506f]
Former-commit-id: e791e73a30
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: 96cb1ecc7f [formerly f6eeb7431fe55886a7958beeec7f8f67de7bf74a]
Former-commit-id: 01072652dc
2012-11-08 11:08:48 -06:00
Lee Venable
4a22ded443 Merge "Issue #1298 Changes for non-blocking FuzzValueDialog." into development
Former-commit-id: ff5083715b [formerly e8ed91fc876a3f7e6dd67e058c3117cb616c96d2]
Former-commit-id: c44f90f675
2012-11-08 10:57:45 -06:00
Roger Ferrel
24a2e79b28 Issue #1298 Changes for non-blocking SaveDeleteComboDlg.
Change-Id: Idd57cb86f9d91526de6e460fcd181a16f9d30e9f

Former-commit-id: dfb55edb3d [formerly 1305c8a16f0a7adcedcfb3c1b43c206fcd1dfcec]
Former-commit-id: eae8a68fd5
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: 9038ff4e10 [formerly 92480a9a89c2768e7af9d8d1bcb9afe141d76f55]
Former-commit-id: 48dae3a5e9
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: 1372c08cdc [formerly 8cc9210d25324ab4b5cbd5af3687b371101d282b]
Former-commit-id: 50f0c4c226
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: 9aa4221fdf [formerly 598e0268c95155536fb94798cc134d18b2566dbc]
Former-commit-id: c80dbffad8
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: 064ef82d1e [formerly c04f7dca6f980ab7f3d77825312ddc34ba3b188d]
Former-commit-id: 1dbeb22893
2012-11-08 09:57:16 -06:00
Roger Ferrel
de534f5b43 Issue #1298 Changes for non-blocking FuzzValueDialog.
Change-Id: I7f6c6349b2576a9e692570f2fc118d939ee8efef

Former-commit-id: 023252fb84 [formerly 74c370aa04efb9493d995f8f62a07dcd43702465]
Former-commit-id: c3f451f799
2012-11-08 08:24:38 -06:00
Roger Ferrel
e072532a77 Issue #1298 Chnages for non-blocking FindReplaceDlg.
Change-Id: I165d2eb45b2c768b7fca05c1f29d2460b25b18a7

Former-commit-id: 76f60240c5 [formerly 8b38c0ce8e1d5a4d6d7b345ec5e1ba975dde5900]
Former-commit-id: 199475f671
2012-11-08 07:57:56 -06:00
Bryan Kowal
4f36912786 Issue #1318 - fix first dat dependency issue.
Change-Id: If7e1668799a8523afebb0d4b7de76be6add5aa78

Former-commit-id: 079fdb33a0 [formerly 0087827da79fedd354a227bad4e02aa76cebc684]
Former-commit-id: 88a5451ce1
2012-11-08 07:27:39 -06:00
Nate Jensen
e3208d48a0 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: b32a9e839e [formerly 1902ab64c3ab11c41af906e5d78368689833561f]
Former-commit-id: 6b205399d4
2012-11-07 18:18:06 -06:00
Lee Venable
eacc1ca32c Merge "Issue #1298 Changes for non-blocking ClearZoneGroupsDialog." into development
Former-commit-id: 36c44db46b [formerly 9b634a3ba62f8c151e6adf85fac26b9174defc7e]
Former-commit-id: 8956718961
2012-11-07 17:38:21 -06:00
Lee Venable
7fdfbae106 Merge "Issue #1298 Changes for non-blocking CallToActionsDlg." into development
Former-commit-id: c2e8c3a50e [formerly 9efe5208b4383d844c32fb7d8207ce48a04d27d6]
Former-commit-id: 0dff0bf0b7
2012-11-07 17:38:03 -06:00
Brad Gonzales
b17893d7e0 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: 577df6943e [formerly 3afbeecdaecfb9ab7cea7e59db688639dbdad972]
Former-commit-id: 4c49c9116d
2012-11-07 15:36:44 -06:00
Roger Ferrel
35f3a3953c Issue #1298 Changes for non-blocking ClearZoneGroupsDialog.
Change-Id: I26b270ccea9cd31f2948180eff33df75fbd95ea0

Former-commit-id: a46535ee0c [formerly a0531fd85403c43226f5c7ed60d4c8ecdf1fc6d4]
Former-commit-id: 65d10be5d6
2012-11-07 15:07:47 -06:00
Roger Ferrel
d6560d7730 Issue #1298 Changes for non-blocking CallToActionsDlg.
Change-Id: I4a141c0a3d00cab36b792f4471aaf7482c2fa8dc

Former-commit-id: 190922a233 [formerly 7e987f7743a068b14e3eb7149f933cdf56e59f61]
Former-commit-id: 81de6cd45b
2012-11-07 14:35:38 -06:00
Steve Harris
214fcd3b63 12.12.1-1 baseline
Former-commit-id: e4bd20a515 [formerly 7699acd8cfc5cfa4e902ba98d5fdc2f7c474a535]
Former-commit-id: e1498006c7
2012-11-07 12:41:20 -06:00
Lee Venable
24dd8a1bc7 Merge "Issue #1298 Changes to make EmptyEditAreaWarningDialog and TimeRangeWarningDialog modal and blocking." into development
Former-commit-id: f368b93484 [formerly badb1ba2ed966e920a0dce9d1612dc07e4a21049]
Former-commit-id: 297d2bbc9c
2012-11-07 12:31:39 -06:00
Nate Jensen
3ab1b4ebb7 Merge "Issue #1273 product browser can now change order for grid" into development
Former-commit-id: 335939d5c1 [formerly f8354c7abdcc3188d1b20ca6804550b7203c7f7f]
Former-commit-id: edadd4d018
2012-11-07 12:26:54 -06:00
Roger Ferrel
c6749e3740 Issue #1298 Changes to make EmptyEditAreaWarningDialog and TimeRangeWarningDialog modal and blocking.
Change-Id: I6c5679269985eeb32d48afa44862632e00939a91

Former-commit-id: 82abbbf0b7 [formerly 8b12ea9f59036ccd47c55f90a86f7d6b589baa0e]
Former-commit-id: 974431a13a
2012-11-07 11:27:36 -06:00
Nate Jensen
b3ecd946ff Merge "Issue #1276 - v1.0 of multiple WA deployment support" into development
Former-commit-id: 2cf2e79f34 [formerly bab65855839a69e29d90582e021d13ae439242ce]
Former-commit-id: 433a79e689
2012-11-07 11:04:45 -06:00
Ben Steffensmeier
89efb7cf22 Issue #189 fix another Unknown Model
Former-commit-id: eaa7e420df [formerly 7dfb29c93784505c0b3aad37c631afe6f5ecf14f]
Former-commit-id: 64f59b94e4
2012-11-07 10:56:26 -06:00
Max Schenkelberg
747ab974e9 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.
Change-Id: If392126da6b7b27be20bbcb2423ab0e851307345

Former-commit-id: 2f90120248 [formerly a9c7374d162296c170f7c1b80e1fb2978b854cfd]
Former-commit-id: ca4177dd08
2012-11-07 10:44:42 -06:00
Richard Peter
9125602f3a Merge "Issue #1305 updated ProcessEvent with quantitative statistics. removed duplicate processStats.properties." into development
Former-commit-id: 51638344a8 [formerly 45cd4048eeda02b7eb8199e4514ad4ec9f3b7c03]
Former-commit-id: 67471e4453
2012-11-07 09:32:25 -06:00
Ben Steffensmeier
d57e097e3d Issue #189 add more comments to grib decoder.
Former-commit-id: 67db4ae4e4 [formerly fdc27da79f1da6c2bda0f3061096227d95745c46]
Former-commit-id: 237a7ea992
2012-11-06 18:30:03 -06:00
Bryan Kowal
2c14ea1bb7 Issue #1276 - v1.0 of multiple WA deployment support
Change-Id: I2468458fdf690f05841124300c166d217b81f6b5

Former-commit-id: 9263a0ac57 [formerly 2d35b221dca2248da68ae1d11f20b40dfb11052c]
Former-commit-id: 4fd43ee45c
2012-11-06 16:13:26 -06:00
Matt Nash
46f695b72d Issue #1273 product browser can now change order for grid
Change-Id: I2e41596925ebd16c733d12b742ff60c0745963a2

Former-commit-id: 9c9db6643a [formerly 9c7477357508794a00267991b825d169df5ae71a]
Former-commit-id: 284aecc6f9
2012-11-06 14:06:49 -06:00