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

71 commits

Author SHA1 Message Date
Nate Jensen
beff93a7fc Merge "Omaha #3472 Clicking & dragging the Az/Ran Overlay tool off the map causes the map to jump" into omaha_14.4.1 
Former-commit-id: db03a73688 [formerly 63fcba10af] [formerly de91441935] [formerly de91441935 [formerly fed30c111e]] [formerly 310f314b81 [formerly de91441935 [formerly fed30c111e] [formerly 310f314b81 [formerly 76ca557a25e6b09b3412cfe7a2d154b3a522cf74]]]]
Former-commit-id: 310f314b81
Former-commit-id: 43aff2641ef8bb1bda94f6d8aaec95e061872c1b [formerly 0cbcd23250ff764b8aad0b69437fe722629a129c] [formerly 94081ece24 [formerly b6163075ef]]
Former-commit-id: 94081ece24
Former-commit-id: 0ba6735695
 2014-08-11 13:25:17 -05:00
Mark Peters
602c08c9a8 Omaha #3472 Clicking & dragging the Az/Ran Overlay tool off the map causes the map to jump 
Change-Id: I5dc3fc528a8e62dd32d87524f99adb1a8c9e610e

Former-commit-id: e02065a73b [formerly 68f61a9454] [formerly 5121ddaa12] [formerly 5121ddaa12 [formerly a73ca1f8c1]] [formerly 490f7ea209 [formerly 5121ddaa12 [formerly a73ca1f8c1] [formerly 490f7ea209 [formerly 1b0ac4736f7d63c5e49a48a28473ad6a38e6b6ea]]]]
Former-commit-id: 490f7ea209
Former-commit-id: 30756c6f5a6eee75feb3ced6d46cda7ef2567059 [formerly 72801197d2cb43781b6b0d626677539fc74c6eab] [formerly bbef55b2ce [formerly ff4ac7cbab]]
Former-commit-id: bbef55b2ce
Former-commit-id: 99709893a6
 2014-08-11 10:08:38 -05:00
Brian Clements
867e26edf7 Omaha #3503 common.serialization changes 
moved adapters to new plugins

Change-Id: I34c66b004ce1c5aa61c093fe2eeb2fe8d3b138b6

Former-commit-id: b7fba0ee31 [formerly 81144aa9e2] [formerly 9c09de5779] [formerly 9c09de5779 [formerly 90d492c1dc]] [formerly 415f2dff64 [formerly 9c09de5779 [formerly 90d492c1dc] [formerly 415f2dff64 [formerly adba61c3714678ce57f0de5bfd4f9aa860098bd9]]]]
Former-commit-id: 415f2dff64
Former-commit-id: 3ca04daa78d396f73a1b5822c2da624075666025 [formerly 4bbada7b433206885b217a05943790769bea6e90] [formerly d6aae6eaeb [formerly 0e415fd863]]
Former-commit-id: d6aae6eaeb
Former-commit-id: e61bbeab33
 2014-08-08 12:50:06 -05:00
Nate Jensen
91e0fdc16f Merge "Omaha #3356 remove unnecessary usage of ext and global buddy policies" into omaha_14.4.1 
Former-commit-id: ca12ec45b9 [formerly 9b617fb455] [formerly c30297b1b0] [formerly c30297b1b0 [formerly b3af25916c]] [formerly 61654ad2d1 [formerly c30297b1b0 [formerly b3af25916c] [formerly 61654ad2d1 [formerly 01773a5dfc82902e28fa730e174177b2ce08934e]]]]
Former-commit-id: 61654ad2d1
Former-commit-id: a573ce15fb73dc860bcb5c7b6682ef0406b2fcca [formerly 1803acf2f70a71bc163eb7d5db861505992fb442] [formerly 251a3f7686 [formerly 94994852f0]]
Former-commit-id: 251a3f7686
Former-commit-id: 8cef2c2968
 2014-08-04 14:49:57 -05:00
Nate Jensen
b13964a73f Omaha #3356 remove unnecessary usage of ext and global buddy policies 
Change-Id: I0007eb5bb21bb3a3d7d0757bb53856054b4f380d

Former-commit-id: 84762a24ac [formerly 9f0bd349b6] [formerly 41eb72aefd] [formerly 41eb72aefd [formerly 06a64080e7]] [formerly 857f1b70cc [formerly 41eb72aefd [formerly 06a64080e7] [formerly 857f1b70cc [formerly 41306351920aee44bdf2d9648616ddc8a4511632]]]]
Former-commit-id: 857f1b70cc
Former-commit-id: 4770c2dd06d94a89aa82046c3ac32760cd5a6155 [formerly 6820c43c0ca17c39dac7accbe6af17dc176d28b0] [formerly 94399b57de [formerly a920937cb5]]
Former-commit-id: 94399b57de
Former-commit-id: e755076e88
 2014-08-04 12:30:55 -05:00
Mark Peters
7ad2eb5483 Omaha #3430 Error returned when MB3 clicking off the map with a snapping tool in edit mode 
Change-Id: Iba81f6dc58b1223252711296b66a88a8afb02cdd

Former-commit-id: 88a35686da [formerly e8e3c7858e] [formerly 7aee990658] [formerly 7aee990658 [formerly de149c4a4f]] [formerly cf2a2d47b9 [formerly 7aee990658 [formerly de149c4a4f] [formerly cf2a2d47b9 [formerly d81e1ac43cbf10b0cd6f475e41fc242ab3c6a3c7]]]]
Former-commit-id: cf2a2d47b9
Former-commit-id: 11f3a1bca0fa34050c51277a0caf792e38c18e87 [formerly ec9f0a739d19d64ab795697121eac3d40fdc8d72] [formerly dce12dda03 [formerly 29bd1467dc]]
Former-commit-id: dce12dda03
Former-commit-id: c8a5d8e195
 2014-08-04 10:24:08 -05:00
Mark Peters
b6af07e03c Omaha #3465 Replace plugin calls to deprecated IGraphicsTarget.drawStrings() 
Change-Id: Ib72cf8806852aff718af56c5f2c2cf4e07f9f548

Former-commit-id: 24108c38bd [formerly 90a74cb89b] [formerly b40e589488] [formerly b40e589488 [formerly ad794f8fba]] [formerly 47aec2aae3 [formerly b40e589488 [formerly ad794f8fba] [formerly 47aec2aae3 [formerly 29d170af7a0c36e614a84923c2fb5054db73c390]]]]
Former-commit-id: 47aec2aae3
Former-commit-id: 70b53c87dad251fe4b7022b8aa47945e960077f7 [formerly 0e60c6aac1c5a6eccbb49b9c14a4b97cb0ee8748] [formerly 776d62c5f9 [formerly 6103909706]]
Former-commit-id: 776d62c5f9
Former-commit-id: 661b68cfc7
 2014-07-30 16:03:57 -05:00
