Commit graph

73 commits

Author SHA1 Message Date
Mark Peters
46a7c253cf Omaha #3523 Replace Raytheon usage of IGraphicsTarget.TextStyle.NORMAL and directly assigning the text style
Change-Id: Idcc31d11251df8de949bd1bd9bf8c402a5d47f4f

Former-commit-id: 3b4f4394be [formerly f6799659ea] [formerly 308ada356b] [formerly 3b4f4394be [formerly f6799659ea] [formerly 308ada356b] [formerly 4011a4392c [formerly 308ada356b [formerly e409b578fcb15caadf28da57d2cb1860e1ea246c]]]]
Former-commit-id: 4011a4392c
Former-commit-id: d44f96faf7 [formerly c36257683c] [formerly 36239d6a2b4b192a959b7634eec27016d32ed009 [formerly 03229efe86]]
Former-commit-id: 7bf2fb8b62683087abeeff26f6dac51b1f68e787 [formerly b7209bee6e]
Former-commit-id: d63684feaa
2014-08-14 15:43:17 -05:00
Nate Jensen
f7ae70ac02 Omaha #3356 cleanup of unnecessary register buddies and buddy policies
Change-Id: I1d6c279478f38876a8df67d2f9dd186a2efdeca0

Former-commit-id: d61c65787b [formerly 253198b5bc] [formerly b3083a663e] [formerly d61c65787b [formerly 253198b5bc] [formerly b3083a663e] [formerly 9b72a1399d [formerly b3083a663e [formerly 48536dd79d933508ac54b3b6e9bbd166fd218330]]]]
Former-commit-id: 9b72a1399d
Former-commit-id: e7b11aaf88 [formerly 58a4cb95c1] [formerly 1fed4e6852cd8eca79ebee598c5badd5a0a3fe14 [formerly d67083655a]]
Former-commit-id: 7e191ad12969bca5c4c6b83a1e9488c58f4c6928 [formerly 951feab33d]
Former-commit-id: 7336692b85
2014-08-14 10:22:37 -05:00
Nate Jensen
a6ea5a2460 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: 63fcba10af [formerly de91441935] [formerly fed30c111e] [formerly 63fcba10af [formerly de91441935] [formerly fed30c111e] [formerly 310f314b81 [formerly fed30c111e [formerly 76ca557a25e6b09b3412cfe7a2d154b3a522cf74]]]]
Former-commit-id: 310f314b81
Former-commit-id: 0ba6735695 [formerly 94081ece24] [formerly 0cbcd23250ff764b8aad0b69437fe722629a129c [formerly b6163075ef]]
Former-commit-id: b0749f974b0e552437b304650e974aa2d15c23e0 [formerly 424d770910]
Former-commit-id: 99c2786f94
2014-08-11 13:25:17 -05:00
Mark Peters
b755b5ef78 Omaha #3472 Clicking & dragging the Az/Ran Overlay tool off the map causes the map to jump
Change-Id: I5dc3fc528a8e62dd32d87524f99adb1a8c9e610e

Former-commit-id: 68f61a9454 [formerly 5121ddaa12] [formerly a73ca1f8c1] [formerly 68f61a9454 [formerly 5121ddaa12] [formerly a73ca1f8c1] [formerly 490f7ea209 [formerly a73ca1f8c1 [formerly 1b0ac4736f7d63c5e49a48a28473ad6a38e6b6ea]]]]
Former-commit-id: 490f7ea209
Former-commit-id: 99709893a6 [formerly bbef55b2ce] [formerly 72801197d2cb43781b6b0d626677539fc74c6eab [formerly ff4ac7cbab]]
Former-commit-id: cff02307e33dc821b28fb8a939a47e7bb87d46fd [formerly 164928997d]
Former-commit-id: 6c55a465eb
2014-08-11 10:08:38 -05:00
Brian Clements
51f49bd36d Omaha #3503 common.serialization changes
moved adapters to new plugins

Change-Id: I34c66b004ce1c5aa61c093fe2eeb2fe8d3b138b6

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

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

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

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

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

