Nate Jensen
|
826c997e0b
|
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: 35ea1b7773 [formerly 254e88a70c] [formerly 8a1f3a10a4] [formerly e51d86ce3a [formerly 8a1f3a10a4 [formerly ef3483e14907e044a66cb6c5c677b6794bf9b03a]]]
Former-commit-id: e51d86ce3a
Former-commit-id: 41eca00d43f0977ae5f16683be5bae42fb520906 [formerly cf8fd9f731]
Former-commit-id: 14b61ef0f8
|
2012-11-12 17:16:07 -06:00 |
|
Lee Venable
|
70142d8fa5
|
Merge "Issue #1298 Changes for non-blocking WrapLengthDialog. Changes from reviewer's comments. Fix merge conflict." into development
Former-commit-id: ca88126428 [formerly e62c2fb732] [formerly a576274c3c] [formerly d4276e6474 [formerly a576274c3c [formerly 46fbeba87efbee0b558fdd2c8f7e8c5abf004ac5]]]
Former-commit-id: d4276e6474
Former-commit-id: dfb666f53c8640e84e9243b56e5e8a82310819b7 [formerly fb4b76b003]
Former-commit-id: eaf7e7c724
|
2012-11-12 16:58:17 -06:00 |
|
Max Schenkelberg
|
25f5a9b1aa
|
Issue #1308 removed activemq references in spring file, made gfe common xml explicitly depend on time xml
Change-Id: I784b077d1ab2d929ddad1cb69fccc4a8c5e0729e
Former-commit-id: 1ed5f10230 [formerly 30c1802398] [formerly d1099addc6] [formerly 00822a4f39 [formerly d1099addc6 [formerly e696b81840b6c1f0a0df8a9f20b859f23bc5a3e7]]]
Former-commit-id: 00822a4f39
Former-commit-id: 5eaaf2b42110ba677fab87f22b62f6cd269072be [formerly c4e5092f94]
Former-commit-id: 4408af827f
|
2012-11-12 16:46:21 -06:00 |
|
Roger Ferrel
|
4f08c126b6
|
Issue #1298 Changes for non-blocking WrapLengthDialog.
Changes from reviewer's comments.
Fix merge conflict.
Change-Id: If31259188ff9fc1c84a02ca11399dd328dd669d4
Former-commit-id: 5f0a583d86 [formerly ab77dfa758] [formerly 66606f88de] [formerly e982c0f43a [formerly 66606f88de [formerly 50327729d4b0b135cf959a9093dc90a32cf091e6]]]
Former-commit-id: e982c0f43a
Former-commit-id: bad97768d4ebf7b70752c8307f99e51df3dd9fe0 [formerly de21a3f2ef]
Former-commit-id: 3b07bb1ae6
|
2012-11-12 16:27:08 -06:00 |
|
Roger Ferrel
|
4a8b71a632
|
Issue #1298 Changes for non-blocking StoreTransmitDlg.
Changes from reviewer's coments.
Change-Id: I34e111ee2abc8ca154334e9017ea448bfa6fa31f
Former-commit-id: e6030885a1 [formerly 13c0fb3f3d] [formerly 6445081aa9] [formerly 76109f3bf7 [formerly 6445081aa9 [formerly 35e8deb27aecf5c805f0c007e70c45d8cc9988cb]]]
Former-commit-id: 76109f3bf7
Former-commit-id: d744cdfac526c0ce2d581c461d6fbaafbdfaa2c9 [formerly e7cd99ff0d]
Former-commit-id: 01899535e3
|
2012-11-12 15:26:03 -06:00 |
|
Ben Steffensmeier
|
58ba7be711
|
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: dfe697a59c [formerly 65441372df] [formerly 7d3f479031] [formerly b5b472dee1 [formerly 7d3f479031 [formerly 2242eefb25cd65edb4378b47b9cafbcab8510c53]]]
Former-commit-id: b5b472dee1
Former-commit-id: 4bb07970a3378bedd6d8d48f328087592e3c8036 [formerly 220f41ec4c]
Former-commit-id: 810e0abd77
|
2012-11-12 15:15:49 -06:00 |
|
Roger Ferrel
|
0ff9252024
|
Issue #1298 Changes for non-blocking NewToolDialog.
Change-Id: I83bcbf9cf19785811d35b97d04442f404429fdb5
Former-commit-id: 499100c5b6 [formerly 6ec9c1fac4] [formerly 9c9a068908] [formerly f48474fc82 [formerly 9c9a068908 [formerly b24c130aa9c612822dda92a9820912b0cd7bc852]]]
Former-commit-id: f48474fc82
Former-commit-id: bd145bd7ef91d95a7d99e1c2c708c0288c079123 [formerly b11413b7f0]
Former-commit-id: 398f71471d
|
2012-11-12 14:22:02 -06:00 |
|
Lee Venable
|
9715b63d07
|
Merge "Issue #1298 Changes for non-blocking NewTextProductDialog." into development
Former-commit-id: ca20167d7e [formerly 72aedbcece] [formerly ab62adea95] [formerly 7db247e33a [formerly ab62adea95 [formerly bec0ccddba047ab9e9b6fa64bf839e9930dc675b]]]
Former-commit-id: 7db247e33a
Former-commit-id: f8b76144c6d9b8fab6faf09c7b74e630b40f12eb [formerly ded0bfb92f]
Former-commit-id: 6ab3480255
|
2012-11-12 14:13:06 -06:00 |
|
Lee Venable
|
65e6121178
|
Merge "Issue #1298 Changes for non-blocking GridInfoDialog." into development
Former-commit-id: 6359f32b18 [formerly d9022d16a6] [formerly 879078484e] [formerly 62c42850e8 [formerly 879078484e [formerly a2a570c55e93b328735e2d2af887eadada92b6ea]]]
Former-commit-id: 62c42850e8
Former-commit-id: 1f8212cdab972e8581982c2fcbe3c6e04bac34f3 [formerly 4f26da9a9a]
Former-commit-id: 2b1be166a2
|
2012-11-12 14:09:44 -06:00 |
|
Roger Ferrel
|
fe965f064e
|
Issue #1298 Changes for non-blocking NewTextProductDialog.
Change-Id: I0d04cdb18a07f2ea9cfa99e95708ff64a260d99d
Former-commit-id: 5ea786daaf [formerly ce6d6e277e] [formerly 3676829e8f] [formerly ee323d9c60 [formerly 3676829e8f [formerly b2d932d2f4bc6430fba99ecfa08fd2adb885b3ac]]]
Former-commit-id: ee323d9c60
Former-commit-id: 43f3c54726102723a37b2f0b8b134e1f63f433fd [formerly 73d9e78e92]
Former-commit-id: 88968c54e5
|
2012-11-12 13:20:05 -06:00 |
|
Matt Nash
|
ffa1d74e12
|
Issue #1324 make times display in 24 hour time
Change-Id: I6ae145d64cd4e24f15b049eebe23822198ee7ed2
Former-commit-id: 0894e7800d [formerly 7fa21f5041] [formerly 1480e0abfc] [formerly 0a2f7c9ed2 [formerly 1480e0abfc [formerly d7eab0e3c398b9ab90c9aa32e1d45920177620e4]]]
Former-commit-id: 0a2f7c9ed2
Former-commit-id: f7c0905a51bc5c78ca29098eb0992a3aaccdc911 [formerly d728ffadd0]
Former-commit-id: dcda4b3fa4
|
2012-11-12 12:53:26 -06:00 |
|
Roger Ferrel
|
5e77bcf8bd
|
Issue #1298 Changes for non-blocking GridInfoDialog.
Change-Id: Ib0167b1cd63ca568250a75efa5cd0ffc8dc0885a
Former-commit-id: dde8ce56c0 [formerly 1f509c5a54] [formerly 30ef939e3c] [formerly 438731ca2e [formerly 30ef939e3c [formerly ea26ccdc4e0bccdeb1c61f8bd1566a83ed87d433]]]
Former-commit-id: 438731ca2e
Former-commit-id: 3a0ae83fcc9d5bbb65ad3b13ffe372cc97db6e13 [formerly 195d876753]
Former-commit-id: 8490814573
|
2012-11-12 12:00:03 -06:00 |
|
Roger Ferrel
|
2916b0a3b8
|
Issue #1298 CaveDialogUtility and changes for non-blocking ShuffleZoneGroupsDialog.
Changes from reviewer's comments.
Change-Id: I92ded0550563758c6f2ce4aef1dce08a42f9e079
Former-commit-id: 259949bc5f [formerly b60cbeda7a] [formerly d89ce26aeb] [formerly d489a7ef9f [formerly d89ce26aeb [formerly ac9b159e639b51da8ae6b527907926d1fe8efdd0]]]
Former-commit-id: d489a7ef9f
Former-commit-id: 8767fadd2a0a8ed1a13ec17c8ffe7adca41ac200 [formerly e01a4ae243]
Former-commit-id: ecba7301a1
|
2012-11-12 07:14:15 -06:00 |
|
Lee Venable
|
449d8fe737
|
Merge "Issue #1298 Changes for non-blocking IssuanceSiteIdDlg." into development
Former-commit-id: db5861e92a [formerly 125ac804a7] [formerly 109076cb73] [formerly dac9544eed [formerly 109076cb73 [formerly 5d3efae3ddbfafd2cbab419daa14a8259b2863e6]]]
Former-commit-id: dac9544eed
Former-commit-id: 76216f132fefed0fdc4bd9c84d50f9a3ed79b5c9 [formerly a267d9020b]
Former-commit-id: ff21b8d604
|
2012-11-08 17:06:54 -06:00 |
|
Nate Jensen
|
974598ee1c
|
Merge "Issue #1302 Restore jdom.jar, delete net.jcip/.project" into development
Former-commit-id: 78d49992a3 [formerly 5e718ca85b] [formerly a92bfa9393] [formerly cdd6a986e8 [formerly a92bfa9393 [formerly e08068e0f400abe1a6bddef1462f9f67d8dac2de]]]
Former-commit-id: cdd6a986e8
Former-commit-id: 67d145eb7b7c1dca029604c66311e8cc639f5e68 [formerly 5e3c076506]
Former-commit-id: 38511f0e95
|
2012-11-08 14:50:17 -06:00 |
|
Dustin Johnson
|
272761ae41
|
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: 19c2e301b8 [formerly db4d728eb7] [formerly 595c421e47] [formerly 2b6e98954e [formerly 595c421e47 [formerly 49b999039c470a5df095a202b5a67bf036a5b71c]]]
Former-commit-id: 2b6e98954e
Former-commit-id: 3fe0762a484ee2e5830878352f009474c977d9f7 [formerly 0806be04dd]
Former-commit-id: eac5bc8197
|
2012-11-08 14:47:17 -06:00 |
|
Ben Steffensmeier
|
0f58b01a58
|
Issue #1108 initial implementation of mappings
Change-Id: I05a3643e288778dbb97e80f881f2e71f6373067d
Conflicts:
edexOsgi/com.raytheon.uf.common.dataplugin.grid/META-INF/MANIFEST.MF
Former-commit-id: a0f6c320cb [formerly 20e618eb4f] [formerly 535c73051d] [formerly 693090cb36 [formerly 535c73051d [formerly 8db340a796df354059f3d4142db92dfd5fa527f5]]]
Former-commit-id: 693090cb36
Former-commit-id: 0198876d17ad6ff76ff77ca6660a268c711628d2 [formerly 884c82c4fe]
Former-commit-id: 7c93db759c
|
2012-11-08 14:45:36 -06:00 |
|
Roger Ferrel
|
ddeecc6e98
|
Issue #1298 Changes for non-blocking IssuanceSiteIdDlg.
Change-Id: I735b63606c3ca6f680f47bd61e55658b18c223ba
Former-commit-id: fb742c6dbf [formerly 709798659d] [formerly e26b14a84d] [formerly 89617dda68 [formerly e26b14a84d [formerly a2a52b7754d831406e591763930f419def7cb1eb]]]
Former-commit-id: 89617dda68
Former-commit-id: 905e3bb90604a5bd868eee7dd06299aedc0f819f [formerly 05825bd6f3]
Former-commit-id: 553344fb3b
|
2012-11-08 11:19:51 -06:00 |
|
Lee Venable
|
40c27a2403
|
Merge "Issue #1298 Changes for non-blocking SaveDeleteComboDlg." into development
Former-commit-id: 72972d37b7 [formerly 6c0bb76679] [formerly edb9de6c440b9a5c36c7215f719f9a7570523b1e [formerly be460c956e]] [formerly e791e73a30 [formerly be460c956e [formerly ac3fa82789459f71be3ef8cea589606e10b6506f]]]
Former-commit-id: e791e73a30
Former-commit-id: 7998fddf765b511c29eef50d418b778e580e742f [formerly 7b5f085643]
Former-commit-id: 1e61d4bd08
|
2012-11-08 11:11:15 -06:00 |
|
Nate Jensen
|
650f477e09
|
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: 00dcf33480 [formerly e3487942ac] [formerly 96cb1ecc7f] [formerly 01072652dc [formerly 96cb1ecc7f [formerly f6eeb7431fe55886a7958beeec7f8f67de7bf74a]]]
Former-commit-id: 01072652dc
Former-commit-id: aaf573b212c0441c984a07ad356d4eb57494bd79 [formerly 375c864d28]
Former-commit-id: bdbad943ef
|
2012-11-08 11:08:48 -06:00 |
|
Lee Venable
|
b1b2512819
|
Merge "Issue #1298 Changes for non-blocking FuzzValueDialog." into development
Former-commit-id: fae33021a4 [formerly c4526c5ba0] [formerly ff5083715b] [formerly c44f90f675 [formerly ff5083715b [formerly e8ed91fc876a3f7e6dd67e058c3117cb616c96d2]]]
Former-commit-id: c44f90f675
Former-commit-id: 0f61b7daa2e57b5bf03170e39269f6b4fa2377a4 [formerly 4a22ded443]
Former-commit-id: 9523ad6085
|
2012-11-08 10:57:45 -06:00 |
|
Roger Ferrel
|
3851d5161c
|
Issue #1298 Changes for non-blocking SaveDeleteComboDlg.
Change-Id: Idd57cb86f9d91526de6e460fcd181a16f9d30e9f
Former-commit-id: 853a3e6593 [formerly 359ee69fa6] [formerly dfb55edb3d] [formerly eae8a68fd5 [formerly dfb55edb3d [formerly 1305c8a16f0a7adcedcfb3c1b43c206fcd1dfcec]]]
Former-commit-id: eae8a68fd5
Former-commit-id: 0211367abde3087618fb2170a6c9b3664254ca94 [formerly 24a2e79b28]
Former-commit-id: e7aa940f52
|
2012-11-08 10:54:41 -06:00 |
|
Nate Jensen
|
3c7d135bc5
|
Merge "Issue #1302 Address peer review comments for 5-Data_Delivery/development merge" into development
Former-commit-id: d701700a35 [formerly ca5db2ec43] [formerly 9038ff4e10] [formerly 48dae3a5e9 [formerly 9038ff4e10 [formerly 92480a9a89c2768e7af9d8d1bcb9afe141d76f55]]]
Former-commit-id: 48dae3a5e9
Former-commit-id: a70bb91d05156498a7bfb00ef3a008ed19da7cae [formerly 7da4882cfb]
Former-commit-id: fca1922f7b
|
2012-11-08 10:34:56 -06:00 |
|
Max Schenkelberg
|
577a6e3631
|
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: 001d0710e7 [formerly 5f0b4286ba] [formerly 9aa4221fdf] [formerly c80dbffad8 [formerly 9aa4221fdf [formerly 598e0268c95155536fb94798cc134d18b2566dbc]]]
Former-commit-id: c80dbffad8
Former-commit-id: 07b9c0188335e4ff522ce4e82831fe234a9fdd70 [formerly 0a410412db]
Former-commit-id: c219fcb112
|
2012-11-08 10:08:38 -06:00 |
|
Dustin Johnson
|
cd5faf58bf
|
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: acd4cf94d8 [formerly efd3d3735a] [formerly 064ef82d1e] [formerly 1dbeb22893 [formerly 064ef82d1e [formerly c04f7dca6f980ab7f3d77825312ddc34ba3b188d]]]
Former-commit-id: 1dbeb22893
Former-commit-id: 6b7958c5dca22552e39ad9f77a0bdd977908f9dc [formerly 4222b24d09]
Former-commit-id: 2d1e886cf3
|
2012-11-08 09:57:16 -06:00 |
|
Roger Ferrel
|
7bd36bb2c7
|
Issue #1298 Changes for non-blocking FuzzValueDialog.
Change-Id: I7f6c6349b2576a9e692570f2fc118d939ee8efef
Former-commit-id: c44dd45f87 [formerly 3ad0d7d516] [formerly 023252fb84] [formerly c3f451f799 [formerly 023252fb84 [formerly 74c370aa04efb9493d995f8f62a07dcd43702465]]]
Former-commit-id: c3f451f799
Former-commit-id: 9bc5add0937b47a44fcc72985df13d60bf528a0c [formerly de534f5b43]
Former-commit-id: 9a1283fb1e
|
2012-11-08 08:24:38 -06:00 |
|
Roger Ferrel
|
66a19a85b3
|
Issue #1298 Chnages for non-blocking FindReplaceDlg.
Change-Id: I165d2eb45b2c768b7fca05c1f29d2460b25b18a7
Former-commit-id: 4aafcb8311 [formerly 94a4440625] [formerly 76f60240c5] [formerly 199475f671 [formerly 76f60240c5 [formerly 8b38c0ce8e1d5a4d6d7b345ec5e1ba975dde5900]]]
Former-commit-id: 199475f671
Former-commit-id: 40d79f26c493b7dacab3299f8b6b97602b46386e [formerly e072532a77]
Former-commit-id: c1d0b744b2
|
2012-11-08 07:57:56 -06:00 |
|
Nate Jensen
|
19b0afefc5
|
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: b0bb920fde [formerly 20a63254e2] [formerly b32a9e839e] [formerly 6b205399d4 [formerly b32a9e839e [formerly 1902ab64c3ab11c41af906e5d78368689833561f]]]
Former-commit-id: 6b205399d4
Former-commit-id: 04ac668436ffe2114a4379e6e35db8978db0e543 [formerly e3208d48a0]
Former-commit-id: 2fe69a5871
|
2012-11-07 18:18:06 -06:00 |
|
Lee Venable
|
ddd96f4552
|
Merge "Issue #1298 Changes for non-blocking ClearZoneGroupsDialog." into development
Former-commit-id: dbeb600e58 [formerly c8955b5425] [formerly 36c44db46b] [formerly 8956718961 [formerly 36c44db46b [formerly 9b634a3ba62f8c151e6adf85fac26b9174defc7e]]]
Former-commit-id: 8956718961
Former-commit-id: b323e3bf5eafbd091abc62b049b1e38dec9c47bc [formerly eacc1ca32c]
Former-commit-id: 15842d7d22
|
2012-11-07 17:38:21 -06:00 |
|
Roger Ferrel
|
b42d50faed
|
Issue #1298 Changes for non-blocking ClearZoneGroupsDialog.
Change-Id: I26b270ccea9cd31f2948180eff33df75fbd95ea0
Former-commit-id: d6d99f5e30 [formerly ee038e811c] [formerly a46535ee0c] [formerly 65d10be5d6 [formerly a46535ee0c [formerly a0531fd85403c43226f5c7ed60d4c8ecdf1fc6d4]]]
Former-commit-id: 65d10be5d6
Former-commit-id: 2a9ce01552cb82c75c8d83ada1b390cf88194546 [formerly 35f3a3953c]
Former-commit-id: 42f453ffca
|
2012-11-07 15:07:47 -06:00 |
|
Roger Ferrel
|
1358368fb1
|
Issue #1298 Changes for non-blocking CallToActionsDlg.
Change-Id: I4a141c0a3d00cab36b792f4471aaf7482c2fa8dc
Former-commit-id: dd9e28d58a [formerly 4b0c701d69] [formerly 190922a233] [formerly 81de6cd45b [formerly 190922a233 [formerly 7e987f7743a068b14e3eb7149f933cdf56e59f61]]]
Former-commit-id: 81de6cd45b
Former-commit-id: a7fc02e7168c2f8831b77da9c66722dbbf5aaca1 [formerly d6560d7730]
Former-commit-id: d6e00b6c35
|
2012-11-07 14:35:38 -06:00 |
|
Steve Harris
|
3cb24c1d06
|
12.12.1-1 baseline
Former-commit-id: 8278cac143 [formerly c2839cc86d] [formerly e4bd20a515] [formerly e1498006c7 [formerly e4bd20a515 [formerly 7699acd8cfc5cfa4e902ba98d5fdc2f7c474a535]]]
Former-commit-id: e1498006c7
Former-commit-id: cc5d9cd9866ef60af47606a02772dd35474145e9 [formerly 214fcd3b63]
Former-commit-id: 4f243de928
|
2012-11-07 12:41:20 -06:00 |
|
Lee Venable
|
f40b79b1d5
|
Merge "Issue #1298 Changes to make EmptyEditAreaWarningDialog and TimeRangeWarningDialog modal and blocking." into development
Former-commit-id: f4a62abbda [formerly 074543d75e] [formerly f368b93484] [formerly 297d2bbc9c [formerly f368b93484 [formerly badb1ba2ed966e920a0dce9d1612dc07e4a21049]]]
Former-commit-id: 297d2bbc9c
Former-commit-id: ee47c755e7e6236016ccc5e7a9e51cbd59b2ee9a [formerly 24dd8a1bc7]
Former-commit-id: 412c29f116
|
2012-11-07 12:31:39 -06:00 |
|
Roger Ferrel
|
865211fd4f
|
Issue #1298 Changes to make EmptyEditAreaWarningDialog and TimeRangeWarningDialog modal and blocking.
Change-Id: I6c5679269985eeb32d48afa44862632e00939a91
Former-commit-id: 977d7c5ead [formerly 8bf89ad495] [formerly 82abbbf0b7] [formerly 974431a13a [formerly 82abbbf0b7 [formerly 8b12ea9f59036ccd47c55f90a86f7d6b589baa0e]]]
Former-commit-id: 974431a13a
Former-commit-id: 939bce1bf4a85e111dabaeba878bf42efeee1300 [formerly c6749e3740]
Former-commit-id: 35b0dc2cef
|
2012-11-07 11:27:36 -06:00 |
|
Max Schenkelberg
|
f9e6347863
|
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: 94e64c9b0d [formerly f069f34a96] [formerly 11111d3a29cb179e3e47566262a8a2be05fd32e6 [formerly 2f90120248]] [formerly ca4177dd08 [formerly 2f90120248 [formerly a9c7374d162296c170f7c1b80e1fb2978b854cfd]]]
Former-commit-id: ca4177dd08
Former-commit-id: 42f60026840ae4bf86371ebfd3e40ca565028c4b [formerly 747ab974e9]
Former-commit-id: 5a5bd522a1
|
2012-11-07 10:44:42 -06:00 |
|
Matt Nash
|
78efa9ad73
|
Issue #1273 product browser can now change order for grid
Change-Id: I2e41596925ebd16c733d12b742ff60c0745963a2
Former-commit-id: 5b17b0f296 [formerly 76cdfc09bb] [formerly 9c9db6643a] [formerly 284aecc6f9 [formerly 9c9db6643a [formerly 9c7477357508794a00267991b825d169df5ae71a]]]
Former-commit-id: 284aecc6f9
Former-commit-id: e017c1c0cdba9bc46d18368aafbd7c3e53f1cc50 [formerly 46f695b72d]
Former-commit-id: e87cb88d60
|
2012-11-06 14:06:49 -06:00 |
|
Roger Ferrel
|
9ea3aa1924
|
Issue #1304 Clear text field when point removed.
Change-Id: Ia2f56010e7d620023cbf01656c7be30b0dd742cc
Former-commit-id: 48141292fb [formerly a6b093c2ce] [formerly 921134848b] [formerly 1f71a3bed7 [formerly 921134848b [formerly c927e2eb8a516cf555c0c83a86c51ad209f2a0ab]]]
Former-commit-id: 1f71a3bed7
Former-commit-id: 24f35d1ccf7c15130335c1996c047c967a23fca2 [formerly a996839d2c]
Former-commit-id: 5c241a7e5d
|
2012-11-05 12:56:07 -06:00 |
|
Roger Ferrel
|
1fa3cc48d1
|
Issue #1304 Added Point change listners to ChooseByIdDialog and RangeRingDialog.
Change-Id: Id2933ae7ccfb6ed260da619a822c2b5b706f64d3
Former-commit-id: d6916f4ec3 [formerly 120764c5ef] [formerly 986766487f] [formerly 3045291a29 [formerly 986766487f [formerly d296028a9a0add9a81836030ff7b65be8883956b]]]
Former-commit-id: 3045291a29
Former-commit-id: 7b06cfc12036025a71849a4056bc337506736aa7 [formerly 2b18983017]
Former-commit-id: 9fada57123
|
2012-11-05 11:22:28 -06:00 |
|
Dustin Johnson
|
fe8a2a3b09
|
Issue #1302 Merge branch '5-Data_Delivery' into development
Conflicts:
edexOsgi/build.edex/deploy-common/external-rules.xml
edexOsgi/build.edex/deploy-common/plugin-methods.xml
edexOsgi/com.raytheon.edex.plugin.text/src/com/raytheon/edex/plugin/text/dao/TextDao.java
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java
edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/Executor.java
edexOsgi/build.edex/build.xml
edexOsgi/build.edex/esb/conf/modes.xml
edexOsgi/com.raytheon.edex.feature.uframe/feature.xml
edexOsgi/com.raytheon.edex.plugin.grib/res/spring/grib-ingest.xml
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/Grib1Decoder.java
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/GribDecoder.java
edexOsgi/com.raytheon.uf.common.gridcoverage/src/com/raytheon/uf/common/gridcoverage/GridCoverage.java
Change-Id: I32226e8c316eb393d6f372eaa53b8811d0a954a0
Former-commit-id: 7d0e4a6e75 [formerly 8e69107b5a] [formerly 98d7beae50] [formerly 31d7d09c10 [formerly 98d7beae50 [formerly 89583d97c8823818f87dc1a234078d85ba7bea4a]]]
Former-commit-id: 31d7d09c10
Former-commit-id: 465044dd2793505eba62cb46e6b3a8ac48623765 [formerly bcf575966b]
Former-commit-id: e7a0f96a9a
|
2012-11-01 13:36:06 -05:00 |
|
Ben Steffensmeier
|
c5d8e44c20
|
Issue #189 a few fixes to grid resources for FFG Mosaic
Former-commit-id: ca1037e96b [formerly dc0e75eb29] [formerly cc62739d8407fea9c543fbb5cfcec028438383a6 [formerly 64d4a1add7]] [formerly 4b121fd7b3 [formerly 64d4a1add7 [formerly f8420e7052145c856b12310776e6acd7362dc9cb]]]
Former-commit-id: 4b121fd7b3
Former-commit-id: 54d511032e7eefb7a28d1ac2e78f040108f1d118 [formerly bde106e70d]
Former-commit-id: ec68d0445e
|
2012-10-31 11:39:32 -05:00 |
|
Roger Ferrel
|
a4f3368d3a
|
Issue #1298 Changes for non-blocking MaskDialog, WeatherDialog and DiscreteDialog.
Change-Id: If2ddd15d3abb900cd309f790445bee08ff4e69cc
Former-commit-id: ac49925d87 [formerly 2b80c2c2b5] [formerly d92be142ad] [formerly 3c64544822 [formerly d92be142ad [formerly 17f789e76f77467935002d3b466b764ddb0b81f4]]]
Former-commit-id: 3c64544822
Former-commit-id: 71cceecb3f3563faa80a12b45a9976ddf14bf966 [formerly 1e0241e509]
Former-commit-id: b289472e49
|
2012-10-30 17:09:52 -05:00 |
|
Lee Venable
|
5226755f8b
|
Merge "Issue #1298 Changes for GFEConfigDialog. Must be used as a blocking dialog." into development
Former-commit-id: 0b9b82f99d [formerly 51c60c1876] [formerly 868fe53216] [formerly 2c86fdb2d0 [formerly 868fe53216 [formerly 08784a33471cc96472370081f31d7d7edb2a61f7]]]
Former-commit-id: 2c86fdb2d0
Former-commit-id: f0a60833c7d918fac07817906b853f6e6861dcc3 [formerly 881a8e726b]
Former-commit-id: 7b0e8774db
|
2012-10-30 16:46:30 -05:00 |
|
Lee Venable
|
c24bec08e8
|
Merge "Issue #1298 Changes for non-blocking BrightnessDialog." into development
Former-commit-id: 06ae8809fa [formerly 08e6cd0a31] [formerly 1932ec171b548c2d697ec9747b98a6ec6e7a3882 [formerly 276ce2ad08]] [formerly e47d1beb09 [formerly 276ce2ad08 [formerly 8d14e957dc2152a31c813a9278646904e2a3c777]]]
Former-commit-id: e47d1beb09
Former-commit-id: 27b66859fd05b9181f78df1b75f9d85077739203 [formerly cebd35bb47]
Former-commit-id: f5008c2296
|
2012-10-30 16:45:35 -05:00 |
|
Lee Venable
|
2ccdedfb17
|
Merge "Issue #1298 Comments on GridMangerView on why SaveParameterDialog and KillJobsOnExit must stay blocking." into development
Former-commit-id: c98c1c4e22 [formerly eed01fd643] [formerly 33525e4dff] [formerly 0bc4ec2135 [formerly 33525e4dff [formerly 3bb9ad3e1fb050dba420fc634b742a73b4443ba2]]]
Former-commit-id: 0bc4ec2135
Former-commit-id: 095ff9019dff625b0566903fa6dca379274ddee1 [formerly 2d3eeeaacf]
Former-commit-id: 364fb3f463
|
2012-10-30 16:44:56 -05:00 |
|
Roger Ferrel
|
32f74189d6
|
Issue #1298 Changes for non-blocking ContourDialog and removal of ButtonEntryDialog.
Change-Id: I6151274f455066c03db49618d6b5801248d48527
Former-commit-id: b57c7c2db8 [formerly 84a338fd4c] [formerly 0c544da917] [formerly 7c8f48fcb5 [formerly 0c544da917 [formerly c67543535ff38b777f14df1f41d96dbdacddeb09]]]
Former-commit-id: 7c8f48fcb5
Former-commit-id: 1ee29d2b03a202022a4910c759dc7ece8ed4d865 [formerly c0b480bc7f]
Former-commit-id: bc7e45e5e3
|
2012-10-30 15:19:08 -05:00 |
|
Roger Ferrel
|
e7c15d0f67
|
Issue #1298 Changes for non-blocking BrightnessDialog.
Change-Id: I84e0778c62c7cdffe33d89c5b2a3a4f205572483
Former-commit-id: 0c3a8eb482 [formerly 9dcaf583f6] [formerly bc1e462d07] [formerly 2fb06a145f [formerly bc1e462d07 [formerly 535d952595adfcd749ee132e45736120aa25cd3d]]]
Former-commit-id: 2fb06a145f
Former-commit-id: 2405427f07db54a3ba0ff37404fe9d0ca77210a9 [formerly 191e4e83db]
Former-commit-id: 769a831689
|
2012-10-30 14:00:20 -05:00 |
|
Roger Ferrel
|
f141ad90bb
|
Issue #1298 Comments on GridMangerView on why SaveParameterDialog and KillJobsOnExit must stay blocking.
Change-Id: I034b1f02eb3b1ac623c8d2d4b9a953e53534dba0
Former-commit-id: a155a8522e [formerly 3b96d312cd] [formerly 8952e1cef8] [formerly e37a097596 [formerly 8952e1cef8 [formerly 6dc43f8d58b82a4b59a3945cc41ad8dcdda47a11]]]
Former-commit-id: e37a097596
Former-commit-id: 42e63af20cadfda9fc5ab4e408df2ddcc69ae6d4 [formerly b93dcebdc0]
Former-commit-id: 2cbd0000ad
|
2012-10-30 12:35:48 -05:00 |
|
Ben Steffensmeier
|
0ee5726a56
|
merge branch Unifeid_Grid into developement
Former-commit-id: c789e1fd94 [formerly 272e057bf1] [formerly d0a2ed32b5] [formerly b6a1563bb2 [formerly d0a2ed32b5 [formerly 85a18d2cfdd70a24356f6e5ae490ec0c3fdb73e7]]]
Former-commit-id: b6a1563bb2
Former-commit-id: e5e3edb870cf3d09a1893575414b5bd00a8d3081 [formerly 92fd247ccc]
Former-commit-id: 1d94435220
|
2012-10-30 12:24:54 -05:00 |
|
Roger Ferrel
|
421336603b
|
Issue #1298 Changes for GFEConfigDialog. Must be used as a blocking dialog.
Change-Id: I5a4ad66d3aff1ab4b77b78ec8db233875aa61620
Former-commit-id: ade948f7c9 [formerly 6291083e5b] [formerly 87d3ff985e] [formerly 5355b7f620 [formerly 87d3ff985e [formerly 13f856685e36155909e7c4f4f9ac36d3a5633e4a]]]
Former-commit-id: 5355b7f620
Former-commit-id: 332c65e134cf000bb6c1c0aa0786b0b5cf049c36 [formerly 089e8af498]
Former-commit-id: baef52459d
|
2012-10-30 10:34:40 -05:00 |
|
Lee Venable
|
429f3732f6
|
Merge "Issue #1298 Changes for non-blocking WeatherElementBrowserDialog." into development
Former-commit-id: 4bb79b9b66 [formerly 3c6facf14b] [formerly a7eb12fd9e] [formerly 676856f62f [formerly a7eb12fd9e [formerly d6040334d8c3ea717966b54dc6bcc333d67d5b1b]]]
Former-commit-id: 676856f62f
Former-commit-id: 5ef83c8401a814312c342b360ca5b70b8ab757a3 [formerly b491922ddc]
Former-commit-id: 1a475c55de
|
2012-10-30 10:26:53 -05:00 |
|