xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
33073 commits 31 branches 40 tags 3.8 GiB
Commit graph

70 commits

Author SHA1 Message Date
mjames-upc
0b01029e68 cleaning up unidata_15.1.1 enough to launch in eclipse 2015-12-29 20:15:31 -07:00
mjames-upc
c921ec69d6 another attempt to merge UPC master_14.4.1 into origin/ncep_14.4.1-n 
Former-commit-id: f25e918e50
 2015-09-03 15:48:53 -06:00
Fay.Liang
c31d3f0910 Merge tag 'OB_14.4.1-25' into master_15.1.1 
This merge includes all changes in 14.4.1-22, -23, -24, and -25

Conflicts:
	cave/com.raytheon.uf.viz.localization.perspective/src/com/raytheon/uf/viz/localization/perspective/view/FileTreeView.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
	edexOsgi/com.raytheon.uf.common.dataplugin.text/utility/common_static/base/mixedCase/mixedCaseProductIds.txt

Former-commit-id: 857d0d89ae214ccf53713f74ef6778ba80c637fe
 2015-04-13 13:02:24 -04:00
Ron Anderson
0ddda332a3 Omaha #4288 Fixed widget is dispose error in FileTreeView 
Change-Id: I38b8af21ee8a6ce22bd67eee1abb8e51dc7fb1b9

Former-commit-id: 8791485de7c0885f33d03ed67cf0352406caf1a6
 2015-04-02 09:26:13 -05:00
Ron Anderson
dd07ff174c Omaha #4288 Fixed widget is dispose error in FileTreeView 
Change-Id: I38b8af21ee8a6ce22bd67eee1abb8e51dc7fb1b9

Former-commit-id: 240027df68 [formerly 0ddda332a3 [formerly 8791485de7c0885f33d03ed67cf0352406caf1a6]]
Former-commit-id: 0ddda332a3
Former-commit-id: cf01d266f1
 2015-04-02 09:26:13 -05:00
AWIPS User
ea30abe01b merge upc development orphan branch into upc_14.4.1 
Former-commit-id: 4458299928 [formerly 06a7f2ad9d] [formerly 1f4613a97ecb170f991ddd5ca9be32b5c63945b0 [formerly c9f28fd594]]
Former-commit-id: 76393e9e3ea8a386189eecfc4953a49d04ba95df [formerly 892c265b12]
Former-commit-id: 1ac670fc00
 2015-03-01 12:44:45 -07:00
Mark Peters
5695f40a93 Omaha #4132 NPE received when override in Localization perspective is deleted 
Change-Id: I3ec5aa9847e99037d582e4b2ed5871a6d0810863

Former-commit-id: f1a4d0a7adca293420170da7a74c15a6c9e4d338
 2015-02-18 17:52:28 -06:00
Ron Anderson
97a5223e13 Omaha #4108 Allow editable files to be edited in the Localization Compare editor 
Change-Id: Ia3c236e228089c289b9856b2138c1c9b226a5966

Former-commit-id: 85346f0eabfca3ff32d31ec9accecc5925280112
 2015-02-17 00:35:47 +00:00
Mark Peters
52b1be3665 Omaha #4028 Error occurs when closing and reopening CAVE with multiple files open in Localization 
Change-Id: Ia0d1acd9fcd3cea330167e0881b0860bd178e862

Former-commit-id: 4b828349684cf8ed6720ab555e00a33f521fd3b7
 2015-02-06 15:49:35 -06:00
mjames-upc
60abf0affc various cleanup merge remotes/origin/ncep_14.4.1 to upc dev 
Former-commit-id: 965f752233
 2015-01-12 16:11:06 -07:00
mjames-upc
ba80d4303b modified code CAVE - merge remotes/origin/ncep_14.4.1 to upc development 
Former-commit-id: e104fc35e2
 2015-01-12 14:07:28 -07:00
mjames-upc
886cd5940f Additions and deletions - merge remotes/origin/ncep_14.4.1 to upc development 
Former-commit-id: 7eacf4dc1c
 2015-01-12 14:02:58 -07:00
Brian Clements
3d790a851b Omaha #3531 fixed localization perspective refresh issue 
paths were compared by string prefixes instead of path prefixes

Change-Id: I6dd55001f505dda65df21e54727f262e247a30ba