Mark Peters
3ae196a465 Omaha #3429 Replace Raytheon plugin calls to deprecated IGraphicsTarget.drawLine() 
Change-Id: I9de68a9a047a2d6c3744b29de292efb7cfb44bbf

Former-commit-id: e9159478bf [formerly 6376572795] [formerly 11abefd4de] [formerly 11abefd4de [formerly 437e127ebc]] [formerly bac12d844b [formerly 11abefd4de [formerly 437e127ebc] [formerly bac12d844b [formerly a222b29ff24bf81d1c8aefd54fa33f52461c9c25]]]]
Former-commit-id: bac12d844b
Former-commit-id: 1b7ff82efe7d342c527a9ee5c512eea5e9f2072d [formerly 1492820d8873fe4e06b826ecddbb5536f26a2abc] [formerly 95886b5ded [formerly 6edd39cc9e]]
Former-commit-id: 95886b5ded
Former-commit-id: 88edbdafea
 2014-07-29 11:20:53 -05:00
Mark Peters
d12b1d5b1f Omaha #3430 Remove errors returned when MB3 clicking off the map with snapping tool in editable mode 
Change-Id: Id4fbe8480e1d796eed448a791982570bb85f657c

Former-commit-id: a8d9bb2c3f [formerly 14604bcc7b] [formerly 23538197f6] [formerly 23538197f6 [formerly 33e311c361]] [formerly cc690ec2c3 [formerly 23538197f6 [formerly 33e311c361] [formerly cc690ec2c3 [formerly b27dc2ad7076e73461d880e4daa987f49496f30d]]]]
Former-commit-id: cc690ec2c3
Former-commit-id: 3286f68aa7ed10abca651c827386b5d97a793cfd [formerly 2a77cc92bf9909ae7070ddd4770b41778d1e7c50] [formerly 0356569e9f [formerly c4eb912c7d]]
Former-commit-id: 0356569e9f
Former-commit-id: e28f394b97
 2014-07-28 14:44:28 -05:00
Lee Venable
a6ac923a62 Omaha #3400 - removed application modal shell style 
Former-commit-id: 2d2fba8962 [formerly 8c010849e9] [formerly 4ec7dd68dc] [formerly 4ec7dd68dc [formerly 143e42b887]] [formerly c068efccc3 [formerly 4ec7dd68dc [formerly 143e42b887] [formerly c068efccc3 [formerly 4841fab5ff0eab3c4f27b56e71f2e4cb35b32aaa]]]]
Former-commit-id: c068efccc3
Former-commit-id: 2908e9b29b60d9a8eba9f0b42a153f24c86633dd [formerly 42f8430d6aecc8cade0a0e59ee771acb2c572849] [formerly f4555772f1 [formerly 82b9b320c5]]
Former-commit-id: f4555772f1
Former-commit-id: fc1b82d9fd
 2014-07-25 10:56:48 -05:00
Mark Peters
91701ce809 Omaha #3412 Replace drawCircle calls 
Change-Id: I812f1941b0fe1c7601126e327bb001772eedf5ca

Former-commit-id: cda57bcb66 [formerly d04f7dd252] [formerly b5a25e7372] [formerly b5a25e7372 [formerly e638d2f41b]] [formerly e4c455f5c0 [formerly b5a25e7372 [formerly e638d2f41b] [formerly e4c455f5c0 [formerly c176ef7e45f8ad9e8273dd1a74ace2075aacdddd]]]]
Former-commit-id: e4c455f5c0
Former-commit-id: 7923a54c02727af1917ab51a198c4afa9b140493 [formerly a4e5ff382cd813f911beab0fb26c8f30196d7ec9] [formerly 30a6e96d7c [formerly e48c2b7116]]
Former-commit-id: 30a6e96d7c
Former-commit-id: 66fafe363b
 2014-07-21 17:07:02 -05:00
Richard Peter
0d7f87bb5b Merge branch 'omaha_14.3.1' (14.3.1-12) into omaha_14.4.1 
Conflicts:
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/datastructure/LoopProperties.java
	cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java
	edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-spring.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/AbstractWatchNotifierSrv.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/SPCWatchSrv.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/TPCWatchSrv.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/WCLWatchSrv.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/WclInfo.java
	edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
	edexOsgi/com.raytheon.edex.plugin.warning/WarningDecoder.py

Change-Id: I6208fb3e1589dd3f2356f19ea9bbdfaa79ae6d61

Former-commit-id: 94dfb1d2b8 [formerly ed38bf2372] [formerly 6636b301e5] [formerly 6636b301e5 [formerly 93bbd98cbc]] [formerly 8ecc27f714 [formerly 6636b301e5 [formerly 93bbd98cbc] [formerly 8ecc27f714 [formerly fc71e1cb26481e91c7d0c16ed0bd06ec5c8c22b9]]]]
Former-commit-id: 8ecc27f714
Former-commit-id: 3802e1ae7885edfbc70e2a3fa559bbd04ab6bec5 [formerly bb5cc0ca71fa6abf17e95b29fbe41a184ac1297e] [formerly 552ac6d640 [formerly fc27824dbc]]
Former-commit-id: 552ac6d640
Former-commit-id: 948e0cd011
 2014-07-01 15:34:39 -05:00
Steve Harris
020a525bfd Merge branch 'master_14.2.2' (-16) into master_14.3.1 (-11) CM-MERGE:14.2.2-11,-12,-13,-14,-15,-16 into 14.3.1 
Conflicts:
	cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/StormTrackDisplay.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/sbu/ServiceBackupDlg.java
	cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/GisUtil.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/PortionsUtil.java
	edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/postProcessModels/postProcessedModels.xml
	edexOsgi/com.raytheon.edex.plugin.shef/res/spring/shef-ingest.xml
	edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java

Change-Id: Ia1c3637d1d6ee482896c9d7a41d77752d70317f5

Former-commit-id: b2ca44adc7 [formerly 741dc31fcb] [formerly 2f2958df37] [formerly 2f2958df37 [formerly d4dc1723c1]] [formerly 7acd9ab2dd [formerly 2f2958df37 [formerly d4dc1723c1] [formerly 7acd9ab2dd [formerly d25ab509cb53d559edbd520dd1e3c036166f2e29]]]]
Former-commit-id: 7acd9ab2dd
Former-commit-id: 3e0604521c6e7522f3a4123eee8600cb5a71226f [formerly 109f5e557e8f5a7076b56c4f8d0f0c548c0f0cc6] [formerly 7fb4663d75 [formerly dcbab5621f]]
Former-commit-id: 7fb4663d75
Former-commit-id: d70da4127e
 2014-07-01 11:08:46 -04:00