Former-commit-id: 14604bcc7b [formerly 23538197f6] [formerly 33e311c361] [formerly 14604bcc7b [formerly 23538197f6] [formerly 33e311c361] [formerly cc690ec2c3 [formerly 33e311c361 [formerly b27dc2ad7076e73461d880e4daa987f49496f30d]]]]
Former-commit-id: cc690ec2c3
Former-commit-id: e28f394b97 [formerly 0356569e9f] [formerly 2a77cc92bf9909ae7070ddd4770b41778d1e7c50 [formerly c4eb912c7d]]
Former-commit-id: 6a66f1dd7727d1b46bffd2ae45a9a31dbc699efb [formerly 7685d6ac9a]
Former-commit-id: 3393501814
2014-07-28 14:44:28 -05:00
Lee Venable
e5c778806d Omaha #3400 - removed application modal shell style
Former-commit-id: 8c010849e9 [formerly 4ec7dd68dc] [formerly 143e42b887] [formerly 8c010849e9 [formerly 4ec7dd68dc] [formerly 143e42b887] [formerly c068efccc3 [formerly 143e42b887 [formerly 4841fab5ff0eab3c4f27b56e71f2e4cb35b32aaa]]]]
Former-commit-id: c068efccc3
Former-commit-id: fc1b82d9fd [formerly f4555772f1] [formerly 42f8430d6aecc8cade0a0e59ee771acb2c572849 [formerly 82b9b320c5]]
Former-commit-id: ddb40d450b39e9795a61cb98abb1c981ac66ee87 [formerly 7efc684837]
Former-commit-id: 5eb631d759
2014-07-25 10:56:48 -05:00
Mark Peters
0411b26ec6 Omaha #3412 Replace drawCircle calls
Change-Id: I812f1941b0fe1c7601126e327bb001772eedf5ca