Former-commit-id: 3cda9077130f30c21dbee5e8d16b59937a896cdd
 2014-09-18 10:56:32 -05:00
Brian Clements
9326925e83 Omaha #3531 fixed localization perspective refresh issue 
paths were compared by string prefixes instead of path prefixes

Change-Id: I6dd55001f505dda65df21e54727f262e247a30ba

Former-commit-id: 78a3277f25 [formerly 7268d3dc76] [formerly 3d790a851b] [formerly 78a3277f25 [formerly 7268d3dc76] [formerly 3d790a851b] [formerly 673ccf5851 [formerly 3d790a851b [formerly 3cda9077130f30c21dbee5e8d16b59937a896cdd]]]]
Former-commit-id: 673ccf5851
Former-commit-id: 1d384a6206 [formerly 1720b40335] [formerly d9927cfde495e1fcfd530f8db52e3e279854607f [formerly bbd2eddcf5]]
Former-commit-id: 473fc0f5323a6aea20690d74de5bba0c8105f36f [formerly 986b66c850]
Former-commit-id: cc965c830f
 2014-09-18 10:56:32 -05:00
Brian Clements
78a3277f25 Omaha #3531 fixed localization perspective refresh issue 
paths were compared by string prefixes instead of path prefixes

Change-Id: I6dd55001f505dda65df21e54727f262e247a30ba

Former-commit-id: 673ccf5851 [formerly 3d790a851b [formerly 3cda9077130f30c21dbee5e8d16b59937a896cdd]]
Former-commit-id: 3d790a851b
Former-commit-id: 7268d3dc76
 2014-09-18 10:56:32 -05:00
Mark Peters
e35a7451c6 Omaha #3527 Error occurs when attempting to reset or customize the Localization perspective 
Change-Id: Ie029b1aff905b57b5a353e0acf60c5137014c473

Former-commit-id: 8099cbe2359334d6718761046a1475fca687af35
 2014-08-29 16:17:22 -05:00
Mark Peters
ae538ff95a Omaha #3527 Error occurs when attempting to reset or customize the Localization perspective 
Change-Id: Ie029b1aff905b57b5a353e0acf60c5137014c473

Former-commit-id: fc72ed828c [formerly 966879b8a1] [formerly e35a7451c6] [formerly fc72ed828c [formerly 966879b8a1] [formerly e35a7451c6] [formerly 045746ec21 [formerly e35a7451c6 [formerly 8099cbe2359334d6718761046a1475fca687af35]]]]
Former-commit-id: 045746ec21
Former-commit-id: b42885a2af [formerly c850f6b6cd] [formerly 9f5aeecba1c51e5935aa53069c6d888c3c64a904 [formerly cc96e1fb1f]]
Former-commit-id: 0b0b06ddbbc00314f09e4d3b441fcbf71cfea7d0 [formerly 264c5afa15]
Former-commit-id: aa58dab103
 2014-08-29 16:17:22 -05:00
Mark Peters
fc72ed828c Omaha #3527 Error occurs when attempting to reset or customize the Localization perspective 
Change-Id: Ie029b1aff905b57b5a353e0acf60c5137014c473

Former-commit-id: 045746ec21 [formerly e35a7451c6 [formerly 8099cbe2359334d6718761046a1475fca687af35]]
Former-commit-id: e35a7451c6
Former-commit-id: 966879b8a1
 2014-08-29 16:17:22 -05:00
Nate Jensen
e6569b4a7d Omaha #3075 updates for pydev 3.4.1 
Change-Id: I2d7ed5e73f837f42dea3de35cdf79dd98c7586b1

Former-commit-id: a038aea9bb25e31b29b054e8899c0b51bc183fef
 2014-05-09 16:45:39 -05:00
Nate Jensen
2df8a30b14 Omaha #3075 updates for pydev 3.4.1 
Change-Id: I2d7ed5e73f837f42dea3de35cdf79dd98c7586b1

