David Friedman
|
75871042e6
|
ASM #17428 - WarnGen: Restart button incorrectly resets new product polygon lengths
Change-Id: I6da0c26fda99aa486b0e94fe9686b01a8705e49b
Former-commit-id: dd57e9f047 [formerly b8142209ee [formerly 9f11d72155dfb71c96c356ed4a7aa37d4c486662]]
Former-commit-id: b8142209ee
Former-commit-id: 56baae6629
|
2015-06-05 20:05:42 +00:00 |
|
David Friedman
|
f91ebd9abc
|
ASM #17310 - WarnGen: a large portion of hatched area was not included in polygon
Change-Id: I77c1a45f67e41e0ad0d9cdcca006f43c9f30e7f1
Former-commit-id: 61157be4f8 [formerly 6b71c4f883 [formerly 7e97e943d7c6b291bf3e1b03540b623a8ec73677]]
Former-commit-id: 6b71c4f883
Former-commit-id: 88825bdd0a
|
2015-05-08 18:26:37 +00:00 |
|
Fay.Liang
|
384f40d63a
|
Merge branch 'asm_14.4.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.4.1
Former-commit-id: e4269dfba4 [formerly 7a62d03b55 [formerly ff4a350eca07ea0f158ca0c3082890faa5bda368]]
Former-commit-id: 7a62d03b55
Former-commit-id: 7873b16eac
|
2015-03-13 15:58:28 -04:00 |
|
David Friedman
|
49a653f357
|
ASM #17190 - Counties being listed twice in Zone based products with extra county entries in shapefile
Change-Id: Ie3cb35803e7ef08a4147d85c9a7f28b0476ce5a2
Former-commit-id: 3c45c2d158 [formerly cfb3788972 [formerly 6d8bd3315f48d188507a76092a950511a75c142c]]
Former-commit-id: cfb3788972
Former-commit-id: dc25e9d8dd
|
2015-03-09 14:23:35 +00:00 |
|
Richard Peter
|
607e050a79
|
Omaha #3353 - Fix warngen geometry generation blocking cave
Change-Id: I3c29747e0d9f0f265fbdab4e152b1739c42e26d0
Former-commit-id: 6224457b6e [formerly cc3d526f60 [formerly 62410b8ce728440326997eab37a37a9650e51223]]
Former-commit-id: cc3d526f60
Former-commit-id: 008dde0ec5
|
2015-02-26 16:45:18 -06:00 |
|
Richard Peter
|
7ae1b885c1
|
Omaha #3353 - Fix warngen sync blocks on geospatial data.
Change-Id: I3d596030d4a06eb3e9cc8fbffa15ce5c596ed8ac
Former-commit-id: b8becf24a3 [formerly b0fba55588 [formerly 4df7c51d45ca960f364d9b0a626e8ec1fd0c325c]]
Former-commit-id: b0fba55588
Former-commit-id: 32ba320224
|
2015-02-25 20:00:19 -06:00 |
|
Fay.Liang
|
19a29da5de
|
ASM #15311 - Merge and Build Support - Merge ASM delivery into 14.4.1-1m.
Merge branch 'asm_14.4.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.4.1
Conflicts:
cave/com.raytheon.viz.gfe/localization/gfe/userPython/utilities/SmartScript.py
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/ChooseDataPeriodDialog.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTable.java
rpms/awips2.core/Installer.postgres/component.spec
rpms/awips2.core/Installer.python/component.spec
rpms/awips2.core/Installer.tools/component.spec
rpms/python.site-packages/Installer.h5py/component.spec
rpms/python.site-packages/Installer.matplotlib/component.spec
rpms/python.site-packages/Installer.nose/component.spec
rpms/python.site-packages/Installer.pupynere/component.spec
rpms/python.site-packages/Installer.qpid/component.spec
rpms/python.site-packages/Installer.scientific/component.spec
rpms/python.site-packages/Installer.scipy/component.spec
rpms/python.site-packages/Installer.shapely/component.spec
rpms/python.site-packages/Installer.tables/component.spec
Former-commit-id: eed6737801 [formerly c6bd5d7675 [formerly 1f331890b8fc38b4f8ed3a3debc66b8fedba4fdd]]
Former-commit-id: c6bd5d7675
Former-commit-id: 6b77894bd0
|
2015-01-12 13:03:31 -05:00 |
|
Qinglu.Lin
|
0eb9f8c722
|
ASM #637 - Create a base level map bundle for the WarnGenLoc shape file
Change-Id: Id3285b04a2ae8e07acfe33d2f1f57a11b34c9f25
Former-commit-id: baa96590f1 [formerly 3b3780fd13 [formerly 06fdefbc5b528ddfb0bb8baddd85fe75e4d07864]]
Former-commit-id: 3b3780fd13
Former-commit-id: 2d4a045e3c
|
2014-12-17 16:53:31 -05:00 |
|
Roger Ferrel
|
733a59f2f1
|
Omaha #3353 Fix deadlock that freezes cave.
Change-Id: I4afa5c505178f30ada5dd58612b0703ab9529e6b
Former-commit-id: acbde703a2 [formerly 398a8d6043 [formerly 871fa68ddf242f1e63286939b1324fc3197c7336]]
Former-commit-id: 398a8d6043
Former-commit-id: 334b156d2e
|
2014-11-04 14:13:29 -06:00 |
|
Steve Harris
|
85d5b72d04
|
Merge tag 'OB_14.3.1-26m' into omaha_14.4.1
Former-commit-id: f2fdf98d2f [formerly aff75d954b [formerly 4be51191bc64978e3c455702bede3456666fbffe]]
Former-commit-id: aff75d954b
Former-commit-id: 4fde31539e
|
2014-10-15 08:42:02 -05:00 |
|
Michael Gamazaychikov
|
74c03e5b81
|
ASM #513 - Maps loaded before opening WarnGen not retained when WarnGen is closed.
Change-Id: Iee5611826c4f26cec95daa6277c84a2e6a7ae410
Former-commit-id: e6d3baaa9c [formerly f0b644d92e [formerly dff1c1d6fcc5fd0572dd924cfdf7979fc2a18463]]
Former-commit-id: f0b644d92e
Former-commit-id: 3851e4c961
|
2014-10-06 15:32:10 -04:00 |
|
Steve Harris
|
fa1fa76dd9
|
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 da463c484e [formerly 8dc5abec482b4c1c3f3469c0ffc7e06fa697c6cd]]
Former-commit-id: da463c484e
Former-commit-id: f4b771ea72
|
2014-10-03 10:18:34 -05:00 |
|
dmsys
|
70cb8d81b0
|
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 8c3625cfec [formerly 0bf7ecb27d41f81f1d6727674fc1475eeaa8512c]]
Former-commit-id: 8c3625cfec
Former-commit-id: f704781f4f
|
2014-09-30 13:45:54 -04:00 |
|
Steve Harris
|
6900bb61c1
|
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 90e08b96e1 [formerly c8b5d89c2e202e8bb4ad59d9ced8882ec8c2a6c1]]
Former-commit-id: 90e08b96e1
Former-commit-id: 3598e9b5b6
|
2014-09-29 12:58:56 -05:00 |
|
David Friedman
|
ea894ca5fc
|
ASM #15658 - WarnGen: inclusion of watch information in marine products
Change-Id: I13d9e58b1df3dd434cdea66060dbc5886c0e27f2
Former-commit-id: 05707d0f20 [formerly 6791e8d885 [formerly 78cc67f9d2f86c2088ffc5695c4dea879a9e2ebb]]
Former-commit-id: 6791e8d885
Former-commit-id: 86100b6ca8
|
2014-09-26 20:05:46 +00:00 |
|
David Friedman
|
52788dc473
|
ASM #15551 - WarnGen: only WCN should be used while including TOR/SVR watches in WarnGen products
Change-Id: I8b8e9ae40596e5a3d5f0aa44d2e946aa7a68a1ae
Former-commit-id: db29ec9dec [formerly 33aee54b8f [formerly c8aa2fbfc35c872e2d50de2212eaf16db9b5483d]]
Former-commit-id: 33aee54b8f
Former-commit-id: 1737d16a5c
|
2014-09-26 15:13:56 +00:00 |
|
David Friedman
|
e186ecc15f
|
ASM #15551 - WarnGen: only WCN should be used while including TOR/SVR watches in WarnGen products
Change-Id: I1698025cad4310f8fc30938294c161c1f9797f03
Former-commit-id: c85b0d1cfd [formerly 41820f112f [formerly 70b520c08670646047ffa753814f98c032938ff8]]
Former-commit-id: 41820f112f
Former-commit-id: cfcfc17a2b
|
2014-09-26 13:07:28 +00:00 |
|
David Friedman
|
15956c0d58
|
ASM #16783 - Warngen: Possible problem when there are two effective VTEC actions for a watch
Change-Id: I76599d23396fe64c9448440787e67d752ed6b028
Former-commit-id: e82f96193e [formerly 5755c120d5 [formerly 117c2f072b647e353456832f2f0088d51a660d65]]
Former-commit-id: 5755c120d5
Former-commit-id: c16f5c2e7c
|
2014-09-25 22:10:42 +00:00 |
|
Qinglu.Lin
|
66aa148879
|
ASM #15551 - WarnGen: only WCN should be used while including TOR/SVR watches in WarnGen products
Change-Id: I33fb6fab8d49aca4f12f76c763e5f3ddbd9272b5
Former-commit-id: ef851d0016 [formerly 94fed71091 [formerly 8b194664458246dad7509c44bcc07480cb088ddd]]
Former-commit-id: 94fed71091
Former-commit-id: 1c55b5c400
|
2014-09-25 15:16:42 -04:00 |
|
Brian.Dyke
|
6dafb062e9
|
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 4b418918d4 [formerly e04ad21771ce410beb25e15fe300a34796a1a062]]
Former-commit-id: 4b418918d4
Former-commit-id: b49b13f77e
|
2014-09-24 11:05:37 -04:00 |
|
David Friedman
|
c4d6fe5af5
|
ASM #15658 - WarnGen: inclusion of watch information in marine products
Change-Id: I545d1b07444c9ca00ea2e95c4ccaed79946bbead
Former-commit-id: 2ee1ebe72d [formerly a6acf71a0a [formerly e0f6cc70bf5258d66bfa8a4ddb1daf871b6c92c5]]
Former-commit-id: a6acf71a0a
Former-commit-id: 0ed1ce5726
|
2014-09-23 18:39:22 +00:00 |
|
Steve Harris
|
e3a7796362
|
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 091555cf10 [formerly 69c52fb4a22997d0a0f9c620bd20f00b8c5fd4ce]]
Former-commit-id: 091555cf10
Former-commit-id: da530db540
|
2014-09-19 10:28:57 -05:00 |
|
Qinglu.Lin
|
ac3b48719e
|
ASM #15465 - No variable for failed site's MND Header location available for WarnGen to use
Change-Id: I8bc59786379680f635e85917eebf4c9d6b4ea683
Former-commit-id: c2047b94b1 [formerly 10da99d3f7 [formerly f79ed1b1867b5516a390a8f70b2141052be3eb38]]
Former-commit-id: 10da99d3f7
Former-commit-id: 1aac17e599
|
2014-09-18 11:21:18 -04:00 |
|
Qinglu.Lin
|
7e6097f690
|
ASM #15551 - WarnGen: only WCN should be used while including TOR/SVR watches in WarnGen products
Change-Id: Ia4350f8c17166c8f972779f8bde1763ec4cd3bd5
Former-commit-id: 5e93999662 [formerly 0e2be5afd8 [formerly e7ab29fbfebb1943e0b0702547dbd353367e797d]]
Former-commit-id: 0e2be5afd8
Former-commit-id: 4bce4db9ef
|
2014-09-17 10:26:25 -04:00 |
|
Matthew Howard
|
7f1afc7176
|
Merge "ASM #641 - Filtered cases where Areas do not match Zones." into asm_14.3.1
Former-commit-id: 6e0d48d840 [formerly aa273ffb70 [formerly f33abc302597a3120c9220278e28d865d5f185b6]]
Former-commit-id: aa273ffb70
Former-commit-id: 4c650fec35
|
2014-09-15 15:03:36 -05:00 |
|
Daniel.Huffman
|
2240767eec
|
ASM #641 - Filtered cases where Areas do not match Zones.
Change-Id: I1207442f77aece9d79b010669755ee7fc6f82362
Former-commit-id: 0f30c0f897 [formerly bacc914bd0 [formerly bf6acaafc42ba98e4257d3eb089b7a1e7adf7bd4]]
Former-commit-id: bacc914bd0
Former-commit-id: da198f916a
|
2014-09-15 19:18:33 +00:00 |
|
Roger Ferrel
|
d7700a6ae1
|
Omaha #3353 Fix null pointer opening GenerateGeoDataSetDialog.
Former-commit-id: bab69dc58c [formerly a31f3e670f [formerly f7fe3c9351d354046ef5038ae561db469421a442]]
Former-commit-id: a31f3e670f
Former-commit-id: e121422e82
|
2014-09-15 13:00:02 -05:00 |
|
Brian.Dyke
|
eb63c3e61a
|
Merge branch 'master_14.3.1' into asm_14.3.1
Former-commit-id: 1541e4c255 [formerly 216f34fb25 [formerly 8e4f6e96f7b70d6f2b7517f3f0695350506169c7]]
Former-commit-id: 216f34fb25
Former-commit-id: 54b26b3616
|
2014-09-15 10:46:25 -04:00 |
|
David Friedman
|
ea4aed7b84
|
ASM #16730 - WarnGen Watch wording error when issuing product only over Marine Locations
Change-Id: I361a1635cf11f3c66801f33c74034028b3e0271d
Former-commit-id: bed361fe35 [formerly 8d7ba120a2 [formerly 17d27fca04fb733d74e5bac99bfed3112bd81b6c]]
Former-commit-id: 8d7ba120a2
Former-commit-id: 94d78ed010
|
2014-09-10 19:28:57 +00:00 |
|
Brian.Dyke
|
d8271549ff
|
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 3d9a3de6e4 [formerly a3365943e7b7972a5c86f8cb1ad39667ab9e0695]]
Former-commit-id: 3d9a3de6e4
Former-commit-id: fe85eb9f70
|
2014-09-09 11:44:30 -04:00 |
|
Qinglu.Lin
|
efd54751a5
|
ASM #15551 - WarnGen: only WCN should be used while including TOR/SVR watches in WarnGen products
Change-Id: I0438af111b0db290373c7553006002edec2b2110
Former-commit-id: 902b6c55bd [formerly 8c28597210 [formerly 33adaf353c6a4b7dc418dc86428257dae260c4c5]]
Former-commit-id: 8c28597210
Former-commit-id: 62bcefb9e1
|
2014-09-04 14:09:24 -04:00 |
|
Nate Jensen
|
0fb9fc4f59
|
Omaha #3356 remove more unnecessary register buddies and policies
Change-Id: I3e39f9b8274b2b9104f3b3d037601c1553c43e13
Former-commit-id: 9d462e1dd9 [formerly c0dab26b92 [formerly b535d54c52c3e38bb9fa083ba911ad49c090f214]]
Former-commit-id: c0dab26b92
Former-commit-id: 2c74d90cc4
|
2014-09-03 11:34:10 -05:00 |
|
Ben Steffensmeier
|
59e6ec282f
|
Omaha #3390 Remove references to deprecated API.
Former-commit-id: e32037b42a [formerly 1d2144e840 [formerly ec7eeeb08af2cbad5d7880ae17ba7b351de23dc3]]
Former-commit-id: 1d2144e840
Former-commit-id: 950075dc59
|
2014-09-02 15:39:45 -05:00 |
|
Qinglu.Lin
|
dda32f85e9
|
ASM #15551 - WarnGen: only WCN should be used while including TOR/SVR watches in WarnGen products
Change-Id: I286bc4cc809fcc9257f72051f1bb74f8acc24c05
Former-commit-id: ae13ea419e [formerly 2374673f8d [formerly 59890eef397f3282ef26f259ca85ffea3db7b710]]
Former-commit-id: 2374673f8d
Former-commit-id: b32ea40289
|
2014-09-02 14:37:19 -04:00 |
|
Steve Harris
|
3619a11a8a
|
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 793064063b [formerly 8793dca41f756ba812206b48391caea6e593a657]]
Former-commit-id: 793064063b
Former-commit-id: bddf9c0f27
|
2014-08-29 10:17:52 -05:00 |
|
Brian.Dyke
|
8f69c4b855
|
Merge branch 'master_14.3.1' into asm_14.3.1
Former-commit-id: 2c25f68437 [formerly 6f3d0508e4 [formerly f34bc4f81eb5ac92ef306f73f8c34243d3f78e31]]
Former-commit-id: 6f3d0508e4
Former-commit-id: cbe59aded5
|
2014-08-29 10:19:02 -04:00 |
|
David Friedman
|
bb421fd3e4
|
ASM #15658 - WarnGen: inclusion of watch information in marine products
Change-Id: I9f99e6136027f1a6419800f87e5a5709fe5be6b9
Former-commit-id: ea9230b37c [formerly a2dfe8e8f6 [formerly 6bfa1d6662b00925814be7126592bbe340651649]]
Former-commit-id: a2dfe8e8f6
Former-commit-id: ea1e9feb1d
|
2014-08-28 15:43:32 +00:00 |
|
Brian.Dyke
|
0a5ddf7457
|
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 e654318431 [formerly 7334d3991903dfe8a62728de33c21e81534fdbb6]]
Former-commit-id: e654318431
Former-commit-id: a08db8d73d
|
2014-08-27 11:19:19 -04:00 |
|
Roger Ferrel
|
20362833cf
|
Omaha #3353 Changes to remove Geospatial data set generation off the UI thread.
Change-Id: I5213f627a97a27bdb92c4857eac4071c5450b790
Former-commit-id: d0779ef059 [formerly ca3a0595d2 [formerly f16a8ff2c51c392957e13ef63423abe9f99b3301]]
Former-commit-id: ca3a0595d2
Former-commit-id: a610e0a34b
|
2014-08-25 07:59:26 -05:00 |
|
David Friedman
|
280f4a4b64
|
ASM #16703 - Errors issuing Marine Products over areas under a Watch
Change-Id: Idd28b86771295c90cec3c9b3e7e2dfc96c84ff4f
Former-commit-id: 6a7638ddae [formerly 78ee5a56c5 [formerly 7027ff533991251f64f2e5a0deb31e2945cdde5f]]
Former-commit-id: 78ee5a56c5
Former-commit-id: b053e1e2ce
|
2014-08-20 14:13:32 +00:00 |
|
Michael Gamazaychikov
|
d0c9d21538
|
ASM #15701 WarnGen displaying error for Watch Wording when switching from backup site to local site
Change-Id: I9ff834f0b3717d046f278b8a21ca955e5f5c4805
Former-commit-id: c14a5287ac [formerly 9897417235 [formerly 126ec43423a864df597bd6dd745671ee0bf4fbfb]]
Former-commit-id: 9897417235
Former-commit-id: 2b450af136
|
2014-08-15 11:03:23 -04:00 |
|
Nate Jensen
|
d61c65787b
|
Omaha #3356 cleanup of unnecessary register buddies and buddy policies
Change-Id: I1d6c279478f38876a8df67d2f9dd186a2efdeca0
Former-commit-id: 9b72a1399d [formerly b3083a663e [formerly 48536dd79d933508ac54b3b6e9bbd166fd218330]]
Former-commit-id: b3083a663e
Former-commit-id: 253198b5bc
|
2014-08-14 10:22:37 -05:00 |
|
Steve Harris
|
d606269c5b
|
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 0fb743ec44 [formerly f7d474895366eb23ae5eef242a4568f911435aa3]]
Former-commit-id: 0fb743ec44
Former-commit-id: a92dc418c6
|
2014-08-04 22:20:29 -05:00 |
|
Brian.Dyke
|
770b56e740
|
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 6f6daaa249 [formerly f22cc09d0a6fdc7a806726d5207f6b3507972b94]]
Former-commit-id: 6f6daaa249
Former-commit-id: 8ea5c4f98b
|
2014-08-04 16:40:02 -04:00 |
|
Mark Peters
|
1342f67614
|
Omaha #3471 Replace Raytheon plugin calls to deprecated IGraphicsTarget.createShadedShape()
Change-Id: Iea874ecfa2c7f16eacdc7f097039ba20f10fc2b9
Former-commit-id: 88b334cf14 [formerly 22c077d77f [formerly 4bcf01e33f1d2e038499fdece63e81b6288b7152]]
Former-commit-id: 22c077d77f
Former-commit-id: 9be02c8dfe
|
2014-08-04 13:27:45 -05:00 |
|
Brian.Dyke
|
590e37a8f2
|
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 9abb02ea8a [formerly b209604e1f0d6e790980d0bc8f1760e38f448076]]
Former-commit-id: 9abb02ea8a
Former-commit-id: 301f3094be
|
2014-08-04 13:10:13 -04:00 |
|
Brian.Dyke
|
a9cf7e9951
|
Merge branch 'asm_14.2.2' into master_14.2.2
Former-commit-id: 905728d2fb [formerly 3598f7b549 [formerly 96ff2234e0d8893695b33a79d24a026a1a409073]]
Former-commit-id: 3598f7b549
Former-commit-id: eeca2f2ec8
|
2014-07-31 09:56:21 -04:00 |
|
Shawn.Hooper
|
adcd4dfa64
|
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 c71189dd92 [formerly e24dd6958e] [formerly ba4c386f30] [formerly 8cffe955a9 [formerly ba4c386f30 [formerly 00ec5e2d47809d084b3e24e1f1503af96d129fed]]].
Change-Id: Ie01ca9463a4db371ffce0b6e38d5c43e1f9addf2
Former-commit-id: 4e322737ce [formerly 976c7b2d4a [formerly d272d426f8bd218954a75a7b2e19d21b30f975cb]]
Former-commit-id: 976c7b2d4a
Former-commit-id: 27f50397aa
|
2014-07-30 14:03:51 -04:00 |
|
Mark Peters
|
6376572795
|
Omaha #3429 Replace Raytheon plugin calls to deprecated IGraphicsTarget.drawLine()
Change-Id: I9de68a9a047a2d6c3744b29de292efb7cfb44bbf
Former-commit-id: bac12d844b [formerly 437e127ebc [formerly a222b29ff24bf81d1c8aefd54fa33f52461c9c25]]
Former-commit-id: 437e127ebc
Former-commit-id: 11abefd4de
|
2014-07-29 11:20:53 -05:00 |
|
Michael Gamazaychikov
|
c71189dd92
|
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 ba4c386f30 [formerly 00ec5e2d47809d084b3e24e1f1503af96d129fed]]
Former-commit-id: ba4c386f30
Former-commit-id: e24dd6958e
|
2014-07-28 15:12:10 -04:00 |
|