Steve Harris
8e58645759 CM-MERGE:14.1.3-2,-3 into 14.2.2 
Merge branch 'master_14.1.3' (-3) into master_14.2.2 (-14)

Conflicts:
	edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-request.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-spring.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/spc/SPCWatchSrv.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/tpc/TPCWatchSrv.java
	edexOsgi/com.raytheon.edex.plugin.gfe/test/com/raytheon/edex/plugin/gfe/watch/TestWCLWatchSrv.java
	edexOsgi/com.raytheon.edex.plugin.warning/WarningDecoder.py
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/gis/GeospatialFactory.java

Former-commit-id: 37b3b421db [formerly 869235c02a] [formerly 16f5ff0979] [formerly 16f5ff0979 [formerly b84dda5930]] [formerly 419c5f4aba [formerly 16f5ff0979 [formerly b84dda5930] [formerly 419c5f4aba [formerly ce5767f2bbf5c9627bd43e766c6193c261c48af3]]]]
Former-commit-id: 419c5f4aba
Former-commit-id: a279361a319d31856e62ae271287fe2634f63eea [formerly dd639a780b77ef5a2f827ee961c20e9db23d2d31] [formerly af06c5a890 [formerly 66d30e59a3]]
Former-commit-id: af06c5a890
Former-commit-id: bab435f286
 2014-06-20 14:01:55 -04:00
Brian.Dyke
c220a11003 CM-MERGE:OB13.5.6-4 into 14.1.3 
Former-commit-id: 48fb810c83 [formerly e3dc97e246] [formerly be589ceb9b] [formerly be589ceb9b [formerly 399c06820a]] [formerly 8ecdd9a192 [formerly be589ceb9b [formerly 399c06820a] [formerly 8ecdd9a192 [formerly 86dc406cd227362abc5274f4cd64813ceb91d00d]]]]
Former-commit-id: 8ecdd9a192
Former-commit-id: 00089684d6f405bf63b66585cb6f0cb2bd6fb18d [formerly 9723a25d830a41cf2e060dc218ad841643217c3e] [formerly e28febcf27 [formerly 9031f58d02]]
Former-commit-id: e28febcf27
Former-commit-id: f09000ec64
 2014-06-18 08:55:49 -04:00
Ben Steffensmeier
9674d36a4b Omaha #2061 Remove references to IDecoderGettable.Amount from Range Rings. 
Former-commit-id: 30f908214c [formerly db668f8b63] [formerly 5a4f7a1fd4] [formerly 5a4f7a1fd4 [formerly f292f204c9]] [formerly fc25774506 [formerly 5a4f7a1fd4 [formerly f292f204c9] [formerly fc25774506 [formerly e267e8b0bae314abf3396db6072c6ff8adc732bf]]]]
Former-commit-id: fc25774506
Former-commit-id: be5bde5991bd716e9c4e96137ef854d6191319ed [formerly f401961b28b14a7264ad7debe15758c82f45e504] [formerly 217734a2ba [formerly 94b465fa15]]
Former-commit-id: 217734a2ba
Former-commit-id: c9b474afb9
 2014-06-11 13:45:42 -05:00
Ben Steffensmeier
c5e5b19fc1 Omaha #3263 Synchronize dataTimes of storm track resources. 
Former-commit-id: ce53d5ca1f [formerly e7128150f9] [formerly 8783e9e23c] [formerly 8783e9e23c [formerly eff1921f70]] [formerly cad15768cc [formerly 8783e9e23c [formerly eff1921f70] [formerly cad15768cc [formerly d0a3a73a3a2375a49dc3e224a1c13956530d3351]]]]
Former-commit-id: cad15768cc
Former-commit-id: eeb8a4b72c5d6ce60bd9e2c0d9773abf9663de72 [formerly 0968abe7b80aa03d6d67b8c88ad9529a151531f3] [formerly e4ac81c0e9 [formerly b02383f878]]
Former-commit-id: e4ac81c0e9
Former-commit-id: 814cabbcfc
 2014-06-10 16:34:44 -05:00
Brian.Dyke
28ccd9ecc0 Merge branch 'master_14.1.3' into master_14.2.2 CM-MERGE:14.1.3-1 into 14.2.2 
Conflicts:
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py

Former-commit-id: e46de9cb1a [formerly 7056d79f70] [formerly 0f07e14bf1] [formerly 0f07e14bf1 [formerly f72380ad60]] [formerly 9ab17ddecb [formerly 0f07e14bf1 [formerly f72380ad60] [formerly 9ab17ddecb [formerly 797aa6bfbf2802aa7355b7a4a77d0fb4f54dfd6a]]]]
Former-commit-id: 9ab17ddecb
Former-commit-id: 57cdbcea8780144a4444063478dccb85ddbc4c69 [formerly d838e1972c1a8529e2efc996d44a235ce685e8db] [formerly 816dcf74e4 [formerly 49cd9574d9]]
Former-commit-id: 816dcf74e4
Former-commit-id: 5893782ec3
 2014-06-10 13:56:03 -04:00
Brian.Dyke
2c9cdbd7b6 CM-MERGE:OB13.5.6-1,-2 into 14.1.3 
Former-commit-id: f512b9c51e [formerly 64a10ce12d] [formerly ef5c74dece] [formerly ef5c74dece [formerly c1b3f9d180]] [formerly 8874d41872 [formerly ef5c74dece [formerly c1b3f9d180] [formerly 8874d41872 [formerly b859032bcec187616adfd414dd1ce5fe27829e9e]]]]
Former-commit-id: 8874d41872
Former-commit-id: 5a09a2a2fc07851b1a02ee853528cabdf2c91146 [formerly c763da54d370b72fa17bd0154f839ff80cd9226a] [formerly 4f0fc67b1f [formerly f568b5606a]]
Former-commit-id: 4f0fc67b1f
Former-commit-id: d6ebcad87e
 2014-06-10 12:52:59 -04:00
Michael Gamazaychikov
0ec2896a37 ASM #114 - Problem with Distance Speed Tool. 
Change-Id: I2b3218b2fb407f99cf9c81edf69feb042a6fee75

Former-commit-id: 9c8ea9175b [formerly efd0fb50b8] [formerly e5a9fa0827] [formerly e5a9fa0827 [formerly c07bcacbf8]] [formerly 50ab77046b [formerly e5a9fa0827 [formerly c07bcacbf8] [formerly 50ab77046b [formerly a38308fa5a6efe9a07ecd84bd93662bea32afc94]]]]
Former-commit-id: 50ab77046b
Former-commit-id: b40093b9faa61b20a9a359277a1abd5814e2eb35 [formerly a99f478987db9b40c18652f3f209154a8dfc3177] [formerly a2423cfadc [formerly 5efb82ea3e]]
Former-commit-id: a2423cfadc
Former-commit-id: fc5acb6bcb
 2014-06-05 13:43:04 +01:00
