Commit graph

2368 commits

Author SHA1 Message Date
Nate Jensen
5d533a8026 Issue #2361 remove ISerializableObject for hydro colors
Change-Id: Icc4a1e2ebff06ff389e95563406176663000ad7c

Former-commit-id: 472c2693c4 [formerly 0fe5979eac] [formerly 472c2693c4 [formerly 0fe5979eac] [formerly 83fafc638b [formerly f23474913e08b34d1eb82e2106549f57fd36538c]]]
Former-commit-id: 83fafc638b
Former-commit-id: 91ddf05a6b [formerly 7fb250b184]
Former-commit-id: 2e6998e999
2013-10-10 10:57:59 -05:00
Steve Harris
2dc7de0754 13.5.2-9 baseline
Former-commit-id: fdbef0e663 [formerly a28a2d3041] [formerly fdbef0e663 [formerly a28a2d3041] [formerly f36cf09d21 [formerly 948fc5e8cbbb6fa563e871417e455638fcbe154f]]]
Former-commit-id: f36cf09d21
Former-commit-id: 7d0416293f [formerly 45c58e1cb3]
Former-commit-id: be3a804cf5
2013-10-10 10:55:20 -04:00
Lee Venable
04c2ea53e9 Issue #2464 - fixed font memory leak.
Former-commit-id: e3f44d751a [formerly 1a693c5d35] [formerly e3f44d751a [formerly 1a693c5d35] [formerly e1adc2e4be [formerly eceb0ab9c7ddc0d28d5452d9bf77888b9e58a9ac]]]
Former-commit-id: e1adc2e4be
Former-commit-id: 1b9ed84e9c [formerly b98e10fe06]
Former-commit-id: b4ceef0f22
2013-10-10 09:48:55 -05:00
Slav Korolev
3271455caf Issue #2427. Fixed memory leak for images
Former-commit-id: 5dcf4a00bc [formerly 012497bfef] [formerly 5dcf4a00bc [formerly 012497bfef] [formerly f0aba7be10 [formerly 770bfd43e07cd92c2c8a3d7b3d1a07eb6d8b1052]]]
Former-commit-id: f0aba7be10
Former-commit-id: 09f00e1d81 [formerly 0b08d2bb0e]
Former-commit-id: 001a2d3cfc
2013-10-10 09:34:24 -04:00
Brad Gonzales
af191df5cf Issue #2267 Fixed exceptions in casts of Collections to Lists. Fixed WMO header cr and lf format. Removed statsTemplate from modes.
Change-Id: I601b306bf944d959da05af9277ba80e184d98e30

Former-commit-id: 59f22b866a [formerly 73e757c284] [formerly 59f22b866a [formerly 73e757c284] [formerly 61448cc04a [formerly f776626738e4cc995bb16e87b8da66ff90289bd8]]]
Former-commit-id: 61448cc04a
Former-commit-id: aff77aa148 [formerly 55d242b86d]
Former-commit-id: b24299e301
2013-10-09 17:58:12 -05:00
Lee Venable
965c691200 Issue #2447 - fixed color memory leak.
Former-commit-id: 91cafa3d45 [formerly 527f88ddac] [formerly 91cafa3d45 [formerly 527f88ddac] [formerly 8d341f499d [formerly fe59f0923caa13c089edb683611b986522476539]]]
Former-commit-id: 8d341f499d
Former-commit-id: 481bc0875e [formerly 717ba7e08e]
Former-commit-id: 409370108d
2013-10-09 10:07:37 -05:00
Richard Peter
372b951488 Merge "Issue #2442 Case creation no longer contains category directory." into omaha_13.5.3
Former-commit-id: a7a3df7894 [formerly 2822583c3d] [formerly a7a3df7894 [formerly 2822583c3d] [formerly d409715b41 [formerly 68f0f992a67d4fd523cf91b492fd9c2c56573f65]]]
Former-commit-id: d409715b41
Former-commit-id: 2e4f22c5f0 [formerly c0a36a1f5c]
Former-commit-id: eefd87ec34
2013-10-08 14:32:28 -05:00
Richard Peter
bc32641181 Merge branch 'omaha_13.5.3' (13.5.2-8) into development
Conflicts:
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/comm/JMSConnection.java
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/localization/LocalizationInitializer.java
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/localization/LocalizationManager.java
	cave/com.raytheon.uf.viz.thinclient/src/com/raytheon/uf/viz/thinclient/localization/ThinClientLocalizationInitializer.java
	edexOsgi/build.edex/esb/conf/spring/edex.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/cache/d2dparms/D2DParmIdCache.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFEDao.java
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodAdvisoryFollowup_Zones.vm
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodAdvisoryFollowup_Zones.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodAdvisory_Zones.vm
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodAdvisory_Zones.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodWarningFollowup_Zones.vm
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodWarningFollowup_Zones.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodWarning_Zones.vm
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodWarning_Zones.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/customTemplate.vm
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/customTemplate.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/ffwfaw.vm
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/ffwfaw.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/flashFloodWarningFollowup_Zones.vm
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/flashFloodWarningFollowup_Zones.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/flashFloodWarning_Zones.vm
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/flashFloodWarning_Zones.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/nonConvectiveFlashFloodWarningFollowup_Zones.vm
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/nonConvectiveFlashFloodWarningFollowup_Zones.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/nonConvectiveFlashFloodWarning_Zones.vm
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/nonConvectiveFlashFloodWarning_Zones.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/sws_county.vm
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/sws_county.xml

