Commit graph

2326 commits

Author SHA1 Message Date
Richard Peter
1f772816de Merge "Issue #2386 - Implement the front end for multiple data type overlap rules Peer review comments" into development
Former-commit-id: c056c93104 [formerly 581cc8e7319216c910e71936820f7414d2281fed]
Former-commit-id: d8b49516dc
2013-10-14 11:15:40 -05:00
Mike Duff
c4e501aaf9 Issue #2386 - Implement the front end for multiple data type overlap rules
Peer review comments

Change-Id: I1f0186b3e08f3013a6dc4dc3dbf7c2e0a19404bf

Former-commit-id: a69120c623 [formerly 69a5242579fdeacceba5ed2ce73be01e671328ae]
Former-commit-id: a220ff05b0
2013-10-11 18:18:18 -05:00
Lee Venable
16e5a0223a Merge "Issue #2471 - fixed color memory leak." into development
Former-commit-id: 06a38bd123 [formerly 1cb4839c1115ff4e65dcfd27377f81af7795ddd0]
Former-commit-id: 3b98dc699c
2013-10-11 13:02:35 -05:00
Nate Jensen
c6c2f50562 Merge "Issue #2104 Fixed EnvelopeIntersection issue with inverted enveloped. Fixed various bugs that prevented proper testing of XML file attached to 2104." into development
Former-commit-id: d5d0fab53b [formerly e4ef1dff4330a64ee3a01a03ca5293ae75fd2fab]
Former-commit-id: 8208d756c7
2013-10-11 11:21:18 -05:00
Lee Venable
97b3c7af6b Issue #2471 - fixed color memory leak.
Former-commit-id: 61e5d5e4da [formerly a573bacadd4d9b3ea0058bb70b348372b6a21cc9]
Former-commit-id: bceb4d76bf
2013-10-11 11:09:57 -05:00
Brad Gonzales
ac3d87c397 Issue #1797 Refactored registry Time objects to simplify serialization issues.
Amend: Removed OpenDAPRetrievalGenerator.java from the review.
       Fix GriddedTime addCycles when cycles are empty.

Change-Id: I9fa27178e5f59252cb872314493256be7f038890

Former-commit-id: bc87f2a168 [formerly a01619f78bac065e7d42e28882157778aba09b75]
Former-commit-id: 25710edd9e
2013-10-11 10:36:53 -05:00
Max Schenkelberg
b64050ff1e Issue #2104 Fixed EnvelopeIntersection issue with inverted enveloped. Fixed various bugs that prevented proper testing of XML file attached to 2104.
Amend: Accepted ticket, cleanup, comments

Change-Id: I78649dd0268b030624888544740a8d7af3e83e97

Former-commit-id: 01c0e022d5 [formerly fb196f5b8659e568ea1406cc5c5e01aa82525a76]
Former-commit-id: 7a66a3c995
2013-10-11 10:21:37 -05:00
Lee Venable
e337b90ba5 Merge "Issue #2464 - fixed font memory leak." into development
Former-commit-id: feb40aada0 [formerly 5765e3fb4ee0f7305e5ec6240caeec375dd985a9]
Former-commit-id: 3a611d3f4f
2013-10-10 15:29:28 -05:00
Lee Venable
10c5920b90 Merge "Issue #2428. Fixed memory leak for Regions" into development
Former-commit-id: 6282814c91 [formerly 29dd5dbf962cace42e38999f075aaaa57e24f3fc]
Former-commit-id: aa27b764ca
2013-10-10 15:26:04 -05:00
Nate Jensen
59e0414d4d Merge "Issue #2361 remove ISerializableObject for hydro colors" into development
Former-commit-id: c6a8eaa841 [formerly 25c12b40a85db7a4e968dccb57798aaacb089b64]
Former-commit-id: 7ca0f9a251
2013-10-10 15:07:34 -05:00
Slav Korolev
2c4730db16 Issue #2428. Fixed memory leak for Regions
Former-commit-id: 0021d53557 [formerly 899d1f6371d55056af747d8bf6dee99d0c4179c9]
Former-commit-id: cab603ba36
2013-10-10 14:09:37 -04:00
Richard Peter
e717ae510b Merge "Issue #2267 Fixed exceptions in casts of Collections to Lists. Fixed WMO header cr and lf format. Removed statsTemplate from modes." into development
Former-commit-id: d7db5d0219 [formerly 3a704d8d903afc5629a13f478af585947954b5d2]
Former-commit-id: 8f67035519
2013-10-10 11:34:11 -05:00
Nate Jensen
472c2693c4 Issue #2361 remove ISerializableObject for hydro colors
Change-Id: Icc4a1e2ebff06ff389e95563406176663000ad7c