Former-commit-id: 7e3a38d473 [formerly 5fcc126e57] [formerly e6569b4a7d] [formerly 7e3a38d473 [formerly 5fcc126e57] [formerly e6569b4a7d] [formerly bb32858c04 [formerly e6569b4a7d [formerly a038aea9bb25e31b29b054e8899c0b51bc183fef]]]]
Former-commit-id: bb32858c04
Former-commit-id: b4747e1967 [formerly 651ce74777] [formerly 1c3c85d7dc8e6b4c5d374cb39021ba2a71dac98c [formerly 5d08184312]]
Former-commit-id: 1ecaca6a168a620d74a23e94527430feab94ee01 [formerly 9713ae6bf1]
Former-commit-id: 064894fe59
 2014-05-09 16:45:39 -05:00
Nate Jensen
7e3a38d473 Omaha #3075 updates for pydev 3.4.1 
Change-Id: I2d7ed5e73f837f42dea3de35cdf79dd98c7586b1

Former-commit-id: bb32858c04 [formerly e6569b4a7d [formerly a038aea9bb25e31b29b054e8899c0b51bc183fef]]
Former-commit-id: e6569b4a7d
Former-commit-id: 5fcc126e57
 2014-05-09 16:45:39 -05:00
mjames-upc
b4c0da1971 first commit orphan branch from remotes/origin/ncep_14.2.1 
Former-commit-id: 27eaf7aa70
 2014-04-30 19:22:58 -06:00
Max Schenkelberg
9d846aa104 Issue #2620 Fixed viz base feature dependency issues. 
Change-Id: Ia3db09b101f800d77d0d95932a7abb69fc110aec

Former-commit-id: 520e22dd848cf6472232d60789e1f6938db7c776
 2013-12-09 15:14:01 -06:00
Max Schenkelberg
d6ee7afe4a Issue #2620 Fixed viz base feature dependency issues. 
Change-Id: Ia3db09b101f800d77d0d95932a7abb69fc110aec

Former-commit-id: 0084b5b4f1 [formerly be45102814] [formerly 9d846aa104] [formerly 0084b5b4f1 [formerly be45102814] [formerly 9d846aa104] [formerly 987d4b3a30 [formerly 9d846aa104 [formerly 520e22dd848cf6472232d60789e1f6938db7c776]]]]
Former-commit-id: 987d4b3a30
Former-commit-id: 774859fcb9 [formerly e86e477165] [formerly f76ae5c39c57683f77097753d76cab458fd9e037 [formerly eede01921e]]
Former-commit-id: db317e89829b4a77b51a6217c6048e6ba7e2f098 [formerly 5c2da4c3e3]
Former-commit-id: ede6c2fa1e
 2013-12-09 15:14:01 -06:00
Max Schenkelberg
0084b5b4f1 Issue #2620 Fixed viz base feature dependency issues. 
Change-Id: Ia3db09b101f800d77d0d95932a7abb69fc110aec

Former-commit-id: 987d4b3a30 [formerly 9d846aa104 [formerly 520e22dd848cf6472232d60789e1f6938db7c776]]
Former-commit-id: 9d846aa104
Former-commit-id: be45102814
 2013-12-09 15:14:01 -06:00
Nate Jensen
b52bdb1cec Issue #2361 remove using SerializationUtil for processing XML colormaps 
Change-Id: I25409474972eb94a928bde61fca3af88630a82b7

Former-commit-id: df601fc0d4c9085c03eec4e12f17878c757ddddf
 2013-11-12 10:37:54 -06:00
Nate Jensen
40ea9ef7bc Issue #2361 remove using SerializationUtil for processing XML colormaps 
Change-Id: I25409474972eb94a928bde61fca3af88630a82b7

Former-commit-id: 1174d22160 [formerly 2c0c20f01e] [formerly b52bdb1cec] [formerly 1174d22160 [formerly 2c0c20f01e] [formerly b52bdb1cec] [formerly 7a73c65430 [formerly b52bdb1cec [formerly df601fc0d4c9085c03eec4e12f17878c757ddddf]]]]
Former-commit-id: 7a73c65430
Former-commit-id: f91ac1953e [formerly 9bf83be7e9] [formerly 760e4eea3b71bfcf5ae883d95ff74e375ec4bfc6 [formerly 5427e68fd2]]
Former-commit-id: 79abcb5632535338409c08045b873998da0ecaef [formerly 80c38e1433]
Former-commit-id: 273eb805c0
 2013-11-12 10:37:54 -06:00