Change-Id: I1006c3ccd0f643cc673813c4305470fd006da371

Former-commit-id: f141fdd5ab [formerly 9adbe25ceb] [formerly f141fdd5ab [formerly 9adbe25ceb] [formerly b6395cc834 [formerly 687a47c58a0db2bb82328ffd4e36e7b3fabca542]]]
Former-commit-id: b6395cc834
Former-commit-id: 0e7dccd18f [formerly 3abe952ca0]
Former-commit-id: 1895c9f914
2013-10-08 10:59:50 -05:00
Roger Ferrel
1759da2158 Issue #2438 Changes to properly load and save retentions times.
Change-Id: I05a516f1728ad3340547d43da025c6227d7b5551

Former-commit-id: a393894c67 [formerly d0f7e12518] [formerly a393894c67 [formerly d0f7e12518] [formerly 0ee16e8524 [formerly c3a887ca435140ec8cd944da1afa417ad45ea3c6]]]
Former-commit-id: 0ee16e8524
Former-commit-id: fd96bef170 [formerly 1ba0b3f411]
Former-commit-id: 1784d0d0c0
2013-10-08 10:48:42 -05:00
Roger Ferrel
02b928ac75 Issue #2442 Case creation no longer contains category directory.
Change-Id: I1a3e87ed613923f1b1420e347ebf3db31f289bd0

Former-commit-id: 05f6e752f1 [formerly e8417dec61] [formerly 05f6e752f1 [formerly e8417dec61] [formerly db49df3fa3 [formerly f008a95f617258d429a94d135664e8caf6ba1743]]]
Former-commit-id: db49df3fa3
Former-commit-id: 5843250e09 [formerly 6aaf813365]
Former-commit-id: 52d4a96b80
2013-10-08 09:47:19 -05:00
Richard Peter
d321c61259 Merge branch 'master_13.5.3' (13.5.2-8) into omaha_13.5.3
Conflicts:
	ncep/gov.noaa.nws.ncep.edex.plugin.stormtrack/res/spring/stormtrack-ingest.xml
	rpms/awips2.qpid/0.18/SOURCES/wrapper.conf