Michael Gamazaychikov
f68a237e53 ASM #114 - Problem with Distance Speed Tool (merge with 13.5.4 changes). 
Change-Id: Ic4d6f50c28d0aba440a02010b09b2e3b3117fe85

Former-commit-id: 4c1074cd34 [formerly b3d76892d1] [formerly 8ae5d535de] [formerly 8ae5d535de [formerly 63409ef272]] [formerly 5bff9f2ac8 [formerly 8ae5d535de [formerly 63409ef272] [formerly 5bff9f2ac8 [formerly f3ee76edfd95e9c25eff89d1ecbff9e466b3ca75]]]]
Former-commit-id: 5bff9f2ac8
Former-commit-id: de86e857178734353fddc8c8ca7cbe90cd21da1b [formerly 3f60fc9aefaa49ce841bebfd87ef42af677038af] [formerly 0d38d04dad [formerly 134f486069]]
Former-commit-id: 0d38d04dad
Former-commit-id: b499ee2828
 2014-05-21 15:12:08 +01:00
brian.dyke
ff29ac1dd9 Merge branch 'master_14.3.1-4' into asm_14.3.1 
Conflicts:
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResource.java
	edexOsgi/com.raytheon.uf.edex.grid.staticdata/src/com/raytheon/uf/edex/grid/staticdata/StaticDataGenerator.java
	edexOsgi/com.raytheon.uf.edex.plugin.grid/utility/common_static/base/purge/gridPurgeRules.xml

Former-commit-id: 8fc637d27d [formerly 4d161aaf90] [formerly 9626317825] [formerly 9626317825 [formerly 011d121e4b]] [formerly 58683ad040 [formerly 9626317825 [formerly 011d121e4b] [formerly 58683ad040 [formerly 52358cb3e2ba2c7ff4ff9c9a5de03af50c3a1199]]]]
Former-commit-id: 58683ad040
Former-commit-id: dd84aabda68bf0ba92959f80f4ff4af042362e53 [formerly cba44a8343721392c8a010e859fb1efaca4b604b] [formerly 2e105c1d5d [formerly bc4649765a]]
Former-commit-id: 2e105c1d5d
Former-commit-id: a2add51880
 2014-05-19 09:45:37 -04:00
Qinglu.Lin
d5ecef6039 ASM #514 - Line of Storms functionality behaving oddly in WarnGen 
Change-Id: I0bd2b9e4200b5acbb19a06caa45f18d36346de39

Former-commit-id: d65b42634a [formerly d3220c8e71] [formerly 5f0e0bda69] [formerly 5f0e0bda69 [formerly 18e92f03c1]] [formerly d8753a4145 [formerly 5f0e0bda69 [formerly 18e92f03c1] [formerly d8753a4145 [formerly 66a6c50cd501358e0c8c993631b288aa78dfdc97]]]]
Former-commit-id: d8753a4145
Former-commit-id: c36f5c8397b6ef8ccad39b5be803ab467a88b70b [formerly de233bb13dc17298e3aa8b3e59813a4bc72ebe5a] [formerly 580d7e3ba7 [formerly 8de2d2f718]]
Former-commit-id: 580d7e3ba7
Former-commit-id: 153128e11e
 2014-05-05 11:54:56 -04:00
Richard Peter
a0ffae6c6b Merge branch 'master_14.3.1' (14.3.1-2) into omaha_14.3.1 
Conflicts:
	cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/CaseCreationDlg.java
	cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/GenerateCaseDlg.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
	edexOsgi/com.raytheon.edex.utilitysrv/res/spring/utility-request.xml
	edexOsgi/com.raytheon.uf.common.colormap/src/com/raytheon/uf/common/colormap/image/Colormapper.java
	edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/SerializationUtil.java
	edexOsgi/com.raytheon.uf.edex.textdbsrv/res/spring/textdbsrv-request.xml

Change-Id: I316979d4036b2e2d05b361c8c466747b04ee4900

Former-commit-id: 3d9938c5a3 [formerly 8b1a177110] [formerly 67683dd891] [formerly 67683dd891 [formerly 44b1782461]] [formerly 32957285fc [formerly 67683dd891 [formerly 44b1782461] [formerly 32957285fc [formerly 311c52426b3715d3a73c1fa79a8fd427a4b1b09d]]]]
Former-commit-id: 32957285fc
Former-commit-id: f7f2cdcc4b250524846ce9a4063e651d4182d7a2 [formerly 2a324b0264c6962014f41df55690c7e2b09955e1] [formerly 6966b79246 [formerly 80d4153878]]
Former-commit-id: 6966b79246
Former-commit-id: 0dfa8cc4c6
 2014-04-28 16:27:40 -05:00
Brian.Dyke
3e80889eb6 Merge branch 'master_14.2.2' into master_14.3.1 
Merge (14.2.2-5 into 14.3.1-1)

Conflicts:
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/GFESpatialDisplayManager.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/grid/dataset/alias/gfeParamInfo.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscMosaic.py
	edexOsgi/com.raytheon.uf.common.archive/src/com/raytheon/uf/common/archive/config/ArchiveConfigManager.java
	edexOsgi/com.raytheon.uf.common.python/utility/common_static/base/python/MasterInterface.py
	edexOsgi/com.raytheon.uf.edex.datadelivery.registry/src/com/raytheon/uf/edex/datadelivery/registry/federation/RegistryFederationManager.java
	edexOsgi/com.raytheon.uf.edex.registry.ebxml/src/com/raytheon/uf/edex/registry/ebxml/services/lifecycle/LifecycleManagerImpl.java

Former-commit-id: 83727709c6 [formerly 362d882b40] [formerly f0b8ea5822] [formerly f0b8ea5822 [formerly fb1f5aa593]] [formerly 3524838f9f [formerly f0b8ea5822 [formerly fb1f5aa593] [formerly 3524838f9f [formerly f54d2c639a915db14f01f56a7fcc5841b60e1509]]]]
Former-commit-id: 3524838f9f
Former-commit-id: 7eb8ff57ff4d7d383497a38960663b90f905f7b8 [formerly bb5a7e713dac6962660d9c769971464b6792cb76] [formerly bf3758efa3 [formerly 029f5753ad]]
Former-commit-id: bf3758efa3
Former-commit-id: 14a63a19e1
 2014-04-25 11:06:11 -04:00