Former-commit-id: 83fafc638b [formerly f23474913e08b34d1eb82e2106549f57fd36538c]
Former-commit-id: 0fe5979eac
2013-10-10 10:57:59 -05:00
Lee Venable
e3f44d751a Issue #2464 - fixed font memory leak.
Former-commit-id: e1adc2e4be [formerly eceb0ab9c7ddc0d28d5452d9bf77888b9e58a9ac]
Former-commit-id: 1a693c5d35
2013-10-10 09:48:55 -05:00
Slav Korolev
5dcf4a00bc Issue #2427. Fixed memory leak for images
Former-commit-id: f0aba7be10 [formerly 770bfd43e07cd92c2c8a3d7b3d1a07eb6d8b1052]
Former-commit-id: 012497bfef
2013-10-10 09:34:24 -04:00
Brad Gonzales
59f22b866a 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: 61448cc04a [formerly f776626738e4cc995bb16e87b8da66ff90289bd8]
Former-commit-id: 73e757c284
2013-10-09 17:58:12 -05:00
Lee Venable
91cafa3d45 Issue #2447 - fixed color memory leak.
Former-commit-id: 8d341f499d [formerly fe59f0923caa13c089edb683611b986522476539]
Former-commit-id: 527f88ddac
2013-10-09 10:07:37 -05:00
Richard Peter
f141fdd5ab 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: b6395cc834 [formerly 687a47c58a0db2bb82328ffd4e36e7b3fabca542]
Former-commit-id: 9adbe25ceb
2013-10-08 10:59:50 -05:00
Richard Peter
f0c05dc6d8 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: d9eae3ea28 [formerly 3ffd20d6abb05be289fb94513e78c0137f566a53]
Former-commit-id: 31c87ab01e
2013-10-08 09:45:27 -05:00
Lee Venable
1021c25d9d Issue #2443 - fixed image memory leak.
Former-commit-id: 47f8200757 [formerly fccb24f5834dd746f6868b4390e3c17dd12dc729]
Former-commit-id: 0bacce33bc
2013-10-08 09:39:00 -05:00
Richard Peter
9d424c212b Merge "Issue #1797 Separation of gridded time and abstract time object Change-Id: I9d84942140e52ec0fded1a9150d7016dec8eaf63" into development
Former-commit-id: e2c7bb21d7 [formerly 204c2034a08cd69fc7286639f37e5ff936ecf49e]
Former-commit-id: 2e062048e1
2013-10-07 16:19:11 -05:00
Lee Venable
3bfe4bf45c Merge "Issue #2437 - fixed color memory leak." into development
Former-commit-id: b1d02c6a49 [formerly b7691a4e940cc3461a39cce871c6de15110bf1d1]
Former-commit-id: 5081bbd0ab
2013-10-07 14:13:56 -05:00
Lee Venable
f94bcf4776 Merge "Issue #2421 optimize color map loading. Change-Id: I871ddf0f3eabee0e27d858e2cfa897563875c304" into development
Former-commit-id: c01eb85e53 [formerly 7139b6fe32b6de8c87c96e3b55d6ad83f11b149a]
Former-commit-id: eeee5c7948
2013-10-07 13:56:50 -05:00
Lee Venable
615fcc7f8e Issue #2437 - fixed color memory leak.
Former-commit-id: a4be7633a6 [formerly f081bea82ced5931f8424d51994571d5a9971cfe]
Former-commit-id: 604f8f86a4
2013-10-07 13:55:54 -05:00
Ben Steffensmeier
bae5c951d4 Issue #2421 optimize color map loading.
Change-Id: I871ddf0f3eabee0e27d858e2cfa897563875c304