Former-commit-id: d04f7dd252 [formerly b5a25e7372] [formerly e638d2f41b] [formerly d04f7dd252 [formerly b5a25e7372] [formerly e638d2f41b] [formerly e4c455f5c0 [formerly e638d2f41b [formerly c176ef7e45f8ad9e8273dd1a74ace2075aacdddd]]]]
Former-commit-id: e4c455f5c0
Former-commit-id: 66fafe363b [formerly 30a6e96d7c] [formerly a4e5ff382cd813f911beab0fb26c8f30196d7ec9 [formerly e48c2b7116]]
Former-commit-id: 781f6322906c1d4bfd6979543164111cd6386e57 [formerly 3aee17fbb5]
Former-commit-id: 969c6a4685
2014-07-21 17:07:02 -05:00
Richard Peter
0b0b58e89c 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: ed38bf2372 [formerly 6636b301e5] [formerly 93bbd98cbc] [formerly ed38bf2372 [formerly 6636b301e5] [formerly 93bbd98cbc] [formerly 8ecc27f714 [formerly 93bbd98cbc [formerly fc71e1cb26481e91c7d0c16ed0bd06ec5c8c22b9]]]]
Former-commit-id: 8ecc27f714
Former-commit-id: 948e0cd011 [formerly 552ac6d640] [formerly bb5cc0ca71fa6abf17e95b29fbe41a184ac1297e [formerly fc27824dbc]]
Former-commit-id: 98c7362b289abd5b8e115f957b14dcd73116b99a [formerly 0fefdc7cd6]
Former-commit-id: 342192e967
2014-07-01 15:34:39 -05:00
Steve Harris
1bbbdc9c62 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: 741dc31fcb [formerly 2f2958df37] [formerly d4dc1723c1] [formerly 741dc31fcb [formerly 2f2958df37] [formerly d4dc1723c1] [formerly 7acd9ab2dd [formerly d4dc1723c1 [formerly d25ab509cb53d559edbd520dd1e3c036166f2e29]]]]
Former-commit-id: 7acd9ab2dd
Former-commit-id: d70da4127e [formerly 7fb4663d75] [formerly 109f5e557e8f5a7076b56c4f8d0f0c548c0f0cc6 [formerly dcbab5621f]]
Former-commit-id: 8343b8e876918b72044e0b509f5b5b8afdbd53e2 [formerly 71357da9d2]
Former-commit-id: 8fb747ad27
2014-07-01 11:08:46 -04:00
Steve Harris
7e7529e482 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: 869235c02a [formerly 16f5ff0979] [formerly b84dda5930] [formerly 869235c02a [formerly 16f5ff0979] [formerly b84dda5930] [formerly 419c5f4aba [formerly b84dda5930 [formerly ce5767f2bbf5c9627bd43e766c6193c261c48af3]]]]
Former-commit-id: 419c5f4aba
Former-commit-id: bab435f286 [formerly af06c5a890] [formerly dd639a780b77ef5a2f827ee961c20e9db23d2d31 [formerly 66d30e59a3]]
Former-commit-id: 27bd7f3ff5ce8e46cd91569a3f0cf62fa9127e53 [formerly 935542914d]
Former-commit-id: 196f53e609
2014-06-20 14:01:55 -04:00
Brian.Dyke
71ca3ae180 CM-MERGE:OB13.5.6-4 into 14.1.3
Former-commit-id: e3dc97e246 [formerly be589ceb9b] [formerly 399c06820a] [formerly e3dc97e246 [formerly be589ceb9b] [formerly 399c06820a] [formerly 8ecdd9a192 [formerly 399c06820a [formerly 86dc406cd227362abc5274f4cd64813ceb91d00d]]]]
Former-commit-id: 8ecdd9a192
Former-commit-id: f09000ec64 [formerly e28febcf27] [formerly 9723a25d830a41cf2e060dc218ad841643217c3e [formerly 9031f58d02]]
Former-commit-id: c6144f8a9f4e5c44b2c2c7442f0100f646622fba [formerly 3e10995d87]
Former-commit-id: b602d29456
2014-06-18 08:55:49 -04:00
Ben Steffensmeier
ed865c330a Omaha #2061 Remove references to IDecoderGettable.Amount from Range Rings.
Former-commit-id: db668f8b63 [formerly 5a4f7a1fd4] [formerly f292f204c9] [formerly db668f8b63 [formerly 5a4f7a1fd4] [formerly f292f204c9] [formerly fc25774506 [formerly f292f204c9 [formerly e267e8b0bae314abf3396db6072c6ff8adc732bf]]]]
Former-commit-id: fc25774506
Former-commit-id: c9b474afb9 [formerly 217734a2ba] [formerly f401961b28b14a7264ad7debe15758c82f45e504 [formerly 94b465fa15]]
Former-commit-id: 0558994679c2da78da91ba8ad2e4c69c953ea5d5 [formerly 3c8b94e08a]
Former-commit-id: 2aebff4f06
2014-06-11 13:45:42 -05:00
Ben Steffensmeier
82f3aaa41e Omaha #3263 Synchronize dataTimes of storm track resources.
Former-commit-id: e7128150f9 [formerly 8783e9e23c] [formerly eff1921f70] [formerly e7128150f9 [formerly 8783e9e23c] [formerly eff1921f70] [formerly cad15768cc [formerly eff1921f70 [formerly d0a3a73a3a2375a49dc3e224a1c13956530d3351]]]]
Former-commit-id: cad15768cc
Former-commit-id: 814cabbcfc [formerly e4ac81c0e9] [formerly 0968abe7b80aa03d6d67b8c88ad9529a151531f3 [formerly b02383f878]]
Former-commit-id: f97a310ca82b1a763f344ac25119445501694a5b [formerly f60667703f]
Former-commit-id: c0b8a49ee9
2014-06-10 16:34:44 -05:00
Brian.Dyke
f5befd7116 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: 7056d79f70 [formerly 0f07e14bf1] [formerly f72380ad60] [formerly 7056d79f70 [formerly 0f07e14bf1] [formerly f72380ad60] [formerly 9ab17ddecb [formerly f72380ad60 [formerly 797aa6bfbf2802aa7355b7a4a77d0fb4f54dfd6a]]]]
Former-commit-id: 9ab17ddecb
Former-commit-id: 5893782ec3 [formerly 816dcf74e4] [formerly d838e1972c1a8529e2efc996d44a235ce685e8db [formerly 49cd9574d9]]
Former-commit-id: b46938d836881d648f671f55d48408d36e6cb22f [formerly a4b39dfca5]
Former-commit-id: 1ae1410e46
2014-06-10 13:56:03 -04:00
Brian.Dyke
7caa757318 CM-MERGE:OB13.5.6-1,-2 into 14.1.3
Former-commit-id: 64a10ce12d [formerly ef5c74dece] [formerly c1b3f9d180] [formerly 64a10ce12d [formerly ef5c74dece] [formerly c1b3f9d180] [formerly 8874d41872 [formerly c1b3f9d180 [formerly b859032bcec187616adfd414dd1ce5fe27829e9e]]]]
Former-commit-id: 8874d41872
Former-commit-id: d6ebcad87e [formerly 4f0fc67b1f] [formerly c763da54d370b72fa17bd0154f839ff80cd9226a [formerly f568b5606a]]
Former-commit-id: cb4c4f5cdbcafd5e7f18339757c3484f03c17e30 [formerly 81d732477e]
Former-commit-id: a39afc1dfa
2014-06-10 12:52:59 -04:00
Michael Gamazaychikov
b3afeb981b ASM #114 - Problem with Distance Speed Tool.
Change-Id: I2b3218b2fb407f99cf9c81edf69feb042a6fee75

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

