Commit graph

203 commits

Author SHA1 Message Date
Roger Ferrel
334b156d2e Omaha #3353 Fix deadlock that freezes cave.
Change-Id: I4afa5c505178f30ada5dd58612b0703ab9529e6b

Former-commit-id: acbde703a2 [formerly 871fa68ddf242f1e63286939b1324fc3197c7336]
Former-commit-id: 398a8d6043
2014-11-04 14:13:29 -06:00
Steve Harris
4fde31539e Merge tag 'OB_14.3.1-26m' into omaha_14.4.1
Former-commit-id: f2fdf98d2f [formerly 4be51191bc64978e3c455702bede3456666fbffe]
Former-commit-id: aff75d954b
2014-10-15 08:42:02 -05:00
Michael Gamazaychikov
3851e4c961 ASM #513 - Maps loaded before opening WarnGen not retained when WarnGen is closed.
Change-Id: Iee5611826c4f26cec95daa6277c84a2e6a7ae410

Former-commit-id: e6d3baaa9c [formerly dff1c1d6fcc5fd0572dd924cfdf7979fc2a18463]
Former-commit-id: f0b644d92e
2014-10-06 15:32:10 -04:00
Steve Harris
f4b771ea72 Merge branch 'master_14.3.1' (14.3.1-23m) into omaha_14.4.1
Conflicts:
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/IFPClient.java
	cave/com.raytheon.viz.volumebrowser/localization/menus/xml/planesMenusPlanView.xml

        Issue #3648:
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFEDao.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParmManager.java

	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/IFPGridDatabase.java
	edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java

        Issue #3560:
	edexOsgi/com.raytheon.uf.common.registry.ebxml/src/com/raytheon/uf/common/registry/services/RegistryRESTServices.java
	edexOsgi/com.raytheon.uf.common.registry.ebxml/src/com/raytheon/uf/common/registry/services/RegistrySOAPServices.java
        Also modified with the resolution of #3560:
        edexOsgi/com.raytheon.uf.common.registry.ebxml/src/com/raytheon/uf/common/registry/services/RegistryServiceConfiguration.java


Former-commit-id: 2616fe04b6 [formerly 8dc5abec482b4c1c3f3469c0ffc7e06fa697c6cd]
Former-commit-id: da463c484e
2014-10-03 10:18:34 -05:00
dmsys
f704781f4f Merge branch 'master_14.2.4' into master_14.3.1 CM-MERGE:14.2.4-13-14 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/core/internal/IFPClient.java
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/specialWeatherStatement.vm

Former-commit-id: 9f4560c480 [formerly 0bf7ecb27d41f81f1d6727674fc1475eeaa8512c]
Former-commit-id: 8c3625cfec
2014-09-30 13:45:54 -04:00
Steve Harris
3598e9b5b6 Merge branch 'master_14.3.1' (14.3.1-22m) into omaha_14.4.1
Conflicts:
	cave/com.raytheon.viz.volumebrowser/localization/menus/xml/fieldsMenus.xml
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
	edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/ohdlib/GagePP.java
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/T.xml
	edexOsgi/com.raytheon.uf.tools.cli/impl/src/textdb/TextDB.py

Former-commit-id: 3b6a8a1447 [formerly c8b5d89c2e202e8bb4ad59d9ced8882ec8c2a6c1]
Former-commit-id: 90e08b96e1
2014-09-29 12:58:56 -05:00
David Friedman
86100b6ca8 ASM #15658 - WarnGen: inclusion of watch information in marine products
Change-Id: I13d9e58b1df3dd434cdea66060dbc5886c0e27f2

Former-commit-id: 05707d0f20 [formerly 78cc67f9d2f86c2088ffc5695c4dea879a9e2ebb]
Former-commit-id: 6791e8d885
2014-09-26 20:05:46 +00:00
David Friedman
1737d16a5c ASM #15551 - WarnGen: only WCN should be used while including TOR/SVR watches in WarnGen products
Change-Id: I8b8e9ae40596e5a3d5f0aa44d2e946aa7a68a1ae