Former-commit-id: f0c05dc6d8 [formerly 31c87ab01e] [formerly f0c05dc6d8 [formerly 31c87ab01e] [formerly d9eae3ea28 [formerly 3ffd20d6abb05be289fb94513e78c0137f566a53]]]
Former-commit-id: d9eae3ea28
Former-commit-id: 94d0913bd9 [formerly f4b47dda50]
Former-commit-id: 33b4f0c247
2013-10-08 09:45:27 -05:00
Lee Venable
e2b44eac03 Issue #2443 - fixed image memory leak.
Former-commit-id: 1021c25d9d [formerly 0bacce33bc] [formerly 1021c25d9d [formerly 0bacce33bc] [formerly 47f8200757 [formerly fccb24f5834dd746f6868b4390e3c17dd12dc729]]]
Former-commit-id: 47f8200757
Former-commit-id: 03c4e9a287 [formerly cd63ee8644]
Former-commit-id: 162df3c8d2
2013-10-08 09:39:00 -05:00
Richard Peter
54dc5aa82c Merge "Issue #1797 Separation of gridded time and abstract time object Change-Id: I9d84942140e52ec0fded1a9150d7016dec8eaf63" into development
Former-commit-id: 9d424c212b [formerly 2e062048e1] [formerly 9d424c212b [formerly 2e062048e1] [formerly e2c7bb21d7 [formerly 204c2034a08cd69fc7286639f37e5ff936ecf49e]]]
Former-commit-id: e2c7bb21d7
Former-commit-id: 80dd506d10 [formerly e43cd4b397]
Former-commit-id: 7ef56bfc43
2013-10-07 16:19:11 -05:00
Lee Venable
db4f3fd35a Merge "Issue #2437 - fixed color memory leak." into development
Former-commit-id: 3bfe4bf45c [formerly 5081bbd0ab] [formerly 3bfe4bf45c [formerly 5081bbd0ab] [formerly b1d02c6a49 [formerly b7691a4e940cc3461a39cce871c6de15110bf1d1]]]
Former-commit-id: b1d02c6a49
Former-commit-id: ee63fc9004 [formerly 4060fa7e0b]
Former-commit-id: 13a8614130
2013-10-07 14:13:56 -05:00
Lee Venable
61201849dd Merge "Issue #2421 optimize color map loading. Change-Id: I871ddf0f3eabee0e27d858e2cfa897563875c304" into development
Former-commit-id: f94bcf4776 [formerly eeee5c7948] [formerly f94bcf4776 [formerly eeee5c7948] [formerly c01eb85e53 [formerly 7139b6fe32b6de8c87c96e3b55d6ad83f11b149a]]]
Former-commit-id: c01eb85e53
Former-commit-id: 18bbfeb4cb [formerly 72a6650958]
Former-commit-id: f34b07d207
2013-10-07 13:56:50 -05:00
Lee Venable
d07fc36b0c Issue #2437 - fixed color memory leak.
Former-commit-id: 615fcc7f8e [formerly 604f8f86a4] [formerly 615fcc7f8e [formerly 604f8f86a4] [formerly a4be7633a6 [formerly f081bea82ced5931f8424d51994571d5a9971cfe]]]
Former-commit-id: a4be7633a6
Former-commit-id: 046a0a764d [formerly b3efbb97c1]
Former-commit-id: 27a4e1ef75
2013-10-07 13:55:54 -05:00
Ben Steffensmeier
32cd056472 Issue #2421 optimize color map loading.
Change-Id: I871ddf0f3eabee0e27d858e2cfa897563875c304