Former-commit-id: 4e998f2576 [formerly ce15657bc794afe819d729121bc202b4f43b97d6]
Former-commit-id: f4c616fbff
2013-10-07 12:04:19 -05:00
Bryan Kowal
6e05c00981 Merge "Revert "Issue #2033 - pde and rpm build updates"" into development
Former-commit-id: 82d61b53d4 [formerly 0fb325bd5a463c243b807fbe44d2499bc7fc814c]
Former-commit-id: 0698d28222
2013-10-07 11:52:58 -05:00
Lee Venable
0eff818ede Merge "Issue #2436 - disposed of the sort color" into development
Former-commit-id: 7bd1fec82e [formerly a087a06f19df47edc2b818d2f68e2eff5aab2b50]
Former-commit-id: c1991c5c66
2013-10-07 09:30:45 -05:00
Nate Jensen
be1385b705 Merge "Issue #2361 Get common.monitor plugin away from using global JAXB context and ISerializableObject" into development
Former-commit-id: c36c50d189 [formerly a686d702002a5e01389be1fd5e72558239687080]
Former-commit-id: adc774bee9
2013-10-07 09:30:31 -05:00
Lee Venable
8c8adf8be6 Issue #2436 - disposed of the sort color
Former-commit-id: c4ddd46b44 [formerly 4545de35a0fdbfc5817a8725bf07ae0c405efb39]
Former-commit-id: 9c97908f36
2013-10-07 09:11:25 -05:00
Dave Hladky
4d4d93fc0a Issue #1797 Separation of gridded time and abstract time object
Change-Id: I9d84942140e52ec0fded1a9150d7016dec8eaf63

Former-commit-id: 1733834e74 [formerly cdf2b6dd5a5b4a12cf12e6d4d254b5e40acfcef5]
Former-commit-id: e0ec10d073
2013-10-04 10:36:27 -05:00
Steve Harris
8ba7d392d6 13.5.2-8 baseline
Former-commit-id: 18325949fb [formerly 6effdd3f5ce46910c89236306fa33499eada174f]
Former-commit-id: 94aa71fcd1
2013-10-04 11:30:03 -04:00
Bryan Kowal
a75ed2b079 Revert "Issue #2033 - pde and rpm build updates"
Undo copying localization into etc at build time.

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


Former-commit-id: 9d47e7565d [formerly f735b7bb3a0e23389be086d3582a2e0afdc95515]
Former-commit-id: bb2e914c00
2013-10-04 09:47:59 -05:00
Mike Duff
80081ff25b Issue #2375 - Fix for set number of rows in notification center
Change-Id: I9f8b937265e77c9777313225ab83f71a81b46994

Former-commit-id: d258009cc7 [formerly 74327c92303fe846d7333d8760652dbcace2d45f]
Former-commit-id: 865b5f6878
2013-10-04 09:27:30 -05:00
Richard Peter
f52fdf1916 Merge "Issue #2390 update grib decoder and vb to handle new storm surge parameters. Change-Id: I03a079fc06a922f693609e51df79e4d78cb4f209" into development
Former-commit-id: bc3843dc75 [formerly 3d09c6dedbaaa0db6b2247832a45bde8a1357786]
Former-commit-id: 5adf4298ef
2013-10-03 16:57:39 -05:00
Ben Steffensmeier
7f7aa20d0a Issue #2390 update grib decoder and vb to handle new storm surge parameters.
Change-Id: I03a079fc06a922f693609e51df79e4d78cb4f209

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

Former-commit-id: 42fee320ab [formerly e574d96b347d79fe7aaa0f8dded8c93af1191fdd]
Former-commit-id: 3f24b9e424
2013-10-03 15:18:55 -05:00
Roger Ferrel
c959cedd99 Issue #2326 Added user roles for Archive case and retention.
Change-Id: If1261bdb14f083f1b9cd565f6382db6213a94967