Nate Jensen
1174d22160 Issue #2361 remove using SerializationUtil for processing XML colormaps 
Change-Id: I25409474972eb94a928bde61fca3af88630a82b7

Former-commit-id: 7a73c65430 [formerly b52bdb1cec [formerly df601fc0d4c9085c03eec4e12f17878c757ddddf]]
Former-commit-id: b52bdb1cec
Former-commit-id: 2c0c20f01e
 2013-11-12 10:37:54 -06:00
Ben Steffensmeier
89eb327bf0 Issue #2441 Initialize python interpreter asynchronously when opening localization perspective. 
Former-commit-id: 7d9312fbedf734f973401e21445448646ff67410
 2013-10-11 16:25:28 -05:00
Ben Steffensmeier
63aee4d933 Issue #2441 Initialize python interpreter asynchronously when opening localization perspective. 
Former-commit-id: a1fe58b934 [formerly ccf8a88f17] [formerly 89eb327bf0] [formerly a1fe58b934 [formerly ccf8a88f17] [formerly 89eb327bf0] [formerly c5d49b2a4c [formerly 89eb327bf0 [formerly 7d9312fbedf734f973401e21445448646ff67410]]]]
Former-commit-id: c5d49b2a4c
Former-commit-id: 44613a0c61 [formerly ae94d39ce2] [formerly 5b606b351636990de687695ed10f65eb3cc717ee [formerly c38c7d654c]]
Former-commit-id: 9dc862eaea127586ca7a3e51fe98ae5c9e020e8e [formerly a129474a80]
Former-commit-id: 0305d62673
 2013-10-11 16:25:28 -05:00
Ben Steffensmeier
a1fe58b934 Issue #2441 Initialize python interpreter asynchronously when opening localization perspective. 
Former-commit-id: c5d49b2a4c [formerly 89eb327bf0 [formerly 7d9312fbedf734f973401e21445448646ff67410]]
Former-commit-id: 89eb327bf0
Former-commit-id: ccf8a88f17
 2013-10-11 16:25:28 -05:00
Max Schenkelberg
7a66a3c995 Issue #2104 Fixed EnvelopeIntersection issue with inverted enveloped. Fixed various bugs that prevented proper testing of XML file attached to 2104. 
Amend: Accepted ticket, cleanup, comments

Change-Id: I78649dd0268b030624888544740a8d7af3e83e97

Former-commit-id: fb196f5b8659e568ea1406cc5c5e01aa82525a76
 2013-10-11 10:21:37 -05:00
Max Schenkelberg
de1a256c47 Issue #2104 Fixed EnvelopeIntersection issue with inverted enveloped. Fixed various bugs that prevented proper testing of XML file attached to 2104. 
Amend: Accepted ticket, cleanup, comments

Change-Id: I78649dd0268b030624888544740a8d7af3e83e97

Former-commit-id: c2471fd381 [formerly b64050ff1e] [formerly 7a66a3c995] [formerly c2471fd381 [formerly b64050ff1e] [formerly 7a66a3c995] [formerly 01c0e022d5 [formerly 7a66a3c995 [formerly fb196f5b8659e568ea1406cc5c5e01aa82525a76]]]]
Former-commit-id: 01c0e022d5
Former-commit-id: 98b60f0050 [formerly dfd6ffabd8] [formerly d2fa57de0fb4cdcad01f1ef6e1a474065d10bc48 [formerly cf0ad44ee3]]
Former-commit-id: 483819660d2cb4b6cc4872b4a95029a3370fc251 [formerly 3c2f370688]
Former-commit-id: a9a73d12cb
 2013-10-11 10:21:37 -05:00
Max Schenkelberg
c2471fd381 Issue #2104 Fixed EnvelopeIntersection issue with inverted enveloped. Fixed various bugs that prevented proper testing of XML file attached to 2104. 
Amend: Accepted ticket, cleanup, comments

Change-Id: I78649dd0268b030624888544740a8d7af3e83e97

Former-commit-id: 01c0e022d5 [formerly 7a66a3c995 [formerly fb196f5b8659e568ea1406cc5c5e01aa82525a76]]
Former-commit-id: 7a66a3c995
Former-commit-id: b64050ff1e
 2013-10-11 10:21:37 -05:00