Lee Venable
732d8ef70d Issue #3041 - added dispose check to runAsync call and cleaned up code. 
Change-Id: I50e6ce1a214a884221fbc256a133e57e579862da

Former-commit-id: 0423078c18 [formerly ed407b11c6] [formerly ac914e72e7] [formerly ac914e72e7 [formerly 3c45a24efb]] [formerly dcb7e697e8 [formerly ac914e72e7 [formerly 3c45a24efb] [formerly dcb7e697e8 [formerly ed2fc05f61861efe6c70b8fc73ad10d27bb73c12]]]]
Former-commit-id: dcb7e697e8
Former-commit-id: 55fb8423e3d752d6ff7f3e53b388c74319114bae [formerly dcaad16ef8d601c796b1e22040cf86806d2002cf] [formerly 91d37d783c [formerly 20764b1d97]]
Former-commit-id: 91d37d783c
Former-commit-id: e5d73f64ac
 2014-04-21 13:47:31 -05:00
Brian.Dyke
44cb4a3b7d Merged 14.2.1 -17, -18 into 1422-3 
Former-commit-id: ad705df872 [formerly 735801a7e7] [formerly 9df6fb2d4d] [formerly 9df6fb2d4d [formerly 12a482e1d7]] [formerly b8829139a2 [formerly 9df6fb2d4d [formerly 12a482e1d7] [formerly b8829139a2 [formerly 712064db471de93da585f9c765bb4dfbe510df53]]]]
Former-commit-id: b8829139a2
Former-commit-id: 500f2f566a21bd3825b53550bfa48de4104809bd [formerly 007cb5daf20362de356dbfbefce51ee972d9ab3a] [formerly 6f35818917 [formerly 0ea7c51ad7]]
Former-commit-id: 6f35818917
Former-commit-id: 9c4385efbe
 2014-04-17 14:42:35 -04:00
Richard Peter
a655029277 Merge branch 'omaha_14.2.2' (14.2.2-3) into development 
Conflicts:
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResource.java
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
	cave/com.raytheon.viz.hydrobase/src/com/raytheon/viz/hydrobase/dialogs/QcAlertAlarmLimitsDlg.java
	cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/resource/HRAPOverlayResource.java
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/MPEDisplayManager.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
	edexOsgi/com.raytheon.edex.textdb/src/com/raytheon/edex/textdb/dbapi/impl/TextDBStaticData.java
	edexOsgi/com.raytheon.edex.textdb/src/com/raytheon/edex/textdb/ingest/TextDBStaticDataSubscriber.java
	edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/styleRules/d2dContourStyleRules.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/styleRules/gridImageryStyleRules.xml
	edexOsgi/com.raytheon.uf.edex.plugin.manualIngest/res/spring/manualIngest-spring.xml

Former-commit-id: 0fa9c8709a [formerly 9b12d9ddaf] [formerly cd51f3fa87] [formerly a65804787550135ce5e8efc80b04f65f82ceff22 [formerly cd51f3fa87 [formerly 3575d6586f]]] [formerly 21ae3b5fcd [formerly cd51f3fa87 [formerly 3575d6586f] [formerly 21ae3b5fcd [formerly bd13bc332bcdd87723bec8669885f4594ad483b9]]]]
Former-commit-id: 21ae3b5fcd
Former-commit-id: cba185d0d926f9dea67500ef8d8ab9da489ee4bb [formerly 9377474013cb8e8722b3a32e83523c417b87fcd0] [formerly d65b11d404 [formerly a7ec0bcf66]]
Former-commit-id: d65b11d404
Former-commit-id: 56089894f2
 2014-04-11 16:23:09 -05:00
Richard Peter
7cfc0b06c7 Merge branch 'master_14.1.2' into master_14.2.1 
Conflicts:
	cave/build/static/common/cave/etc/gfe/userPython/textUtilities/regular/VectorRelatedPhrases.py
	cave/com.raytheon.uf.viz.thinclient.cave/src/com/raytheon/uf/viz/thinclient/cave/refresh/ThinClientDataUpdateTree.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/GfeClient.java
	edexOsgi/build.edex/esb/conf/log4j.xml
	edexOsgi/build.edex/esb/data/utility/edex_static/base/textproducts/templates/utility/SAF_Site_MultiPil_Definition.py
	edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/SerializationUtil.java
	edexOsgi/com.raytheon.uf.edex.activetable/utility/common_static/base/vtec/MergeVTEC.py

Former-commit-id: 288febacc7 [formerly efd1003a50] [formerly 5676090443] [formerly 5676090443 [formerly 95eba8dcf6]] [formerly b15d288530 [formerly 5676090443 [formerly 95eba8dcf6] [formerly b15d288530 [formerly 3c8cf44cc2573c17e20c93fd5153c5ed54df12c2]]]]
Former-commit-id: b15d288530
Former-commit-id: ed8609133e05b5d0ee1912e5ac34a16a3fe104ac [formerly 12e55bf5c019cdd33ebe8c550d444fb3e73016ff] [formerly f1b85f6964 [formerly 73aab15d85]]
Former-commit-id: f1b85f6964
Former-commit-id: 47795836f2
 2014-04-09 16:00:54 -05:00
Brian.Dyke
ce1349740a Merged 1354 -7 and -8 into 1412 
Former-commit-id: 2ab8bd77d9 [formerly 7de936dfba] [formerly e4136f79dd] [formerly e4136f79dd [formerly 947194c998]] [formerly 929b736038 [formerly e4136f79dd [formerly 947194c998] [formerly 929b736038 [formerly 082b54dc10676b7090f8a1c9a01929a6d7da2667]]]]
Former-commit-id: 929b736038
Former-commit-id: 33d6d32d894986ee2f5ffc28ddcd6ef5cc520fdd [formerly ef99224ab38fbdf6c62ed3f358f4c50051cbc248] [formerly d76d3a26cb [formerly 5163a31a66]]
Former-commit-id: d76d3a26cb
Former-commit-id: a6ebdbfc3a
 2014-04-09 11:39:07 -04:00
Everett Kladstrup
4c60039942 Issue #2725 Move derived parameters logic to common 
* Make derived parameters not use VizException
* Move derived parameters packages from the viz hierarchy
  to the common hierarchy
* Move data cube classes that don't depend on derived parameters
  to thier own plugin
* Moved DataCubeContainer and supporting frontend classes from
  viz.core to viz.datacube