Former-commit-id: b3d76892d1 [formerly 8ae5d535de] [formerly 63409ef272] [formerly b3d76892d1 [formerly 8ae5d535de] [formerly 63409ef272] [formerly 5bff9f2ac8 [formerly 63409ef272 [formerly f3ee76edfd95e9c25eff89d1ecbff9e466b3ca75]]]]
Former-commit-id: 5bff9f2ac8
Former-commit-id: b499ee2828 [formerly 0d38d04dad] [formerly 3f60fc9aefaa49ce841bebfd87ef42af677038af [formerly 134f486069]]
Former-commit-id: de7589ac82c2fe4ab8fce61c3a0e6a30b30502d2 [formerly 55d44735ef]
Former-commit-id: 0217549622
2014-05-21 15:12:08 +01:00
brian.dyke
5c9495ee04 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: 4d161aaf90 [formerly 9626317825] [formerly 011d121e4b] [formerly 4d161aaf90 [formerly 9626317825] [formerly 011d121e4b] [formerly 58683ad040 [formerly 011d121e4b [formerly 52358cb3e2ba2c7ff4ff9c9a5de03af50c3a1199]]]]
Former-commit-id: 58683ad040
Former-commit-id: a2add51880 [formerly 2e105c1d5d] [formerly cba44a8343721392c8a010e859fb1efaca4b604b [formerly bc4649765a]]
Former-commit-id: 161c7365002f1434a02f072bc8ba71aba3cbf346 [formerly b42011fc76]
Former-commit-id: b2e3c50ec0
2014-05-19 09:45:37 -04:00
Qinglu.Lin
db716647bb ASM #514 - Line of Storms functionality behaving oddly in WarnGen
Change-Id: I0bd2b9e4200b5acbb19a06caa45f18d36346de39

Former-commit-id: d3220c8e71 [formerly 5f0e0bda69] [formerly 18e92f03c1] [formerly d3220c8e71 [formerly 5f0e0bda69] [formerly 18e92f03c1] [formerly d8753a4145 [formerly 18e92f03c1 [formerly 66a6c50cd501358e0c8c993631b288aa78dfdc97]]]]
Former-commit-id: d8753a4145
Former-commit-id: 153128e11e [formerly 580d7e3ba7] [formerly de233bb13dc17298e3aa8b3e59813a4bc72ebe5a [formerly 8de2d2f718]]
Former-commit-id: 27cacced16ec33e1bb5c01e87c75e6050fffec36 [formerly 6ba15bd00c]
Former-commit-id: 03f7862321
2014-05-05 11:54:56 -04:00
Richard Peter
e748b7c1e5 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: 8b1a177110 [formerly 67683dd891] [formerly 44b1782461] [formerly 8b1a177110 [formerly 67683dd891] [formerly 44b1782461] [formerly 32957285fc [formerly 44b1782461 [formerly 311c52426b3715d3a73c1fa79a8fd427a4b1b09d]]]]
Former-commit-id: 32957285fc
Former-commit-id: 0dfa8cc4c6 [formerly 6966b79246] [formerly 2a324b0264c6962014f41df55690c7e2b09955e1 [formerly 80d4153878]]
Former-commit-id: 5715dc841fc8db519f94f6126094e2ff4eb83ea8 [formerly 24a3fe1466]
Former-commit-id: 938e39a0fc
2014-04-28 16:27:40 -05:00
Brian.Dyke
19b4bb7dcc 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: 362d882b40 [formerly f0b8ea5822] [formerly fb1f5aa593] [formerly 362d882b40 [formerly f0b8ea5822] [formerly fb1f5aa593] [formerly 3524838f9f [formerly fb1f5aa593 [formerly f54d2c639a915db14f01f56a7fcc5841b60e1509]]]]
Former-commit-id: 3524838f9f
Former-commit-id: 14a63a19e1 [formerly bf3758efa3] [formerly bb5a7e713dac6962660d9c769971464b6792cb76 [formerly 029f5753ad]]
Former-commit-id: 4f6c777830575250a298510d89cfba1ef9df9753 [formerly c6d3fe6952]
Former-commit-id: f31d8cc8cf
2014-04-25 11:06:11 -04:00
Lee Venable
69a239a78a Issue #3041 - added dispose check to runAsync call and cleaned up code.
Change-Id: I50e6ce1a214a884221fbc256a133e57e579862da