Max Schenkelberg
aee70a1a65 Issue #2285 Fixed openFile in FileTreeView to attempt to refresh the tree if file not found. 
Change-Id: Icce65c35a7a812e09af931dc451801f9caa383d5

Former-commit-id: aae7d6af040d9a4f394d32782228878ce2092a07
 2013-09-17 17:38:27 -05:00
Max Schenkelberg
51880e557d Issue #2285 Fixed openFile in FileTreeView to attempt to refresh the tree if file not found. 
Change-Id: Icce65c35a7a812e09af931dc451801f9caa383d5

Former-commit-id: 14f359ca2a [formerly 5bffdf61bb] [formerly aee70a1a65] [formerly 14f359ca2a [formerly 5bffdf61bb] [formerly aee70a1a65] [formerly 4392aec17a [formerly aee70a1a65 [formerly aae7d6af040d9a4f394d32782228878ce2092a07]]]]
Former-commit-id: 4392aec17a
Former-commit-id: 01bdc4d1ce [formerly 938f8a92fe] [formerly 15e3fa317563f4a799a16b5cf25744e94e5cce5d [formerly f941760133]]
Former-commit-id: 0cb9a4ede899a26417190a3916c05154b69cec75 [formerly 0d72794455]
Former-commit-id: 4059622cb7
 2013-09-17 17:38:27 -05:00
Max Schenkelberg
14f359ca2a Issue #2285 Fixed openFile in FileTreeView to attempt to refresh the tree if file not found. 
Change-Id: Icce65c35a7a812e09af931dc451801f9caa383d5

Former-commit-id: 4392aec17a [formerly aee70a1a65 [formerly aae7d6af040d9a4f394d32782228878ce2092a07]]
Former-commit-id: aee70a1a65
Former-commit-id: 5bffdf61bb
 2013-09-17 17:38:27 -05:00
Nate Jensen
a1dbc9cd33 Issue #1967 eclipse 3.8 compatibility 
Change-Id: I37a42670b1fe9634b1de4b751f284971b545ac7b

Former-commit-id: 6c709fa5aa71daf4af3f4a9c7f2a56e19e0b06c7
 2013-05-07 15:55:48 -05:00
Nate Jensen
4409a4f0e8 Issue #1967 eclipse 3.8 compatibility 
Change-Id: I37a42670b1fe9634b1de4b751f284971b545ac7b

Former-commit-id: f2a0212fda [formerly 8c55960a53] [formerly a1dbc9cd33] [formerly f2a0212fda [formerly 8c55960a53] [formerly a1dbc9cd33] [formerly b35365b8a8 [formerly a1dbc9cd33 [formerly 6c709fa5aa71daf4af3f4a9c7f2a56e19e0b06c7]]]]
Former-commit-id: b35365b8a8
Former-commit-id: ce33f53b80 [formerly 7f2f96f47d] [formerly b1f86707e4f67bb298f201b107a51abf03bc05a2 [formerly ff4565ca16]]
Former-commit-id: 40a11fc49e5ed404c9a59f1e07afc1e879106acd [formerly 12c7dc578e]
Former-commit-id: 501aa91924
 2013-05-07 15:55:48 -05:00
Nate Jensen
f2a0212fda Issue #1967 eclipse 3.8 compatibility 
Change-Id: I37a42670b1fe9634b1de4b751f284971b545ac7b

Former-commit-id: b35365b8a8 [formerly a1dbc9cd33 [formerly 6c709fa5aa71daf4af3f4a9c7f2a56e19e0b06c7]]
Former-commit-id: a1dbc9cd33
Former-commit-id: 8c55960a53
 2013-05-07 15:55:48 -05:00
Ben Steffensmeier
c903521884 Issue #1532 Delete uf.common.image and clean up the mess it left behind. 
Former-commit-id: 8e2333d0d7 [formerly d27d30c2db] [formerly f46686a6e2] [formerly 8e2333d0d7 [formerly d27d30c2db] [formerly f46686a6e2] [formerly 2ca86633d6 [formerly f46686a6e2 [formerly 7c24d10acae9dee7ec03edd471983e0b80d58092]]]]
Former-commit-id: 2ca86633d6
Former-commit-id: 4936191404 [formerly 334af0001b] [formerly fa7abe8431fbbdea60e6504cd61a867956d20856 [formerly 5068b18c6a]]
Former-commit-id: 387e3e95805ed9aa6efd193b1112d4ae6d8ac95a [formerly 0778375180]
Former-commit-id: 866c873f71
 2013-02-28 17:00:56 -06:00