Former-commit-id: 42705e4dfa [formerly 07785f02c3edbfd46154d9864272b58e92b26cd6]
Former-commit-id: 7f7064d457
2013-10-03 12:33:26 -05:00
Max Schenkelberg
780ac0129f 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: 866c851b47 [formerly 384b8e6a02d4fffa0688993b2a2b53e974ecf493]
Former-commit-id: e3f6b1ea21
2013-10-03 11:43:26 -05:00
Ben Steffensmeier
860258e49c Issue #2363 Add more vector configuration optons.
Change-Id: I1a3e564629b9e4afe93a0a4ceee8e57681aa0644

Former-commit-id: 20853f7333 [formerly 8af298f9ef2c1c03e6be690c07829d0569b1dedd]
Former-commit-id: ff06ea1c5a
2013-10-03 10:36:47 -05:00
Bryan Kowal
4342c463b2 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: 4e4405b0f5 [formerly 5a76eabc142619df4c8454c3f2fe93f5283346db]
Former-commit-id: aa8691edfd
2013-10-02 15:49:17 -05:00
Ben Steffensmeier
a95f0dbac4 Issue #2404 move grid reprojection style rules to common.
Former-commit-id: 32a01070f9 [formerly 2a81f5fe8e38e6e6c6476586b1df09d8ab01d1fa]
Former-commit-id: a75361ad34
2013-10-02 10:33:23 -05:00
Roger Ferrel
2ba7117d13 Issue #2147 Changes to allow option hour field in category tag and change to Retentions end time.
Change-Id: I7f878a0e71c0989e41aaf943b1520c93f45f1859

Former-commit-id: e65b8a9f6e [formerly 6a6159e07eddbac712e4696023c464d58ad250f7]
Former-commit-id: a76fc08e93
2013-10-01 16:36:34 -05:00
Nate Jensen
68c8f9addd 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: 6cd79464ef [formerly 33899872714e8b945131bc17eab63bc71af38d37]
Former-commit-id: 265b6e7e61
2013-10-01 15:19:56 -05:00
Richard Peter
75b0f19d87 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: f4e71b65d3 [formerly 724a8c87ab8aa880dab45a0a743c3b9d6ace4e2e]
Former-commit-id: bb9488bb92
2013-10-01 15:06:34 -05:00
Richard Peter
984785ce5e 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: add32a774f [formerly b118718cd8766cf83df1a02079f92636964ca09e]
Former-commit-id: e45689dbc7
2013-10-01 14:22:33 -05:00
Nate Jensen
f529c077c6 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: 3e7dc7782f [formerly f8d8a0033729878c8c6d94c00fd861ddc81f9d96]
Former-commit-id: effa4f4f26
2013-10-01 11:25:45 -05:00
Lee Venable
e18b0d7e6a Issue #2420 - fixed font memory leak in the setFont method
Change-Id: Ibf773c6df580cb65dd62b46f8fd127fde6585a57

Former-commit-id: 9c159e7c40 [formerly 16effa6f2cda60d566e5f820ab517ed105a0894e]
Former-commit-id: 44d9e12d98
2013-09-30 14:31:46 -05:00
Nate Jensen
1825bea2cb Merge "Issue #2400 fix so active map editor is used if applicable" into development
Former-commit-id: 7da1197e7a [formerly 288acb25b23972bda06795bd02e2de973d4b170b]
Former-commit-id: c5d223ade8
2013-09-30 13:10:08 -05:00
Greg Armendariz
14fda3ff05 Merge "Issue #2033 - pde and rpm build updates" into development
Former-commit-id: 4c838ad045 [formerly c39016a5ce3f12e960b2419a8e3a7df6523791a3]
Former-commit-id: 32349a807b
2013-09-30 12:11:59 -05:00
Steve Harris
b5cb693619 13.5.2-7 baseline
Former-commit-id: a212c30bd7 [formerly dace09a228fa4bef6bddc1388f12d35adcbd7543]
Former-commit-id: 0f8fc513bf
2013-09-30 13:05:31 -04:00