Former-commit-id: db29ec9dec [formerly c8aa2fbfc35c872e2d50de2212eaf16db9b5483d]
Former-commit-id: 33aee54b8f
2014-09-26 15:13:56 +00:00
David Friedman
cfcfc17a2b ASM #15551 - WarnGen: only WCN should be used while including TOR/SVR watches in WarnGen products
Change-Id: I1698025cad4310f8fc30938294c161c1f9797f03

Former-commit-id: c85b0d1cfd [formerly 70b520c08670646047ffa753814f98c032938ff8]
Former-commit-id: 41820f112f
2014-09-26 13:07:28 +00:00
David Friedman
c16f5c2e7c ASM #16783 - Warngen: Possible problem when there are two effective VTEC actions for a watch
Change-Id: I76599d23396fe64c9448440787e67d752ed6b028

Former-commit-id: e82f96193e [formerly 117c2f072b647e353456832f2f0088d51a660d65]
Former-commit-id: 5755c120d5
2014-09-25 22:10:42 +00:00
Qinglu.Lin
1c55b5c400 ASM #15551 - WarnGen: only WCN should be used while including TOR/SVR watches in WarnGen products
Change-Id: I33fb6fab8d49aca4f12f76c763e5f3ddbd9272b5

Former-commit-id: ef851d0016 [formerly 8b194664458246dad7509c44bcc07480cb088ddd]
Former-commit-id: 94fed71091
2014-09-25 15:16:42 -04:00
Brian.Dyke
b49b13f77e Merge branch 'master_14.2.4' into master_14.3.1 CM-MERGE:14.2.4-10-11-12 into 14.3.1
Conflicts:
	cave/com.raytheon.viz.grid/localization/volumebrowser/FieldDisplayTypes.xml
	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
	ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/GRID/HRRR/HRRR.xml
	ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/ResourceFilters.xml

Former-commit-id: 87fa32d2d4 [formerly e04ad21771ce410beb25e15fe300a34796a1a062]
Former-commit-id: 4b418918d4
2014-09-24 11:05:37 -04:00
David Friedman
0ed1ce5726 ASM #15658 - WarnGen: inclusion of watch information in marine products
Change-Id: I545d1b07444c9ca00ea2e95c4ccaed79946bbead

Former-commit-id: 2ee1ebe72d [formerly e0f6cc70bf5258d66bfa8a4ddb1daf871b6c92c5]
Former-commit-id: a6acf71a0a
2014-09-23 18:39:22 +00:00
Steve Harris
da530db540 Merge branch 'omaha_14.3.1' into omaha_14.4.1
Conflicts:
	cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/ArchiveRetentionDlg.java
	cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/Cities.xml
	cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/FAA/Airports.xml
	cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/FAA/Fix.xml
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/reflect/BundleReflections.java
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/reflect/SubClassLocator.java
	cave/com.raytheon.uf.viz.monitor.fog/src/com/raytheon/uf/viz/monitor/fog/ui/dialogs/FogMonitoringAreaConfigDlg.java
	cave/com.raytheon.uf.viz.monitor.safeseas/src/com/raytheon/uf/viz/monitor/safeseas/ui/dialogs/SSMonitoringAreaConfigDlg.java
	cave/com.raytheon.uf.viz.monitor.snow/src/com/raytheon/uf/viz/monitor/snow/ui/dialogs/SnowMonitoringAreaConfigDlg.java
	cave/com.raytheon.uf.viz.ui.menus/src/com/raytheon/uf/viz/ui/menus/widgets/tearoff/MenuItemComposite.java
	cave/com.raytheon.uf.viz.ui.menus/src/com/raytheon/uf/viz/ui/menus/widgets/tearoff/TearOffMenuDialog.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/ext/imaging/GLDataMappingFactory.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/DataManager.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/ParmManager.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/textformatter/CombinationsFileUtil.java
	cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/rsc/graphic/RadarGraphicsPage.java
	cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/rsc/mosaic/RadarMosaicResource.java
	cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/ui/xy/RadarGSMResource.java
	cave/com.raytheon.viz.ui.personalities.awips/src/com/raytheon/viz/ui/personalities/awips/AbstractCAVEComponent.java
	cave/com.raytheon.viz.ui/META-INF/MANIFEST.MF
	cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/colormap/ColorMapTree.java
	cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/dialogs/ColormapComp.java
	cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/dialogs/ImagingDialog.java
	cave/com.raytheon.viz.volumebrowser/localization/menus/xml/fieldsMenus.xml
	cave/com.raytheon.viz.volumebrowser/localization/menus/xml/planesMenusPlanView.xml
	cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
	edexOsgi/com.raytheon.uf.common.datadelivery.registry/src/com/raytheon/uf/common/datadelivery/registry/web/IRegistryFederationManager.java
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TP.xml
	edexOsgi/com.raytheon.uf.common.localization/src/com/raytheon/uf/common/localization/IPathManager.java
	edexOsgi/com.raytheon.uf.common.localization/src/com/raytheon/uf/common/localization/PathManager.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.registry/src/com/raytheon/uf/edex/datadelivery/registry/dao/ReplicationEventDao.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.registry/src/com/raytheon/uf/edex/datadelivery/registry/federation/RegistryFederationManager.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/src/com/raytheon/uf/edex/datadelivery/retrieval/util/WfsConnectionUtil.java