Former-commit-id: ed407b11c6 [formerly ac914e72e7] [formerly 3c45a24efb] [formerly ed407b11c6 [formerly ac914e72e7] [formerly 3c45a24efb] [formerly dcb7e697e8 [formerly 3c45a24efb [formerly ed2fc05f61861efe6c70b8fc73ad10d27bb73c12]]]]
Former-commit-id: dcb7e697e8
Former-commit-id: e5d73f64ac [formerly 91d37d783c] [formerly dcaad16ef8d601c796b1e22040cf86806d2002cf [formerly 20764b1d97]]
Former-commit-id: af8a618de055822348d6ef19a4bba61729b5bc48 [formerly 294d8ff917]
Former-commit-id: d6e34a221f
2014-04-21 13:47:31 -05:00
Brian.Dyke
143d9a143a Merged 14.2.1 -17, -18 into 1422-3
Former-commit-id: 735801a7e7 [formerly 9df6fb2d4d] [formerly 12a482e1d7] [formerly 735801a7e7 [formerly 9df6fb2d4d] [formerly 12a482e1d7] [formerly b8829139a2 [formerly 12a482e1d7 [formerly 712064db471de93da585f9c765bb4dfbe510df53]]]]
Former-commit-id: b8829139a2
Former-commit-id: 9c4385efbe [formerly 6f35818917] [formerly 007cb5daf20362de356dbfbefce51ee972d9ab3a [formerly 0ea7c51ad7]]
Former-commit-id: 286e1b30c773c91540e1e54ed0825014dadb3b10 [formerly a925ba6219]
Former-commit-id: de500c093f
2014-04-17 14:42:35 -04:00
Richard Peter
626ab0bd58 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: 9b12d9ddaf [formerly cd51f3fa87] [formerly 3575d6586f] [formerly 9b12d9ddaf [formerly cd51f3fa87] [formerly 3575d6586f] [formerly 21ae3b5fcd [formerly 3575d6586f [formerly bd13bc332bcdd87723bec8669885f4594ad483b9]]]]
Former-commit-id: 21ae3b5fcd
Former-commit-id: 56089894f2 [formerly d65b11d404] [formerly 9377474013cb8e8722b3a32e83523c417b87fcd0 [formerly a7ec0bcf66]]
Former-commit-id: ea5917ddde80aa4f2fa095272512ef873794f21c [formerly b6482f2e54]
Former-commit-id: a22345ea6b
2014-04-11 16:23:09 -05:00
Richard Peter
52a54f5e9f 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: efd1003a50 [formerly 5676090443] [formerly 95eba8dcf6] [formerly efd1003a50 [formerly 5676090443] [formerly 95eba8dcf6] [formerly b15d288530 [formerly 95eba8dcf6 [formerly 3c8cf44cc2573c17e20c93fd5153c5ed54df12c2]]]]
Former-commit-id: b15d288530
Former-commit-id: 47795836f2 [formerly f1b85f6964] [formerly 12e55bf5c019cdd33ebe8c550d444fb3e73016ff [formerly 73aab15d85]]
Former-commit-id: 3660d57b987b8ab590b095e98b193f3d1ff95669 [formerly b667e0509f]
Former-commit-id: 421b2716a4
2014-04-09 16:00:54 -05:00
Brian.Dyke
38a8f60a43 Merged 1354 -7 and -8 into 1412
Former-commit-id: 7de936dfba [formerly e4136f79dd] [formerly 947194c998] [formerly 7de936dfba [formerly e4136f79dd] [formerly 947194c998] [formerly 929b736038 [formerly 947194c998 [formerly 082b54dc10676b7090f8a1c9a01929a6d7da2667]]]]
Former-commit-id: 929b736038
Former-commit-id: a6ebdbfc3a [formerly d76d3a26cb] [formerly ef99224ab38fbdf6c62ed3f358f4c50051cbc248 [formerly 5163a31a66]]
Former-commit-id: 281a7b2833a1dc51969eab1f2b614dfd6fa8f7eb [formerly 462952ce65]
Former-commit-id: 8ef50f023b
2014-04-09 11:39:07 -04:00
Everett Kladstrup
f815fbcb60 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: eab1358602 [formerly 8b19b3601a] [formerly 06d6961c0f] [formerly eab1358602 [formerly 8b19b3601a] [formerly 06d6961c0f] [formerly 0699041518 [formerly 06d6961c0f [formerly ad4a8cfbbc6de72810492c8f1de9701d381b6019]]]]
Former-commit-id: 0699041518
Former-commit-id: 29ce7781c9 [formerly 86bf2b5ea0] [formerly eb5b00071037510aefc04c8c20411cc18c44abb0 [formerly 260d0beddc]]
Former-commit-id: 41d01092799ccea952f65c9d6b66d93b56557541 [formerly d96b56c91a]
Former-commit-id: 7b2683532a
2014-04-09 09:31:12 -05:00
Brian.Dyke
ae3f5dbff6 Merged 1354 -5 and -6 into 1412 based on 1411-25
Former-commit-id: 2eec862ebb [formerly 17477e7db1] [formerly 6a28fcb156] [formerly 2eec862ebb [formerly 17477e7db1] [formerly 6a28fcb156] [formerly dd98c213c7 [formerly 6a28fcb156 [formerly 407b42b0eff676a95483e219d6be899e45effd6c]]]]
Former-commit-id: dd98c213c7
Former-commit-id: 8ba2694d8e [formerly 47d9095211] [formerly 637b118d4cff6a2a054282ce2aabc47a5819c54c [formerly 9f37f61cf8]]
Former-commit-id: a50a2cebaea771c45178ef7f0d701260c24962c6 [formerly be574897cc]
Former-commit-id: 39b5e7fe67
2014-04-04 12:57:32 -04:00
David Friedman
8ea6e0b064 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: ee37afaf7b [formerly 32a7adbe4b] [formerly fd900e38c2] [formerly ee37afaf7b [formerly 32a7adbe4b] [formerly fd900e38c2] [formerly f146c7bcd0 [formerly fd900e38c2 [formerly cf35c1870fc4b6b3c2ceaf038274c4701f8046b1]]]]
Former-commit-id: f146c7bcd0
Former-commit-id: 1e4ac84f99 [formerly 1168a3eae5] [formerly 06e6f2e7e7ae2f1959eaefcb5e76c2a04c33de99 [formerly 533d15c863]]
Former-commit-id: beb961d5304e2c2df6afc0538bae8011c8b6f63f [formerly dde12b4fc3]
Former-commit-id: 8f8f55dd3c
2014-03-27 19:17:03 +00:00
Max Schenkelberg
bee18f29d0 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: 4bcdc9f85b [formerly 6edfb8965f] [formerly dbcbd1b560] [formerly 4bcdc9f85b [formerly 6edfb8965f] [formerly dbcbd1b560] [formerly 1854bbb477 [formerly dbcbd1b560 [formerly 51664693bd87df52acdb74d5286b61eeb06b792d]]]]
Former-commit-id: 1854bbb477
Former-commit-id: c37910a689 [formerly bff80c3ee9] [formerly 64e66813ccc56d3b7a703a331fd119c8cbcceb08 [formerly 6658c94e6e]]
Former-commit-id: ac56a95b831199d75f4f7799c88a6cd9f119118f [formerly 96bdc00728]
Former-commit-id: 83103254e7
2014-03-03 17:59:48 -06:00
Juliya Dynina
f5a8116a91 Merge "ASM #114" into asm_14.2.2
Former-commit-id: dd71746c6f [formerly 3edd73f78c] [formerly 575ed3610d] [formerly dd71746c6f [formerly 3edd73f78c] [formerly 575ed3610d] [formerly c6253811e8 [formerly 575ed3610d [formerly d719e88d510424020955f06d8b597d2df3573836]]]]
Former-commit-id: c6253811e8
Former-commit-id: d191fb83af [formerly f54454f8f1] [formerly f3f8b80f5f698a4e575a4f3e5ff5b88856aa9c27 [formerly 430b9a1ace]]
Former-commit-id: 98f642b65c54a5116368dc81ddbcde695e6ba5e2 [formerly eb96dc613f]
Former-commit-id: 05ad2e4da5
2014-02-05 10:42:30 -05:00
David Friedman
226093833d ASM #110
Change-Id: I9df0f0491fa96ecb4c8f46125d987179f3aefc2f