Former-commit-id: bae5c951d4 [formerly f4c616fbff] [formerly bae5c951d4 [formerly f4c616fbff] [formerly 4e998f2576 [formerly ce15657bc794afe819d729121bc202b4f43b97d6]]]
Former-commit-id: 4e998f2576
Former-commit-id: 8428550b79 [formerly 76c73c10af]
Former-commit-id: 1f1f157c17
2013-10-07 12:04:19 -05:00
Bryan Kowal
ed95cf88b9 Merge "Revert "Issue #2033 - pde and rpm build updates"" into development
Former-commit-id: 6e05c00981 [formerly 0698d28222] [formerly 6e05c00981 [formerly 0698d28222] [formerly 82d61b53d4 [formerly 0fb325bd5a463c243b807fbe44d2499bc7fc814c]]]
Former-commit-id: 82d61b53d4
Former-commit-id: 5cd20aed43 [formerly 551b501e2e]
Former-commit-id: d0c79c347c
2013-10-07 11:52:58 -05:00
Lee Venable
7ac56a3b59 Merge "Issue #2436 - disposed of the sort color" into development
Former-commit-id: 0eff818ede [formerly c1991c5c66] [formerly 0eff818ede [formerly c1991c5c66] [formerly 7bd1fec82e [formerly a087a06f19df47edc2b818d2f68e2eff5aab2b50]]]
Former-commit-id: 7bd1fec82e
Former-commit-id: a55d310ebe [formerly bdd28e1e09]
Former-commit-id: 9d07c6428b
2013-10-07 09:30:45 -05:00
Nate Jensen
3d36bc8ee5 Merge "Issue #2361 Get common.monitor plugin away from using global JAXB context and ISerializableObject" into development
Former-commit-id: be1385b705 [formerly adc774bee9] [formerly be1385b705 [formerly adc774bee9] [formerly c36c50d189 [formerly a686d702002a5e01389be1fd5e72558239687080]]]
Former-commit-id: c36c50d189
Former-commit-id: 01997dd1fb [formerly 10ba6f231a]
Former-commit-id: 315026f786
2013-10-07 09:30:31 -05:00
Lee Venable
b0af7745a6 Issue #2436 - disposed of the sort color
Former-commit-id: 8c8adf8be6 [formerly 9c97908f36] [formerly 8c8adf8be6 [formerly 9c97908f36] [formerly c4ddd46b44 [formerly 4545de35a0fdbfc5817a8725bf07ae0c405efb39]]]
Former-commit-id: c4ddd46b44
Former-commit-id: 2ed106cac4 [formerly 46db8998a6]
Former-commit-id: 1000147d0c
2013-10-07 09:11:25 -05:00
Dave Hladky
ab9c5af250 Issue #1797 Separation of gridded time and abstract time object
Change-Id: I9d84942140e52ec0fded1a9150d7016dec8eaf63

Former-commit-id: 4d4d93fc0a [formerly e0ec10d073] [formerly 4d4d93fc0a [formerly e0ec10d073] [formerly 1733834e74 [formerly cdf2b6dd5a5b4a12cf12e6d4d254b5e40acfcef5]]]
Former-commit-id: 1733834e74
Former-commit-id: 21239525ea [formerly 89c341509c]
Former-commit-id: 3ba8fd56f7
2013-10-04 10:36:27 -05:00
Steve Harris
e1f7463a41 13.5.2-8 baseline
Former-commit-id: 8ba7d392d6 [formerly 94aa71fcd1] [formerly 8ba7d392d6 [formerly 94aa71fcd1] [formerly 18325949fb [formerly 6effdd3f5ce46910c89236306fa33499eada174f]]]
Former-commit-id: 18325949fb
Former-commit-id: 21b84f0290 [formerly d89fbf73d9]
Former-commit-id: 088eb89ca7
2013-10-04 11:30:03 -04:00
Bryan Kowal
07a882ac48 Revert "Issue #2033 - pde and rpm build updates"
Undo copying localization into etc at build time.

This reverts commit 2cda5c37636a512f1a9ef3de04b0dac3ca31e120 [formerly 9a77e3553a] [formerly 33a9270304 [formerly 6023c61bca] [formerly 33a9270304 [formerly 6023c61bca] [formerly 9a77e3553a [formerly dbdb2fc2b0bb6e2354a089fab0ffcaa924c398a1]]]].


Former-commit-id: a75ed2b079 [formerly bb2e914c00] [formerly a75ed2b079 [formerly bb2e914c00] [formerly 9d47e7565d [formerly f735b7bb3a0e23389be086d3582a2e0afdc95515]]]
Former-commit-id: 9d47e7565d
Former-commit-id: d4eba48f94 [formerly 4d08d7a1c3]
Former-commit-id: 2f6791dc19
2013-10-04 09:47:59 -05:00
Mike Duff
6a1030a923 Issue #2375 - Fix for set number of rows in notification center
Change-Id: I9f8b937265e77c9777313225ab83f71a81b46994