Former-commit-id: 4c56844e29 [formerly 69c52fb4a22997d0a0f9c620bd20f00b8c5fd4ce]
Former-commit-id: 091555cf10
2014-09-19 10:28:57 -05:00
Qinglu.Lin
1aac17e599 ASM #15465 - No variable for failed site's MND Header location available for WarnGen to use
Change-Id: I8bc59786379680f635e85917eebf4c9d6b4ea683

Former-commit-id: c2047b94b1 [formerly f79ed1b1867b5516a390a8f70b2141052be3eb38]
Former-commit-id: 10da99d3f7
2014-09-18 11:21:18 -04:00
Qinglu.Lin
4bce4db9ef ASM #15551 - WarnGen: only WCN should be used while including TOR/SVR watches in WarnGen products
Change-Id: Ia4350f8c17166c8f972779f8bde1763ec4cd3bd5

Former-commit-id: 5e93999662 [formerly e7ab29fbfebb1943e0b0702547dbd353367e797d]
Former-commit-id: 0e2be5afd8
2014-09-17 10:26:25 -04:00
Matthew Howard
4c650fec35 Merge "ASM #641 - Filtered cases where Areas do not match Zones." into asm_14.3.1
Former-commit-id: 6e0d48d840 [formerly f33abc302597a3120c9220278e28d865d5f185b6]
Former-commit-id: aa273ffb70
2014-09-15 15:03:36 -05:00
Daniel.Huffman
da198f916a ASM #641 - Filtered cases where Areas do not match Zones.
Change-Id: I1207442f77aece9d79b010669755ee7fc6f82362

Former-commit-id: 0f30c0f897 [formerly bf6acaafc42ba98e4257d3eb089b7a1e7adf7bd4]
Former-commit-id: bacc914bd0
2014-09-15 19:18:33 +00:00
Roger Ferrel
e121422e82 Omaha #3353 Fix null pointer opening GenerateGeoDataSetDialog.
Former-commit-id: bab69dc58c [formerly f7fe3c9351d354046ef5038ae561db469421a442]
Former-commit-id: a31f3e670f
2014-09-15 13:00:02 -05:00
Brian.Dyke
54b26b3616 Merge branch 'master_14.3.1' into asm_14.3.1
Former-commit-id: 1541e4c255 [formerly 8e4f6e96f7b70d6f2b7517f3f0695350506169c7]
Former-commit-id: 216f34fb25
2014-09-15 10:46:25 -04:00
David Friedman
94d78ed010 ASM #16730 - WarnGen Watch wording error when issuing product only over Marine Locations
Change-Id: I361a1635cf11f3c66801f33c74034028b3e0271d

Former-commit-id: bed361fe35 [formerly 17d27fca04fb733d74e5bac99bfed3112bd81b6c]
Former-commit-id: 8d7ba120a2
2014-09-10 19:28:57 +00:00
Brian.Dyke
fe85eb9f70 Merge branch 'master_14.2.4' into master_14.3.1 CM-MERGE:14.2.4-6-7-8 into 14.3.1
Conflicts:
	cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/ArchiveRetentionDlg.java
	cave/com.raytheon.uf.viz.ui.menus/src/com/raytheon/uf/viz/ui/menus/widgets/tearoff/MenuItemComposite.java