Former-commit-id: 0372fdd6cc [formerly d36cbb2ca9] [formerly 769086c0b7] [formerly 0372fdd6cc [formerly d36cbb2ca9] [formerly 769086c0b7] [formerly e18c49ea72 [formerly 769086c0b7 [formerly c4b3411f4d5f7632e3c804316bd5959d16cc97f0]]]]
Former-commit-id: e18c49ea72
Former-commit-id: b5ae8c70c9 [formerly 0ce67592ac] [formerly e28494606e9e07a3b76cb461cbaa151022eaec7a [formerly 052e12b777]]
Former-commit-id: c8d8caa7c4052f15b2141148e2780b7ddd6971a5 [formerly 5a5c72df2f]
Former-commit-id: e73e546582
2014-01-29 20:23:55 +00:00
Michael Gamazaychikov
4888397de8 ASM #114
Change-Id: I6308422a99e66701852e3b6de6c89b756513ef02

Former-commit-id: 73deca037f [formerly 297d1cffc6] [formerly 97f9c2ea92] [formerly 73deca037f [formerly 297d1cffc6] [formerly 97f9c2ea92] [formerly 8f90c0dee2 [formerly 97f9c2ea92 [formerly 56dc40096e58fa8ae40b9f2cd6a1bd8f9dd3d35a]]]]
Former-commit-id: 8f90c0dee2
Former-commit-id: b117e710a8 [formerly 0198607fe0] [formerly 8ea9bd6aedb12599a646b4ebb3e81c3350dde192 [formerly 7d7cf7cfab]]
Former-commit-id: 85370b5fb289a43a0b50de0ecd47f600f4f09889 [formerly e478ff7fdc]
Former-commit-id: 01e92945cc
2014-01-29 10:58:18 -05:00
brian.dyke
4744c64069 merge 14.2.1-3 into asm-14.2.2
Former-commit-id: becf6322c6 [formerly 4a62e83835] [formerly f121ee384ae6474f6d0db204389a1736d5bede01 [formerly 2294c81a57]] [formerly becf6322c6 [formerly 4a62e83835] [formerly f121ee384ae6474f6d0db204389a1736d5bede01 [formerly 2294c81a57]] [formerly f10f6d4e8a [formerly 2294c81a57 [formerly a116be206fc8a24dd12610db37db6f26c65a19b0]]]]
Former-commit-id: f10f6d4e8a
Former-commit-id: ac37e2ea2e [formerly 621464ac0d] [formerly 83bf7b38976fc3a19f898b0fe2c8e7790a8d7629 [formerly e9e2eb3be0]]
Former-commit-id: ee40d762efff70a1679bc3c2641d377b51facc3b [formerly dcf5f25ed1]
Former-commit-id: ca9263003a
2014-01-27 15:27:49 -05:00
David Friedman
7dbf0d3618 Issue #114
Change-Id: I7fd218b0120fe8d8eb6ab535d6d07b40c6c0773d