Former-commit-id: 80081ff25b [formerly 865b5f6878] [formerly 80081ff25b [formerly 865b5f6878] [formerly d258009cc7 [formerly 74327c92303fe846d7333d8760652dbcace2d45f]]]
Former-commit-id: d258009cc7
Former-commit-id: 2261f9ff61 [formerly 81bd77e56d]
Former-commit-id: 96df3a4989
2013-10-04 09:27:30 -05:00
Richard Peter
19e860f9a8 Merge "Issue #2390 update grib decoder and vb to handle new storm surge parameters. Change-Id: I03a079fc06a922f693609e51df79e4d78cb4f209" into development
Former-commit-id: f52fdf1916 [formerly 5adf4298ef] [formerly f52fdf1916 [formerly 5adf4298ef] [formerly bc3843dc75 [formerly 3d09c6dedbaaa0db6b2247832a45bde8a1357786]]]
Former-commit-id: bc3843dc75
Former-commit-id: 8694f13766 [formerly f7a7228e09]
Former-commit-id: 2af4638a97
2013-10-03 16:57:39 -05:00
Ben Steffensmeier
8187fb1fa8 Issue #2390 update grib decoder and vb to handle new storm surge parameters.
Change-Id: I03a079fc06a922f693609e51df79e4d78cb4f209

Former-commit-id: 7f7aa20d0a [formerly 236b3fe05f] [formerly 7f7aa20d0a [formerly 236b3fe05f] [formerly 8f94e1434c [formerly 6de5f10b9abf900fc412f2b1e867ce339a15d41e]]]
Former-commit-id: 8f94e1434c
Former-commit-id: 69eec8d4c6 [formerly d4670d19b1]
Former-commit-id: 9a0a15ffd8
2013-10-03 16:30:13 -05:00
Nate Jensen
3a28687ca2 Issue #2361 Get common.monitor plugin away from using global JAXB context and ISerializableObject
Change-Id: Ic5e4926d97629e9f43990d1585da59eb7ef30650

Former-commit-id: ee134db130 [formerly 3f24b9e424] [formerly ee134db130 [formerly 3f24b9e424] [formerly 42fee320ab [formerly e574d96b347d79fe7aaa0f8dded8c93af1191fdd]]]
Former-commit-id: 42fee320ab
Former-commit-id: 82e0af6a9c [formerly 160d1fbb01]
Former-commit-id: 25bdea7759
2013-10-03 15:18:55 -05:00
Roger Ferrel
7bb7770fbf Issue #2326 Added user roles for Archive case and retention.
Change-Id: If1261bdb14f083f1b9cd565f6382db6213a94967

Former-commit-id: c959cedd99 [formerly 7f7064d457] [formerly c959cedd99 [formerly 7f7064d457] [formerly 42705e4dfa [formerly 07785f02c3edbfd46154d9864272b58e92b26cd6]]]
Former-commit-id: 42705e4dfa
Former-commit-id: 220769dab0 [formerly 4c27adcc53]
Former-commit-id: 029eec5dc4
2013-10-03 12:33:26 -05:00
Max Schenkelberg
6e5873733e Issue #2333 Refactored satellite to store table values in CRS space instead of lat/lon for GOES-R readiness
Amend: Accepted ticket.

Change-Id: Ib8171694869f60b46fb38634e71de61eb0e76830

Former-commit-id: 780ac0129f [formerly e3f6b1ea21] [formerly 780ac0129f [formerly e3f6b1ea21] [formerly 866c851b47 [formerly 384b8e6a02d4fffa0688993b2a2b53e974ecf493]]]
Former-commit-id: 866c851b47
Former-commit-id: 43b7cb3107 [formerly ba25f56dbe]
Former-commit-id: 80efdbb2b4
2013-10-03 11:43:26 -05:00
Ben Steffensmeier
938ace6bae Issue #2363 Add more vector configuration optons.
Change-Id: I1a3e564629b9e4afe93a0a4ceee8e57681aa0644