Former-commit-id: 01dfe503f5 [formerly a3365943e7b7972a5c86f8cb1ad39667ab9e0695]
Former-commit-id: 3d9a3de6e4
2014-09-09 11:44:30 -04:00
Qinglu.Lin
62bcefb9e1 ASM #15551 - WarnGen: only WCN should be used while including TOR/SVR watches in WarnGen products
Change-Id: I0438af111b0db290373c7553006002edec2b2110

Former-commit-id: 902b6c55bd [formerly 33adaf353c6a4b7dc418dc86428257dae260c4c5]
Former-commit-id: 8c28597210
2014-09-04 14:09:24 -04:00
Nate Jensen
2c74d90cc4 Omaha #3356 remove more unnecessary register buddies and policies
Change-Id: I3e39f9b8274b2b9104f3b3d037601c1553c43e13

Former-commit-id: 9d462e1dd9 [formerly b535d54c52c3e38bb9fa083ba911ad49c090f214]
Former-commit-id: c0dab26b92
2014-09-03 11:34:10 -05:00
Ben Steffensmeier
950075dc59 Omaha #3390 Remove references to deprecated API.
Former-commit-id: e32037b42a [formerly ec7eeeb08af2cbad5d7880ae17ba7b351de23dc3]
Former-commit-id: 1d2144e840
2014-09-02 15:39:45 -05:00
Qinglu.Lin
b32ea40289 ASM #15551 - WarnGen: only WCN should be used while including TOR/SVR watches in WarnGen products
Change-Id: I286bc4cc809fcc9257f72051f1bb74f8acc24c05

Former-commit-id: ae13ea419e [formerly 59890eef397f3282ef26f259ca85ffea3db7b710]
Former-commit-id: 2374673f8d
2014-09-02 14:37:19 -04:00
Steve Harris
bddf9c0f27 Merge branch 'master_14.3.1' (14.3.1-16) into omaha_14.4.1
Conflicts:
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/reflect/BundleReflections.java
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/reflect/BundleRepositoryGetter.java
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/reflect/SubClassLocator.java
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
	cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/StormTrackDisplay.java
	cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java
	cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
	edexOsgi/com.raytheon.edex.plugin.binlightning/src/com/raytheon/edex/plugin/binlightning/BinLightningDecoder.java
	edexOsgi/com.raytheon.uf.common.comm/src/com/raytheon/uf/common/comm/HttpClient.java
	edexOsgi/com.raytheon.uf.tools.cli/impl/capture
	ldm/src/pqact/pqact.c

Former-commit-id: 5d58625abc [formerly 8793dca41f756ba812206b48391caea6e593a657]
Former-commit-id: 793064063b
2014-08-29 10:17:52 -05:00
Brian.Dyke
cbe59aded5 Merge branch 'master_14.3.1' into asm_14.3.1
Former-commit-id: 2c25f68437 [formerly f34bc4f81eb5ac92ef306f73f8c34243d3f78e31]
Former-commit-id: 6f3d0508e4
2014-08-29 10:19:02 -04:00
David Friedman
ea1e9feb1d ASM #15658 - WarnGen: inclusion of watch information in marine products
Change-Id: I9f99e6136027f1a6419800f87e5a5709fe5be6b9

Former-commit-id: ea9230b37c [formerly 6bfa1d6662b00925814be7126592bbe340651649]
Former-commit-id: a2dfe8e8f6
2014-08-28 15:43:32 +00:00
Brian.Dyke
a08db8d73d Merge branch 'master_14.2.4' into master_14.3.1 CM-MERGE:14.2.4-5 into 14.3.1
Conflicts:
	cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/StormTrackDisplay.java
	cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java
	cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
	edexOsgi/com.raytheon.uf.common.comm/src/com/raytheon/uf/common/comm/HttpClient.java

Former-commit-id: aa83bf804f [formerly 7334d3991903dfe8a62728de33c21e81534fdbb6]
Former-commit-id: e654318431
2014-08-27 11:19:19 -04:00
Roger Ferrel
a610e0a34b Omaha #3353 Changes to remove Geospatial data set generation off the UI thread.
Change-Id: I5213f627a97a27bdb92c4857eac4071c5450b790