Former-commit-id: 846bc47100 [formerly 6c1b1f33ee] [formerly 01d657fd50] [formerly 846bc47100 [formerly 6c1b1f33ee] [formerly 01d657fd50] [formerly fe50967163 [formerly 01d657fd50 [formerly cd136c3a57f7836606755ad9d1de7a3b8234d1d8]]]]
Former-commit-id: fe50967163
Former-commit-id: 8685594a4e [formerly 1eae25014b] [formerly f8126e54325a5b478e8e024aea02fb5815472921 [formerly 0975f982f2]]
Former-commit-id: 0604b9e27cfa960f2eeffeed42ad8f007b634e81 [formerly 6fadfec657]
Former-commit-id: 91e52302b0
2013-12-20 20:33:18 +00:00
Ben Steffensmeier
fed726dd48 Issue #2491 Remove uneeded ISerializableObject files.
Former-commit-id: 230309c25f [formerly f34bfc1e5b] [formerly c14cc609a8] [formerly 230309c25f [formerly f34bfc1e5b] [formerly c14cc609a8] [formerly cac1f07cbb [formerly c14cc609a8 [formerly fd4cc4fde9507cd9abbf394ea5823a8f315c7d55]]]]
Former-commit-id: cac1f07cbb
Former-commit-id: e03a1c1202 [formerly ce9653ab15] [formerly cbb9e5689b5ecaf7c5b0202dbf3d51fae0c0dda9 [formerly a06bdc56d6]]
Former-commit-id: 65760735e4213dff6ee5ff8730b9a56f136c8d54 [formerly 3955ac729f]
Former-commit-id: 7f38aac48c
2013-10-25 15:31:39 -05:00
Nate Jensen
344dfd805b Issue #2400 fix so active map editor is used if applicable
Change-Id: I642edc1bdc94eac871a07c26e900c2431f567ab1

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