Former-commit-id: 860258e49c [formerly ff06ea1c5a] [formerly 860258e49c [formerly ff06ea1c5a] [formerly 20853f7333 [formerly 8af298f9ef2c1c03e6be690c07829d0569b1dedd]]]
Former-commit-id: 20853f7333
Former-commit-id: bf0642450c [formerly 6c7c693581]
Former-commit-id: baa1ddd596
2013-10-03 10:36:47 -05:00
Bryan Kowal
767466a8fe Issue #2295 - CAVE updates for ALR
- Amend: relocated qpid connection string comment
- Amend: replaced stacktrace printing with UFStatus
- Amend: removed unused code
- Amend: ThinClientNoficationManagerJob JavaDoc

Change-Id: I091aa29700378149e8eb09dcd11cdfc020e96c76

Former-commit-id: 4342c463b2 [formerly aa8691edfd] [formerly 4342c463b2 [formerly aa8691edfd] [formerly 4e4405b0f5 [formerly 5a76eabc142619df4c8454c3f2fe93f5283346db]]]
Former-commit-id: 4e4405b0f5
Former-commit-id: 6c60d06f9f [formerly a727bf3927]
Former-commit-id: 4ce26acc3b
2013-10-02 15:49:17 -05:00
Ben Steffensmeier
ff28df9bbc Issue #2404 move grid reprojection style rules to common.
Former-commit-id: a95f0dbac4 [formerly a75361ad34] [formerly a95f0dbac4 [formerly a75361ad34] [formerly 32a01070f9 [formerly 2a81f5fe8e38e6e6c6476586b1df09d8ab01d1fa]]]
Former-commit-id: 32a01070f9
Former-commit-id: 95b1c01650 [formerly 59d7c79c20]
Former-commit-id: dc4c07c194
2013-10-02 10:33:23 -05:00
Roger Ferrel
efde4f9297 Issue #2147 Changes to allow option hour field in category tag and change to Retentions end time.
Change-Id: I7f878a0e71c0989e41aaf943b1520c93f45f1859

Former-commit-id: 2ba7117d13 [formerly a76fc08e93] [formerly 2ba7117d13 [formerly a76fc08e93] [formerly e65b8a9f6e [formerly 6a6159e07eddbac712e4696023c464d58ad250f7]]]
Former-commit-id: e65b8a9f6e
Former-commit-id: 34ea90f18a [formerly 71737f069d]
Former-commit-id: 0d86e00182
2013-10-01 16:36:34 -05:00
Nate Jensen
580f3be05d Merge "Issue #2361 Get some of GFE away from using the global JAXB context, and in the process refactored JAXBManager" into development
Former-commit-id: 68c8f9addd [formerly 265b6e7e61] [formerly 68c8f9addd [formerly 265b6e7e61] [formerly 6cd79464ef [formerly 33899872714e8b945131bc17eab63bc71af38d37]]]
Former-commit-id: 6cd79464ef
Former-commit-id: c4018373f1 [formerly 64d66cf406]
Former-commit-id: ff27201982
2013-10-01 15:19:56 -05:00
Richard Peter
86c28e6e16 Merge branch 'omaha_13.5.3' (13.5.2-7) into development
Conflicts:
	cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/D2DGridResource.java

Change-Id: Ie8cbc10d06805616c05a5d5b52cd725a56f9cf50

Former-commit-id: 75b0f19d87 [formerly bb9488bb92] [formerly 75b0f19d87 [formerly bb9488bb92] [formerly f4e71b65d3 [formerly 724a8c87ab8aa880dab45a0a743c3b9d6ace4e2e]]]
Former-commit-id: f4e71b65d3
Former-commit-id: 3514194d3b [formerly 39ae6d437d]
Former-commit-id: ddf07f8030
2013-10-01 15:06:34 -05:00
Richard Peter
32dd0fedc1 Merge branch 'master_13.5.3' (13.5.2-7) into omaha_13.5.3
Conflicts:
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/PortionsUtil.java
	edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/mileMarkers.vm
	edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/mileMarkers.xml