Former-commit-id: d0779ef059 [formerly f16a8ff2c51c392957e13ef63423abe9f99b3301]
Former-commit-id: ca3a0595d2
2014-08-25 07:59:26 -05:00
David Friedman
b053e1e2ce ASM #16703 - Errors issuing Marine Products over areas under a Watch
Change-Id: Idd28b86771295c90cec3c9b3e7e2dfc96c84ff4f

Former-commit-id: 6a7638ddae [formerly 7027ff533991251f64f2e5a0deb31e2945cdde5f]
Former-commit-id: 78ee5a56c5
2014-08-20 14:13:32 +00:00
Michael Gamazaychikov
2b450af136 ASM #15701 WarnGen displaying error for Watch Wording when switching from backup site to local site
Change-Id: I9ff834f0b3717d046f278b8a21ca955e5f5c4805

Former-commit-id: c14a5287ac [formerly 126ec43423a864df597bd6dd745671ee0bf4fbfb]
Former-commit-id: 9897417235
2014-08-15 11:03:23 -04:00
Nate Jensen
253198b5bc Omaha #3356 cleanup of unnecessary register buddies and buddy policies
Change-Id: I1d6c279478f38876a8df67d2f9dd186a2efdeca0

Former-commit-id: 9b72a1399d [formerly 48536dd79d933508ac54b3b6e9bbd166fd218330]
Former-commit-id: b3083a663e
2014-08-14 10:22:37 -05:00
Steve Harris
a92dc418c6 Merge branch 'omaha_14.3.1' into omaha_14.4.1
Conflicts:
	cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/Cities.xml
	cave/com.raytheon.uf.viz.core.maps/src/com/raytheon/uf/viz/core/maps/scales/MapScalesManager.java
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/alarmalert/dialogs/AlarmDisplayWindow.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/alarmalert/dialogs/CurrentAlarmQueue.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParmManager.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/D2DGridDatabase.java
	edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/util/GribModelLookup.java
	edexOsgi/com.raytheon.edex.utilitysrv/src/com/raytheon/edex/services/LocalizationStreamHandler.java
	edexOsgi/com.raytheon.uf.edex.activetable/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTable.java
	edexOsgi/com.raytheon.uf.edex.activetable/utility/common_static/base/vtec/ActiveTable.py

Former-commit-id: bf9a0fa5de [formerly f7d474895366eb23ae5eef242a4568f911435aa3]
Former-commit-id: 0fb743ec44
2014-08-04 22:20:29 -05:00
Brian.Dyke
8ea5c4f98b Merge branch 'master_14.3.1' into asm_14.3.1
Conflicts:
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java

Former-commit-id: 7fbb3b6a54 [formerly f22cc09d0a6fdc7a806726d5207f6b3507972b94]
Former-commit-id: 6f6daaa249
2014-08-04 16:40:02 -04:00
Mark Peters
9be02c8dfe Omaha #3471 Replace Raytheon plugin calls to deprecated IGraphicsTarget.createShadedShape()
Change-Id: Iea874ecfa2c7f16eacdc7f097039ba20f10fc2b9

Former-commit-id: 88b334cf14 [formerly 4bcf01e33f1d2e038499fdece63e81b6288b7152]
Former-commit-id: 22c077d77f
2014-08-04 13:27:45 -05:00
Brian.Dyke
301f3094be Merge branch 'master_14.2.2' into master_14.3.1 CM-MERGE:14.2.2-17,-18,-19,-20,-21,-22,-23,-24 into 14.3.1
Conflicts:
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/RadarBiasTableDialog.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.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.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
	edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTable.java

Former-commit-id: 270d2b0ddb [formerly b209604e1f0d6e790980d0bc8f1760e38f448076]
Former-commit-id: 9abb02ea8a
2014-08-04 13:10:13 -04:00
Brian.Dyke
eeca2f2ec8 Merge branch 'asm_14.2.2' into master_14.2.2
Former-commit-id: 905728d2fb [formerly 96ff2234e0d8893695b33a79d24a026a1a409073]
Former-commit-id: 3598f7b549
2014-07-31 09:56:21 -04:00
Shawn.Hooper
27f50397aa ASM #15627 Revert "ASM #15627 - WarnGen leaving out reference to State that is under SVR or TOR Watch in SPS text products."
This reverts commit e24dd6958e [formerly ba4c386f30] [formerly 8cffe955a9 [formerly 00ec5e2d47809d084b3e24e1f1503af96d129fed]].