Former-commit-id: 9b3101dd50 [formerly 906e9ad7e9] [formerly 08bd2c0241] [formerly 9b3101dd50 [formerly 906e9ad7e9] [formerly 08bd2c0241] [formerly ce457b5be4 [formerly 08bd2c0241 [formerly e4e6f46be381f83c7273d84e62d274575048aac2]]]]
Former-commit-id: ce457b5be4
Former-commit-id: 0773241c7e [formerly 450f5d063d] [formerly 2fc838a1d47b7b1629df2407f1c65f9b5a1a0317 [formerly 11c1fa94ae]]
Former-commit-id: df68e10efee18652a36d5b86894795a3c32a86c8 [formerly 1150d848e4]
Former-commit-id: 1c84ac6a75
2013-09-18 17:33:20 -05:00
Max Schenkelberg
76be1e8862 Issue #2277 Switched DataCubeContainer calls to not use ScriptCreator
Amend: Added comments as requested

Change-Id: Ib787d43638f20babfc7f89ce2eac958e31d21c3c

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

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

Former-commit-id: c3d7a13d82 [formerly ed989ef777] [formerly bf8dba768a] [formerly c3d7a13d82 [formerly ed989ef777] [formerly bf8dba768a] [formerly 057d7b9381 [formerly bf8dba768a [formerly eac729a60aab70e4940c03d8aba5e7dee0072b59]]]]
Former-commit-id: 057d7b9381
Former-commit-id: db3eae719a [formerly 6da772b60f] [formerly 13a5cc7c8f0fd537a7a6d9f6ffc35954d0a16270 [formerly 96d9c53cc9]]
Former-commit-id: 01cf5f2bf449eee21e90304fc2eaa6a50fb9c5a6 [formerly 9749a982dd]
Former-commit-id: 25175b982c
2013-08-29 13:20:56 -05:00
Richard Peter
e6a36eb12a 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: 181df35afc [formerly 1f32ef9c7a] [formerly 5e5047cc4f] [formerly 181df35afc [formerly 1f32ef9c7a] [formerly 5e5047cc4f] [formerly 2a9276c728 [formerly 5e5047cc4f [formerly e1aa1aa51e2325b005604aa971e842bccfcd8375]]]]
Former-commit-id: 2a9276c728
Former-commit-id: 84bef1f2ec [formerly c0b0eef331] [formerly 9c1694fcc8344cffbdb2feb402c25389a357d414 [formerly db7c941f6f]]
Former-commit-id: 45b98e41300d826058702743e6eeb0852aa1ad89 [formerly 9cf5e247ab]
Former-commit-id: 42c78326f1
2013-08-14 15:23:18 -05:00
Steve Harris
a338706fa4 13.5.1-14 baseline
Former-commit-id: c6465a3398 [formerly b848317203] [formerly d695e5debe] [formerly c6465a3398 [formerly b848317203] [formerly d695e5debe] [formerly 80e5f7fbd4 [formerly d695e5debe [formerly fe7b1a704ee92b34684e4f9059bd61cfa28dd485]]]]
Former-commit-id: 80e5f7fbd4
Former-commit-id: 4e75333155 [formerly 9bd983e2fe] [formerly 979d519294a0cce041889e9000a739088fbe1b71 [formerly cd5b1e9e2f]]
Former-commit-id: d8f0e84b19aec7b3ded8283169da1f9631e8d68a [formerly 0f3ffc3892]
Former-commit-id: f4262380d6
2013-08-14 10:07:41 -04:00
Richard Peter
1d08e54d43 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: 19dacc32c1 [formerly 401ed88e44] [formerly 15d1a6eab0] [formerly 19dacc32c1 [formerly 401ed88e44] [formerly 15d1a6eab0] [formerly c6386e306f [formerly 15d1a6eab0 [formerly 293586df88f53c2ddf6f7586bf71719298728022]]]]
Former-commit-id: c6386e306f
Former-commit-id: 4c53471f8e [formerly e7ec068c7e] [formerly e1fa5bd1d05a5aa1d607bb1e33e99826fc290d81 [formerly 12993d9539]]
Former-commit-id: 468a024f2957450aa44633c7888eb3aad2011b85 [formerly 85fc9c773b]
Former-commit-id: 2a9cfe51af
2013-07-22 09:40:18 -05:00