Former-commit-id: 984785ce5e [formerly e45689dbc7] [formerly 984785ce5e [formerly e45689dbc7] [formerly add32a774f [formerly b118718cd8766cf83df1a02079f92636964ca09e]]]
Former-commit-id: add32a774f
Former-commit-id: aa2eda2c38 [formerly c178e4543a]
Former-commit-id: 06737e3fa2
2013-10-01 14:22:33 -05:00
Nate Jensen
0c92f4eca1 Issue #2361 Get some of GFE away from using the global JAXB context, and in the process refactored JAXBManager
Change-Id: I83c36ee235066aa57da88f09090470bce84679f7

Former-commit-id: f529c077c6 [formerly effa4f4f26] [formerly f529c077c6 [formerly effa4f4f26] [formerly 3e7dc7782f [formerly f8d8a0033729878c8c6d94c00fd861ddc81f9d96]]]
Former-commit-id: 3e7dc7782f
Former-commit-id: e1c35952c9 [formerly 4e6f5afc57]
Former-commit-id: 593700bd28
2013-10-01 11:25:45 -05:00
Lee Venable
027e9179a5 Issue #2420 - fixed font memory leak in the setFont method
Change-Id: Ibf773c6df580cb65dd62b46f8fd127fde6585a57

Former-commit-id: e18b0d7e6a [formerly 44d9e12d98] [formerly e18b0d7e6a [formerly 44d9e12d98] [formerly 9c159e7c40 [formerly 16effa6f2cda60d566e5f820ab517ed105a0894e]]]
Former-commit-id: 9c159e7c40
Former-commit-id: e5861dabc3 [formerly 39cf74adf1]
Former-commit-id: 238d4fa030
2013-09-30 14:31:46 -05:00
Nate Jensen
622563303e Merge "Issue #2400 fix so active map editor is used if applicable" into development
Former-commit-id: 1825bea2cb [formerly c5d223ade8] [formerly 1825bea2cb [formerly c5d223ade8] [formerly 7da1197e7a [formerly 288acb25b23972bda06795bd02e2de973d4b170b]]]
Former-commit-id: 7da1197e7a
Former-commit-id: 40eb34ac41 [formerly 3e9afe9bab]
Former-commit-id: 2ce522854c
2013-09-30 13:10:08 -05:00
Greg Armendariz
03eee46e44 Merge "Issue #2033 - pde and rpm build updates" into development
Former-commit-id: 14fda3ff05 [formerly 32349a807b] [formerly 14fda3ff05 [formerly 32349a807b] [formerly 4c838ad045 [formerly c39016a5ce3f12e960b2419a8e3a7df6523791a3]]]
Former-commit-id: 4c838ad045
Former-commit-id: 660f7bb52f [formerly ab4c07dfdc]
Former-commit-id: 926e15025f
2013-09-30 12:11:59 -05:00
Steve Harris
79d71e33d0 13.5.2-7 baseline
Former-commit-id: b5cb693619 [formerly 0f8fc513bf] [formerly b5cb693619 [formerly 0f8fc513bf] [formerly a212c30bd7 [formerly dace09a228fa4bef6bddc1388f12d35adcbd7543]]]
Former-commit-id: a212c30bd7
Former-commit-id: 06ba0dbf6c [formerly 02d6145782]
Former-commit-id: 5e4023b974
2013-09-30 13:05:31 -04:00
Nate Jensen
8b62ea092a Issue #2400 fix so active map editor is used if applicable
Change-Id: I642edc1bdc94eac871a07c26e900c2431f567ab1

Former-commit-id: 58c9aced4e [formerly 8e9e495149] [formerly 58c9aced4e [formerly 8e9e495149] [formerly c1dd4b40fb [formerly 563212924964f8ca66cba789d7867b19c68d0682]]]
Former-commit-id: c1dd4b40fb
Former-commit-id: 81f5ecb21a [formerly 136ea71235]
Former-commit-id: 726f38c27f
2013-09-30 11:47:26 -05:00
Mike Duff
9dd740eeee Issue #2417 - Fix the highlight all button in the notification center's find dialog
Change-Id: Ia39e049045116a4766ed989612f6ab9a3d994efd