Change-Id: Ie01ca9463a4db371ffce0b6e38d5c43e1f9addf2

Former-commit-id: 4e322737ce [formerly d272d426f8bd218954a75a7b2e19d21b30f975cb]
Former-commit-id: 976c7b2d4a
2014-07-30 14:03:51 -04:00
Mark Peters
11abefd4de Omaha #3429 Replace Raytheon plugin calls to deprecated IGraphicsTarget.drawLine()
Change-Id: I9de68a9a047a2d6c3744b29de292efb7cfb44bbf

Former-commit-id: bac12d844b [formerly a222b29ff24bf81d1c8aefd54fa33f52461c9c25]
Former-commit-id: 437e127ebc
2014-07-29 11:20:53 -05:00
Michael Gamazaychikov
e24dd6958e ASM #15627 - WarnGen leaving out reference to State that is under SVR or TOR Watch in SPS text products.
Change-Id: Ic5689db7714be086d6e4543602db33a07e5b2fc1

Former-commit-id: 8cffe955a9 [formerly 00ec5e2d47809d084b3e24e1f1503af96d129fed]
Former-commit-id: ba4c386f30
2014-07-28 15:12:10 -04:00
Qinglu.Lin
f69a06238b ASM #15554 - Improve speed/efficiency of WarngenLayer.populateStrings
Change-Id: I6a3b9823ac7c23ba171206708187ab3fc3c7c1ca

Former-commit-id: 2aa16c114a [formerly 3b971d52a82099142fe08986df879a379dfa6314]
Former-commit-id: 1eca5ef51a
2014-07-28 12:36:07 -04:00
Jonathan Sanchez
997485dd22 Issue #3419 Refactored watches to use the county table.
Change-Id: Ide7e07813203213511640d5ee515e73b278089c1

Former-commit-id: b991838494 [formerly 135d7ffa84af58d7b3c9575e654fa1298b76b2e2]
Former-commit-id: 86a8ca4a30
2014-07-22 15:32:12 -05:00
David Friedman
8784501bba ASM #15052 - WarnGen: service backup should use config.xml from failed site
Change-Id: Icff8ca2a124da595be6b83ac9f9999831daee0b1

Former-commit-id: db8977e281 [formerly f9c0dc09ee7bc692c6f70b4a5ad67bb2c2ed5a20]
Former-commit-id: a45fe1dad0
2014-07-03 13:58:24 +00:00
Richard Peter
6636b301e5 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: 8ecc27f714 [formerly fc71e1cb26481e91c7d0c16ed0bd06ec5c8c22b9]
Former-commit-id: 93bbd98cbc
2014-07-01 15:34:39 -05:00
Brian.Dyke
da6b0f2adf Merge branch 'master_14.3.1' into asm_14.3.1
Former-commit-id: 6d93f8f3ef [formerly 765d6440b1b19d7b0cf789fb7a873e14b4a679e1]
Former-commit-id: b64d38be69
2014-07-01 13:47:12 -04:00
Steve Harris
2f2958df37 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: 7acd9ab2dd [formerly d25ab509cb53d559edbd520dd1e3c036166f2e29]
Former-commit-id: d4dc1723c1
2014-07-01 11:08:46 -04:00
Juliya Dynina
bf765525b7 Merge "ASM #663 - WarnGen does not properly handle Outer Banks Counties in North Carolina" into asm_14.2.2
Former-commit-id: 102da2d0f7 [formerly 714dbccbd26a1b6fafa486b2ddbce98d7f38c8eb]
Former-commit-id: b5e4bc1fdc
2014-07-01 10:05:57 -05:00
Qinglu.Lin
1180b31875 ASM #663 - WarnGen does not properly handle Outer Banks Counties in North Carolina
Change-Id: If7fbcea362618e0dea5153f65489388b406b7a81

Former-commit-id: 1d52d020eb [formerly 4d50beaed59d785d923e357f8ce036f6625ce4b4]
Former-commit-id: 1200633cd2
2014-06-30 13:09:15 -04:00