Ben Steffensmeier
f46686a6e2 Issue #1532 Delete uf.common.image and clean up the mess it left behind. 
Former-commit-id: 7c24d10acae9dee7ec03edd471983e0b80d58092
 2013-02-28 17:00:56 -06:00
Ben Steffensmeier
8e2333d0d7 Issue #1532 Delete uf.common.image and clean up the mess it left behind. 
Former-commit-id: 2ca86633d6 [formerly f46686a6e2 [formerly 7c24d10acae9dee7ec03edd471983e0b80d58092]]
Former-commit-id: f46686a6e2
Former-commit-id: d27d30c2db
 2013-02-28 17:00:56 -06:00
Max Schenkelberg
81f928586f Issue #1610 Fixed null pointer on FileTreeView when file updates arrive and view has not expanded file structure 
Change-Id: Ibfa11dc41ee5fa2a7421469a58932b415261c343

Former-commit-id: 7ede523b45 [formerly 2f8b88df4d] [formerly ecb0906597] [formerly 7ede523b45 [formerly 2f8b88df4d] [formerly ecb0906597] [formerly 02207b777c [formerly ecb0906597 [formerly 71b40ef692f0c2109e1026ac5d953d34e808938f]]]]
Former-commit-id: 02207b777c
Former-commit-id: 4d6091450a [formerly 66512cecc6] [formerly 25208ef3a3aee4c72d93ee79ac6912cad2b79071 [formerly bbc904894a]]
Former-commit-id: f77d34e67467b09d81c7990d5a358cae0feb4658 [formerly 355e96d4cd]
Former-commit-id: eb451e050f
 2013-02-13 15:18:54 -06:00
Max Schenkelberg
ecb0906597 Issue #1610 Fixed null pointer on FileTreeView when file updates arrive and view has not expanded file structure 
Change-Id: Ibfa11dc41ee5fa2a7421469a58932b415261c343

Former-commit-id: 71b40ef692f0c2109e1026ac5d953d34e808938f
 2013-02-13 15:18:54 -06:00
Max Schenkelberg
7ede523b45 Issue #1610 Fixed null pointer on FileTreeView when file updates arrive and view has not expanded file structure 
Change-Id: Ibfa11dc41ee5fa2a7421469a58932b415261c343

Former-commit-id: 02207b777c [formerly ecb0906597 [formerly 71b40ef692f0c2109e1026ac5d953d34e808938f]]
Former-commit-id: ecb0906597
Former-commit-id: 2f8b88df4d
 2013-02-13 15:18:54 -06:00
Dustin Johnson
eb82c7672b 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 acd4cf94d8 [formerly efd3d3735a] [formerly 064ef82d1e] [formerly 1dbeb22893 [formerly 064ef82d1e [formerly c04f7dca6f980ab7f3d77825312ddc34ba3b188d]]]]
Former-commit-id: 1dbeb22893
Former-commit-id: cd5faf58bf [formerly 2d1e886cf3] [formerly 6b7958c5dca22552e39ad9f77a0bdd977908f9dc [formerly 4222b24d09]]
Former-commit-id: 58274565203c021076e001f24f089a98cd2216f6 [formerly 6613c51d3b]
Former-commit-id: b4a13190ad
 2012-11-08 09:57:16 -06:00
Dustin Johnson
064ef82d1e 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
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
Dustin Johnson
4bc4d95b21 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 7d0e4a6e75 [formerly 8e69107b5a] [formerly 98d7beae50] [formerly 31d7d09c10 [formerly 98d7beae50 [formerly 89583d97c8823818f87dc1a234078d85ba7bea4a]]]]
Former-commit-id: 31d7d09c10
Former-commit-id: fe8a2a3b09 [formerly e7a0f96a9a] [formerly 465044dd2793505eba62cb46e6b3a8ac48623765 [formerly bcf575966b]]
Former-commit-id: df421cc2225941d22d1932b1c7a86fb3bdad68ce [formerly 4d9c945388]
Former-commit-id: 931d94d1de
 2012-11-01 13:36:06 -05:00