Former-commit-id: a966d4ce97 [formerly 43e2b5c156] [formerly a966d4ce97 [formerly 43e2b5c156] [formerly b0fac5792b [formerly 01d92017a3db5aafc4b6d6a9f00abbf64481cfe7]]]
Former-commit-id: b0fac5792b
Former-commit-id: 095a9161f4 [formerly 708f60d5c0]
Former-commit-id: e66ae68770
2013-09-30 09:40:08 -05:00
Lee Venable
a9e6005dd2 Issue #2419 - fixed issue with DualList and how it was being used.
Former-commit-id: ae23948831 [formerly 0758d67964] [formerly ae23948831 [formerly 0758d67964] [formerly 9c02d45802 [formerly 7020ca52e6e22a68013de74bc9891ad44942c48a]]]
Former-commit-id: 9c02d45802
Former-commit-id: abb0b0a7f1 [formerly b9fd15122e]
Former-commit-id: 87be8618c4
2013-09-27 15:07:02 -05:00
Brian Clements
6cb6d468fe Issue #2404 Moved colormap parameter factory to common
moved grid level translator from viz to common
updated references to moved classes
created grid style util for common styling code
updated style manager to look in common for files
moved data plugin style rules to common


Former-commit-id: 4c5d2b051d [formerly 2f25116c10] [formerly 4c5d2b051d [formerly 2f25116c10] [formerly 75448f8a42 [formerly 7cdff04cc4d60b50a2a2c08499ee329586031e0f]]]
Former-commit-id: 75448f8a42
Former-commit-id: fedd0dc781 [formerly e8cc15940c]
Former-commit-id: 0ba625fbe6
2013-09-27 09:41:51 -05:00
Nate Jensen
a3cfe6903a Merge "Issue #2386 Backend work for adding multiple types to Subscription overlap rules Change-Id: I0779dc7987031999b80ab0859c7f33dca20a5c17" into development
Former-commit-id: 51bf49f6b5 [formerly 291cd53426] [formerly 51bf49f6b5 [formerly 291cd53426] [formerly c40bedaaf9 [formerly 9f24ff56dd91286c02ef168be4d4b36efe67f497]]]
Former-commit-id: c40bedaaf9
Former-commit-id: daff685991 [formerly a865c6b706]
Former-commit-id: e5d98833b1
2013-09-27 09:39:54 -05:00
Richard Peter
88968d426f Merge "Issue #2413 - Added isDirty check to new config for Data Browser Peer review comments" into development
Former-commit-id: a7f13c41ae [formerly 2257278313] [formerly a7f13c41ae [formerly 2257278313] [formerly 1f40a40449 [formerly bedacaf43bb65ed3cfbf2aff57cd8839f8df4815]]]
Former-commit-id: 1f40a40449
Former-commit-id: 84c5ae8313 [formerly a87a85f3af]
Former-commit-id: 795a14d55b
2013-09-26 15:23:54 -05:00
Mike Duff
980ac20a35 Issue #2413 - Added isDirty check to new config for Data Browser
Peer review comments

Change-Id: I920fb093aea05ca985e1429671b94e34279a1af2

Former-commit-id: ab857adda8 [formerly 9d95942ad1] [formerly ab857adda8 [formerly 9d95942ad1] [formerly 8a325f1af7 [formerly 56d7387b481a2ed6c6647130ad75eae22e319928]]]
Former-commit-id: 8a325f1af7
Former-commit-id: 65fc907fa9 [formerly 5a62dad000]
Former-commit-id: e0dca1d286
2013-09-26 15:18:42 -05:00
Mike Duff
6598f68ff0 Issue #2410 - Fix loading of notification center's filter config file
Change-Id: I0bc9557d0eb0a8f5de40a45064cba031f7839fbd

Former-commit-id: a9ec223319 [formerly 83064b2bd7] [formerly a9ec223319 [formerly 83064b2bd7] [formerly d29beb9d8d [formerly 96b4c904497ffc99d57949455b96025c658ae9c7]]]
Former-commit-id: d29beb9d8d
Former-commit-id: 8f89d25fc2 [formerly c2f6f46ece]
Former-commit-id: 79bcf798a2
2013-09-26 15:08:30 -05:00