Former-commit-id: 853bc4ad0b [formerly eab1358602] [formerly 8b19b3601a] [formerly 8b19b3601a [formerly 06d6961c0f]] [formerly 0699041518 [formerly 8b19b3601a [formerly 06d6961c0f] [formerly 0699041518 [formerly ad4a8cfbbc6de72810492c8f1de9701d381b6019]]]]
Former-commit-id: 0699041518
Former-commit-id: 1ffb072e3ddcc73123d0d9bf8e3ed1cb9a342b66 [formerly eb5b00071037510aefc04c8c20411cc18c44abb0] [formerly 86bf2b5ea0 [formerly 260d0beddc]]
Former-commit-id: 86bf2b5ea0
Former-commit-id: 29ce7781c9
 2014-04-09 09:31:12 -05:00
Brian.Dyke
a1b4b5a315 Merged 1354 -5 and -6 into 1412 based on 1411-25 
Former-commit-id: 0c8117982f [formerly 2eec862ebb] [formerly 17477e7db1] [formerly 17477e7db1 [formerly 6a28fcb156]] [formerly dd98c213c7 [formerly 17477e7db1 [formerly 6a28fcb156] [formerly dd98c213c7 [formerly 407b42b0eff676a95483e219d6be899e45effd6c]]]]
Former-commit-id: dd98c213c7
Former-commit-id: fc3c00a17bb7a79f8b61454b8d40e68f136d1ced [formerly 637b118d4cff6a2a054282ce2aabc47a5819c54c] [formerly 47d9095211 [formerly 9f37f61cf8]]
Former-commit-id: 47d9095211
Former-commit-id: 8ba2694d8e
 2014-04-04 12:57:32 -04:00
David Friedman
b0bec4816d Merge branch 'master_14.2.2' into asm_14.2.2 
Remove unintentional changes from cd136c3.
Fix problem in warning-request.xml from 3c9c34c.

Conflicts:
	cave/build/static/linux/cave/cave.sh
	cave/build/static/linux/cave/caveUtil.sh
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/PolygonUtil.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
	edexOsgi/com.raytheon.edex.plugin.warning/res/spring/warning-request.xml
	edexOsgi/com.raytheon.uf.common.ohd/utility/common_static/base/hydro/Apps_defaults
	edexOsgi/com.raytheon.uf.edex.plugin.manualIngest/res/spring/manualIngest-spring.xml

Change-Id: I814b0ae3c464bbb21b609870b3dca7d575ed948d

Former-commit-id: b3492e55de [formerly ee37afaf7b] [formerly 32a7adbe4b] [formerly 32a7adbe4b [formerly fd900e38c2]] [formerly f146c7bcd0 [formerly 32a7adbe4b [formerly fd900e38c2] [formerly f146c7bcd0 [formerly cf35c1870fc4b6b3c2ceaf038274c4701f8046b1]]]]
Former-commit-id: f146c7bcd0
Former-commit-id: 292af91e33e58076664a7b293339b7ad623ff349 [formerly 06e6f2e7e7ae2f1959eaefcb5e76c2a04c33de99] [formerly 1168a3eae5 [formerly 533d15c863]]
Former-commit-id: 1168a3eae5
Former-commit-id: 1e4ac84f99
 2014-03-27 19:17:03 +00:00
Max Schenkelberg
19d25e1f8c Issue #2804 Fixed clipping pane issues where clipped map borders would be visible due to other resources not resetting up the clipping pane when done. 
Change-Id: If27cd7c8e11cdc6287303e6d5fc1f4990e300ada

Former-commit-id: 70fec6a068 [formerly 4bcdc9f85b] [formerly 6edfb8965f] [formerly 6edfb8965f [formerly dbcbd1b560]] [formerly 1854bbb477 [formerly 6edfb8965f [formerly dbcbd1b560] [formerly 1854bbb477 [formerly 51664693bd87df52acdb74d5286b61eeb06b792d]]]]
Former-commit-id: 1854bbb477
Former-commit-id: 8560eb0aef67c72443f4df3086c608f06a5633e2 [formerly 64e66813ccc56d3b7a703a331fd119c8cbcceb08] [formerly bff80c3ee9 [formerly 6658c94e6e]]
Former-commit-id: bff80c3ee9
Former-commit-id: c37910a689
 2014-03-03 17:59:48 -06:00
Juliya Dynina
c5ffcd2aae Merge "ASM #114" into asm_14.2.2 
Former-commit-id: a337a92f7b [formerly dd71746c6f] [formerly 3edd73f78c] [formerly 3edd73f78c [formerly 575ed3610d]] [formerly c6253811e8 [formerly 3edd73f78c [formerly 575ed3610d] [formerly c6253811e8 [formerly d719e88d510424020955f06d8b597d2df3573836]]]]
Former-commit-id: c6253811e8
Former-commit-id: 4cc610007f8835901f4aaa806393ebc6efdf9d07 [formerly f3f8b80f5f698a4e575a4f3e5ff5b88856aa9c27] [formerly f54454f8f1 [formerly 430b9a1ace]]
Former-commit-id: f54454f8f1
Former-commit-id: d191fb83af
 2014-02-05 10:42:30 -05:00
David Friedman
460c6c42d3 ASM #110 
Change-Id: I9df0f0491fa96ecb4c8f46125d987179f3aefc2f

Former-commit-id: 8d32611be4 [formerly 0372fdd6cc] [formerly d36cbb2ca9] [formerly d36cbb2ca9 [formerly 769086c0b7]] [formerly e18c49ea72 [formerly d36cbb2ca9 [formerly 769086c0b7] [formerly e18c49ea72 [formerly c4b3411f4d5f7632e3c804316bd5959d16cc97f0]]]]
Former-commit-id: e18c49ea72
Former-commit-id: 7481de12678ee827b418bf99a63d03a5fdbc87ef [formerly e28494606e9e07a3b76cb461cbaa151022eaec7a] [formerly 0ce67592ac [formerly 052e12b777]]
Former-commit-id: 0ce67592ac
Former-commit-id: b5ae8c70c9
 2014-01-29 20:23:55 +00:00
Michael Gamazaychikov
2674cabaa1 ASM #114 
Change-Id: I6308422a99e66701852e3b6de6c89b756513ef02

Former-commit-id: 1bec1e7cb4 [formerly 73deca037f] [formerly 297d1cffc6] [formerly 297d1cffc6 [formerly 97f9c2ea92]] [formerly 8f90c0dee2 [formerly 297d1cffc6 [formerly 97f9c2ea92] [formerly 8f90c0dee2 [formerly 56dc40096e58fa8ae40b9f2cd6a1bd8f9dd3d35a]]]]
Former-commit-id: 8f90c0dee2
Former-commit-id: d591c74ed77f67a35e077df4247a16ee17de3eb2 [formerly 8ea9bd6aedb12599a646b4ebb3e81c3350dde192] [formerly 0198607fe0 [formerly 7d7cf7cfab]]
Former-commit-id: 0198607fe0
Former-commit-id: b117e710a8
 2014-01-29 10:58:18 -05:00
brian.dyke
21a827151b merge 14.2.1-3 into asm-14.2.2 
Former-commit-id: 5b74176d3b [formerly becf6322c6] [formerly 4a62e83835] [formerly 4a62e83835 [formerly 2294c81a57]] [formerly f10f6d4e8a [formerly 4a62e83835 [formerly 2294c81a57] [formerly f10f6d4e8a [formerly a116be206fc8a24dd12610db37db6f26c65a19b0]]]]
Former-commit-id: f10f6d4e8a
Former-commit-id: 9043d578b89b573988a90ad05bb77fa0d18398cc [formerly 83bf7b38976fc3a19f898b0fe2c8e7790a8d7629] [formerly 621464ac0d [formerly e9e2eb3be0]]
Former-commit-id: 621464ac0d
Former-commit-id: ac37e2ea2e
 2014-01-27 15:27:49 -05:00
David Friedman
5e104608eb Issue #114 
Change-Id: I7fd218b0120fe8d8eb6ab535d6d07b40c6c0773d

Former-commit-id: 0097b674c4 [formerly 846bc47100] [formerly 6c1b1f33ee] [formerly 6c1b1f33ee [formerly 01d657fd50]] [formerly fe50967163 [formerly 6c1b1f33ee [formerly 01d657fd50] [formerly fe50967163 [formerly cd136c3a57f7836606755ad9d1de7a3b8234d1d8]]]]
Former-commit-id: fe50967163
Former-commit-id: 21c152bb221a0fd010d43f00431c436e3029f26e [formerly f8126e54325a5b478e8e024aea02fb5815472921] [formerly 1eae25014b [formerly 0975f982f2]]
Former-commit-id: 1eae25014b
Former-commit-id: 8685594a4e
 2013-12-20 20:33:18 +00:00
Ben Steffensmeier
f2a6f89402 Issue #2491 Remove uneeded ISerializableObject files. 
Former-commit-id: fd03ef5064 [formerly 230309c25f] [formerly f34bfc1e5b] [formerly f34bfc1e5b [formerly c14cc609a8]] [formerly cac1f07cbb [formerly f34bfc1e5b [formerly c14cc609a8] [formerly cac1f07cbb [formerly fd4cc4fde9507cd9abbf394ea5823a8f315c7d55]]]]
Former-commit-id: cac1f07cbb
Former-commit-id: bf9c9e9735d90828ebe8daa9f552037b1b112098 [formerly cbb9e5689b5ecaf7c5b0202dbf3d51fae0c0dda9] [formerly ce9653ab15 [formerly a06bdc56d6]]
Former-commit-id: ce9653ab15
Former-commit-id: e03a1c1202
 2013-10-25 15:31:39 -05:00
Nate Jensen
d8e31081b0 Issue #2400 fix so active map editor is used if applicable 
Change-Id: I642edc1bdc94eac871a07c26e900c2431f567ab1

Former-commit-id: 3b8442dca7 [formerly 6f44e0c9e3] [formerly 58c9aced4e] [formerly 58c9aced4e [formerly 8e9e495149]] [formerly c1dd4b40fb [formerly 58c9aced4e [formerly 8e9e495149] [formerly c1dd4b40fb [formerly 563212924964f8ca66cba789d7867b19c68d0682]]]]
Former-commit-id: c1dd4b40fb
Former-commit-id: 10a5562971cecf968fc2570890adf6eb28f12ff7 [formerly 876c39cce804bd2eaf674c9c20e970b9219de559] [formerly 81f5ecb21a [formerly 136ea71235]]
Former-commit-id: 81f5ecb21a
Former-commit-id: 3a4fc09777
 2013-09-30 11:47:26 -05:00
Nate Jensen
cebd5a8b68 Issue #2360 don't allow mouse actions on layer if layer is invisible 
Change-Id: Id8e169d4af96902e72b2509d2f53e39ac6cc0a8a

Former-commit-id: 6beacd37cd [formerly 9b3101dd50] [formerly 906e9ad7e9] [formerly 906e9ad7e9 [formerly 08bd2c0241]] [formerly ce457b5be4 [formerly 906e9ad7e9 [formerly 08bd2c0241] [formerly ce457b5be4 [formerly e4e6f46be381f83c7273d84e62d274575048aac2]]]]
Former-commit-id: ce457b5be4
Former-commit-id: 0f6a64a07b29f18eaea863208334e9f41b58e628 [formerly 2fc838a1d47b7b1629df2407f1c65f9b5a1a0317] [formerly 450f5d063d [formerly 11c1fa94ae]]
Former-commit-id: 450f5d063d
Former-commit-id: 0773241c7e
 2013-09-18 17:33:20 -05:00
Max Schenkelberg
50142c5a25 Issue #2277 Switched DataCubeContainer calls to not use ScriptCreator 
Amend: Added comments as requested

Change-Id: Ib787d43638f20babfc7f89ce2eac958e31d21c3c

Former-commit-id: ff28590621 [formerly 3509baaa74] [formerly 8a500677d3] [formerly 8a500677d3 [formerly b633f9987a]] [formerly 2d1db7d0e2 [formerly 8a500677d3 [formerly b633f9987a] [formerly 2d1db7d0e2 [formerly efb402d2835f715143cddffeec2bd7c20d0a65f6]]]]
Former-commit-id: 2d1db7d0e2
Former-commit-id: 97e5a1ae96f2388dc905a91bd700c97bd71fe2c7 [formerly c6fb597995ca49d9e40c0fe52f6d3e660affe671] [formerly 1bdef4ddd3 [formerly 61e6dd1316]]
Former-commit-id: 1bdef4ddd3
Former-commit-id: 70c91ed24b
 2013-09-09 10:10:11 -05:00
Ben Steffensmeier
9f40060b48 Issue #2310 Switch awipstools to load using bundles. 
Change-Id: I9a24e6359bd43bfb7c8f84686348f532748503c4

Former-commit-id: 0b330e7c36 [formerly 6f29122c14] [formerly ecf667fce9] [formerly ecf667fce9 [formerly d75fdcb916]] [formerly 87b6474106 [formerly ecf667fce9 [formerly d75fdcb916] [formerly 87b6474106 [formerly afc80cb00cce9b22f1ecd730b60da1de1afbfb2e]]]]
Former-commit-id: 87b6474106
Former-commit-id: 83943cb20243ecf8a1468c4f17ff6327ce8c8cae [formerly 0f540dd74f1e8e6723b36d8b78e242b7a0b0b4ec] [formerly 19cc13d9bf [formerly a6661a8831]]
Former-commit-id: 19cc13d9bf
Former-commit-id: 5998b5aa02
 2013-09-04 16:05:09 -05:00
Ben Steffensmeier
bb03286ee5 Issue #2281 Fix shear click distance calculations. 
Change-Id: I67980264723512a4167cf90cfc3adac2c9ba1d08

Former-commit-id: d26ec4764f [formerly c3d7a13d82] [formerly ed989ef777] [formerly ed989ef777 [formerly bf8dba768a]] [formerly 057d7b9381 [formerly ed989ef777 [formerly bf8dba768a] [formerly 057d7b9381 [formerly eac729a60aab70e4940c03d8aba5e7dee0072b59]]]]
Former-commit-id: 057d7b9381
Former-commit-id: 9f5b62609a3fa27575fb4ea7f813ce4e57ed9226 [formerly 13a5cc7c8f0fd537a7a6d9f6ffc35954d0a16270] [formerly 6da772b60f [formerly 96d9c53cc9]]
Former-commit-id: 6da772b60f
Former-commit-id: db3eae719a
 2013-08-29 13:20:56 -05:00
Richard Peter
952cd0ba74 Merge branch 'omaha_13.5.1' (13.5.1-15) into development 
Conflicts:
	cave/com.raytheon.uf.viz.d2d.core/src/com/raytheon/uf/viz/d2d/core/time/D2DTimeMatcher.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/FollowupData.java
	edexOsgi/com.raytheon.edex.plugin.bufrua/res/pointdata/bufruadb.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-spring.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFEDao.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/ifpnetCDF.py
	edexOsgi/com.raytheon.edex.plugin.modelsounding/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/AbstractWarningRecord.java

Former-commit-id: be6e9a56c2 [formerly 181df35afc] [formerly 1f32ef9c7a] [formerly 1f32ef9c7a [formerly 5e5047cc4f]] [formerly 2a9276c728 [formerly 1f32ef9c7a [formerly 5e5047cc4f] [formerly 2a9276c728 [formerly e1aa1aa51e2325b005604aa971e842bccfcd8375]]]]
Former-commit-id: 2a9276c728
Former-commit-id: f4a9d1b418785d46989c39e20a932c12931ea5c2 [formerly 9c1694fcc8344cffbdb2feb402c25389a357d414] [formerly c0b0eef331 [formerly db7c941f6f]]
Former-commit-id: c0b0eef331
Former-commit-id: 84bef1f2ec
 2013-08-14 15:23:18 -05:00
Steve Harris
f1b3e9c061 13.5.1-14 baseline 
Former-commit-id: 05ec949b01 [formerly c6465a3398] [formerly b848317203] [formerly b848317203 [formerly d695e5debe]] [formerly 80e5f7fbd4 [formerly b848317203 [formerly d695e5debe] [formerly 80e5f7fbd4 [formerly fe7b1a704ee92b34684e4f9059bd61cfa28dd485]]]]
Former-commit-id: 80e5f7fbd4
Former-commit-id: 73d6a7f0a3aed600a04f1685e4f19dc4009e9968 [formerly 979d519294a0cce041889e9000a739088fbe1b71] [formerly 9bd983e2fe [formerly cd5b1e9e2f]]
Former-commit-id: 9bd983e2fe
Former-commit-id: 4e75333155
 2013-08-14 10:07:41 -04:00
Richard Peter
dd497c8661 Merge branch 'omaha_13.5.1' (13.5.1-7) into development 
Conflicts:
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/subset/GriddedSubsetManagerDlg.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesAction.java
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/MPEFieldResource.java
	cave/com.raytheon.viz.satellite/src/com/raytheon/viz/satellite/rsc/SatResource.java
	edexOsgi/com.raytheon.uf.common.pointdata/src/com/raytheon/uf/common/pointdata/spatial/SurfaceObsLocation.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/BandwidthManager.java
	ncep/gov.noaa.nws.ncep.viz.customProjection/META-INF/MANIFEST.MF
	rpms/awips2.cave/deploy.builder/build.sh

Former-commit-id: 36361ae0c8 [formerly 19dacc32c1] [formerly 401ed88e44] [formerly 8c66430f15bae97a44ce97acd0a8c896a7b3aa22 [formerly 401ed88e44 [formerly 15d1a6eab0]]] [formerly c6386e306f [formerly 401ed88e44 [formerly 15d1a6eab0] [formerly c6386e306f [formerly 293586df88f53c2ddf6f7586bf71719298728022]]]]
Former-commit-id: c6386e306f
Former-commit-id: ceeb9e903cbfa51936c1e32e3152413eca616a19 [formerly e1fa5bd1d05a5aa1d607bb1e33e99826fc290d81] [formerly e7ec068c7e [formerly 12993d9539]]
Former-commit-id: e7ec068c7e
Former-commit-id: 4c53471f8e
 2013-07-22 09:40:18 -05:00
Steve Harris
02f16dcf12 13.5.1-7 baseline 
Former-commit-id: 65139f6e11 [formerly 67299457b1] [formerly 630705aa3f] [formerly 630705aa3f [formerly bf58a81b38]] [formerly 86ce1248c2 [formerly 630705aa3f [formerly bf58a81b38] [formerly 86ce1248c2 [formerly 4310ff14ffe9c7975574bb8b40bef668a90649e4]]]]
Former-commit-id: 86ce1248c2
Former-commit-id: 65fa3e98803abf23e4cb0984d4cdc1e423d038b2 [formerly 5aea78fbd5da8a55b6f4dc4542505312f878d73d] [formerly cb50a0028d [formerly f9c9aecba5]]
Former-commit-id: cb50a0028d
Former-commit-id: 0fe8173b7b
 2013-07-18 12:07:22 -04:00
Nate Jensen
4f741dd1fb Issue #2142 clean up dependencies and dead code 
Change-Id: I30f94c9afb01cdd1b7bef98c6ba40f79c3acea59

Former-commit-id: 30973d2a82 [formerly 8838a7ee75] [formerly c4bc1ef034] [formerly c4bc1ef034 [formerly a636846295]] [formerly f28420dac4 [formerly c4bc1ef034 [formerly a636846295] [formerly f28420dac4 [formerly 593073cade120a95899f4f4d2c5a652c6ac3389a]]]]
Former-commit-id: f28420dac4
Former-commit-id: 46a4dd3702c56961572c3278c043c80c54293a38 [formerly 222e227b908ca94947a44a0518892d94ce66b436] [formerly 8b070975aa [formerly 65dbc62b59]]
Former-commit-id: 8b070975aa
Former-commit-id: d39a175583
 2013-07-17 16:30:08 -05:00