AWIPS User
|
37f580ead3
|
menus organization for warngen and awipstools
Former-commit-id: d2e0d05d34 [formerly e47d48348b] [formerly 080d101c29e6917327b869065263b9b9702104b1 [formerly 90f6268724]]
Former-commit-id: b7dfe5f2bd26a8783450b9f48bbd179c16fd3b9f [formerly 43a2553d02]
Former-commit-id: fb03264ea1
|
2015-04-19 23:37:16 -06:00 |
|
Fay.Liang
|
bccf70f0bd
|
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: 19a29da5de [formerly 6b77894bd0] [formerly c6bd5d7675] [formerly 19a29da5de [formerly 6b77894bd0] [formerly c6bd5d7675] [formerly eed6737801 [formerly c6bd5d7675 [formerly 1f331890b8fc38b4f8ed3a3debc66b8fedba4fdd]]]]
Former-commit-id: eed6737801
Former-commit-id: 23ba9f4154 [formerly f3ecae8573] [formerly 69382d354f0cba941ad1b60d73cca2d121eb949e [formerly 5cc8e5b4af]]
Former-commit-id: cd3c370873d18a2ca3801fd2f83aa4f8b35fe06e [formerly 06ac6b396e]
Former-commit-id: 1e9024ede9
|
2015-01-12 13:03:31 -05:00 |
|
Qinglu.Lin
|
25a8e87b9a
|
ASM #637 - Create a base level map bundle for the WarnGenLoc shape file
Change-Id: Id3285b04a2ae8e07acfe33d2f1f57a11b34c9f25
Former-commit-id: 0eb9f8c722 [formerly 2d4a045e3c] [formerly 3b3780fd13] [formerly 0eb9f8c722 [formerly 2d4a045e3c] [formerly 3b3780fd13] [formerly baa96590f1 [formerly 3b3780fd13 [formerly 06fdefbc5b528ddfb0bb8baddd85fe75e4d07864]]]]
Former-commit-id: baa96590f1
Former-commit-id: 7cb4e6f236 [formerly f4d78ec480] [formerly e082c3f2b32d5b0433ad38471f77919246f7c6de [formerly cae57983d8]]
Former-commit-id: 4fbfef3fc4d60690cb1aef306d0edd2b56c0a916 [formerly 484799b7f5]
Former-commit-id: 4caef3c695
|
2014-12-17 16:53:31 -05:00 |
|
Roger Ferrel
|
97e63339df
|
Omaha #3353 Fix deadlock that freezes cave.
Change-Id: I4afa5c505178f30ada5dd58612b0703ab9529e6b
Former-commit-id: 733a59f2f1 [formerly 334b156d2e] [formerly 398a8d6043] [formerly 733a59f2f1 [formerly 334b156d2e] [formerly 398a8d6043] [formerly acbde703a2 [formerly 398a8d6043 [formerly 871fa68ddf242f1e63286939b1324fc3197c7336]]]]
Former-commit-id: acbde703a2
Former-commit-id: 4f012e194d [formerly 304a337a0f] [formerly 58e0390a3e30c9034645286d5dc16b8a6ec9a925 [formerly f27f2c456a]]
Former-commit-id: 0b747852fe8b43c8f636e75192d3866e9a9e20ef [formerly 4ebf8669f4]
Former-commit-id: effdc7ec2a
|
2014-11-04 14:13:29 -06:00 |
|
Steve Harris
|
728899ed0c
|
Merge tag 'OB_14.3.1-26m' into omaha_14.4.1
Former-commit-id: 85d5b72d04 [formerly 4fde31539e] [formerly aff75d954b] [formerly 85d5b72d04 [formerly 4fde31539e] [formerly aff75d954b] [formerly f2fdf98d2f [formerly aff75d954b [formerly 4be51191bc64978e3c455702bede3456666fbffe]]]]
Former-commit-id: f2fdf98d2f
Former-commit-id: 2858cc538b [formerly f3017b859e] [formerly 2b876a6e0e17ef46bda5eb65707f10272b529e42 [formerly da238d6478]]
Former-commit-id: 97fce6689e379c3cd2d664d9ad9821a9d4ec910b [formerly 3f6bdf84c5]
Former-commit-id: 3954f6981f
|
2014-10-15 08:42:02 -05:00 |
|
Michael Gamazaychikov
|
12b346f811
|
ASM #513 - Maps loaded before opening WarnGen not retained when WarnGen is closed.
Change-Id: Iee5611826c4f26cec95daa6277c84a2e6a7ae410
Former-commit-id: 74c03e5b81 [formerly 3851e4c961] [formerly f0b644d92e] [formerly 74c03e5b81 [formerly 3851e4c961] [formerly f0b644d92e] [formerly e6d3baaa9c [formerly f0b644d92e [formerly dff1c1d6fcc5fd0572dd924cfdf7979fc2a18463]]]]
Former-commit-id: e6d3baaa9c
Former-commit-id: c338697738 [formerly a2c89ea11c] [formerly 7008af67fcd8171a0d155c064f558b3a2f7043fe [formerly 4613f0e9d1]]
Former-commit-id: e8740668a7325fb0966a81adfd4a9857c2f48201 [formerly 63f3558f48]
Former-commit-id: 488cf033a9
|
2014-10-06 15:32:10 -04:00 |
|
Steve Harris
|
e40f190f9a
|
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: fa1fa76dd9 [formerly f4b771ea72] [formerly da463c484e] [formerly fa1fa76dd9 [formerly f4b771ea72] [formerly da463c484e] [formerly 2616fe04b6 [formerly da463c484e [formerly 8dc5abec482b4c1c3f3469c0ffc7e06fa697c6cd]]]]
Former-commit-id: 2616fe04b6
Former-commit-id: 1c1e618183 [formerly 306826aed9] [formerly 97756f4cc415dba80b72fef671c8609b2b0ef779 [formerly 523cedbb56]]
Former-commit-id: 85a2c5f56cad1fa8121856b8cb5312cdf481051b [formerly 57f5294f08]
Former-commit-id: e05d31ae36
|
2014-10-03 10:18:34 -05:00 |
|
dmsys
|
6b2eccce36
|
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: 70cb8d81b0 [formerly f704781f4f] [formerly 8c3625cfec] [formerly 70cb8d81b0 [formerly f704781f4f] [formerly 8c3625cfec] [formerly 9f4560c480 [formerly 8c3625cfec [formerly 0bf7ecb27d41f81f1d6727674fc1475eeaa8512c]]]]
Former-commit-id: 9f4560c480
Former-commit-id: 0cb584f44e [formerly 07f84c6b26] [formerly 674f011faa89a8d6263043b42cfc79d80e3b82b4 [formerly b884e5e32d]]
Former-commit-id: 8f7a656cd223aa4bbbad7217939da98d6e8672ab [formerly e00ea2d8cd]
Former-commit-id: 71d6e48473
|
2014-09-30 13:45:54 -04:00 |
|
Steve Harris
|
10752cbc42
|
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: 6900bb61c1 [formerly 3598e9b5b6] [formerly 90e08b96e1] [formerly 6900bb61c1 [formerly 3598e9b5b6] [formerly 90e08b96e1] [formerly 3b6a8a1447 [formerly 90e08b96e1 [formerly c8b5d89c2e202e8bb4ad59d9ced8882ec8c2a6c1]]]]
Former-commit-id: 3b6a8a1447
Former-commit-id: e9774e46ea [formerly 842abaad49] [formerly 1f609e71c1d55fbd64663d85caf8d8fbf61ab92c [formerly 6330a62e85]]
Former-commit-id: df06a15df0e12cfd77916f5f59e1b95c241b34d2 [formerly 30f0d27dfb]
Former-commit-id: 4c4380580f
|
2014-09-29 12:58:56 -05:00 |
|
David Friedman
|
ed3bed65d4
|
ASM #15658 - WarnGen: inclusion of watch information in marine products
Change-Id: I13d9e58b1df3dd434cdea66060dbc5886c0e27f2
Former-commit-id: ea894ca5fc [formerly 86100b6ca8] [formerly 6791e8d885] [formerly ea894ca5fc [formerly 86100b6ca8] [formerly 6791e8d885] [formerly 05707d0f20 [formerly 6791e8d885 [formerly 78cc67f9d2f86c2088ffc5695c4dea879a9e2ebb]]]]
Former-commit-id: 05707d0f20
Former-commit-id: 39608cef87 [formerly 78f7f0fc88] [formerly e4217632693bc1a8536646a8fa63f65c055822c6 [formerly b3bd3a9d7f]]
Former-commit-id: c1bf57bee47fd5a37681a17e8a8301df05b879d9 [formerly 1204c0d666]
Former-commit-id: cd643396d6
|
2014-09-26 20:05:46 +00:00 |
|
David Friedman
|
9bda6e748f
|
ASM #15551 - WarnGen: only WCN should be used while including TOR/SVR watches in WarnGen products
Change-Id: I8b8e9ae40596e5a3d5f0aa44d2e946aa7a68a1ae
Former-commit-id: 52788dc473 [formerly 1737d16a5c] [formerly 33aee54b8f] [formerly 52788dc473 [formerly 1737d16a5c] [formerly 33aee54b8f] [formerly db29ec9dec [formerly 33aee54b8f [formerly c8aa2fbfc35c872e2d50de2212eaf16db9b5483d]]]]
Former-commit-id: db29ec9dec
Former-commit-id: 3a4b64b244 [formerly f207169057] [formerly 98df6f24bb854efcf38b4d519a69b4cfb6549f6a [formerly bda6e42529]]
Former-commit-id: c67aaf513adc787fca00ecbf1b8b3865e61359b3 [formerly a740acaedf]
Former-commit-id: 140950a966
|
2014-09-26 15:13:56 +00:00 |
|
David Friedman
|
2ccc61d974
|
ASM #15551 - WarnGen: only WCN should be used while including TOR/SVR watches in WarnGen products
Change-Id: I1698025cad4310f8fc30938294c161c1f9797f03
Former-commit-id: e186ecc15f [formerly cfcfc17a2b] [formerly 41820f112f] [formerly e186ecc15f [formerly cfcfc17a2b] [formerly 41820f112f] [formerly c85b0d1cfd [formerly 41820f112f [formerly 70b520c08670646047ffa753814f98c032938ff8]]]]
Former-commit-id: c85b0d1cfd
Former-commit-id: aa44cc223f [formerly 7f9fdcb74b] [formerly 85fb0295278cf649fceb869b36e00a9b5838cced [formerly f6d3a80dbf]]
Former-commit-id: 89bc5587a18c450923f919a65eb6b7c148de99d5 [formerly d1160ea2ca]
Former-commit-id: a45e6dfdcf
|
2014-09-26 13:07:28 +00:00 |
|
David Friedman
|
5731b7be45
|
ASM #16783 - Warngen: Possible problem when there are two effective VTEC actions for a watch
Change-Id: I76599d23396fe64c9448440787e67d752ed6b028
Former-commit-id: 15956c0d58 [formerly c16f5c2e7c] [formerly 5755c120d5] [formerly 15956c0d58 [formerly c16f5c2e7c] [formerly 5755c120d5] [formerly e82f96193e [formerly 5755c120d5 [formerly 117c2f072b647e353456832f2f0088d51a660d65]]]]
Former-commit-id: e82f96193e
Former-commit-id: 38b1f21829 [formerly 214002e207] [formerly 3dbc33db262d9bada00bd433cc886c15d5c7e52e [formerly 07befd1cce]]
Former-commit-id: dea055fed7e293d338ce1c20c31a4130f4243601 [formerly 4aa2667d1f]
Former-commit-id: 73b0da212a
|
2014-09-25 22:10:42 +00:00 |
|
Qinglu.Lin
|
a54643cb55
|
ASM #15551 - WarnGen: only WCN should be used while including TOR/SVR watches in WarnGen products
Change-Id: I33fb6fab8d49aca4f12f76c763e5f3ddbd9272b5
Former-commit-id: 66aa148879 [formerly 1c55b5c400] [formerly 94fed71091] [formerly 66aa148879 [formerly 1c55b5c400] [formerly 94fed71091] [formerly ef851d0016 [formerly 94fed71091 [formerly 8b194664458246dad7509c44bcc07480cb088ddd]]]]
Former-commit-id: ef851d0016
Former-commit-id: d17c5c4cea [formerly 94e636a862] [formerly d474e64298e43533fc8fae332206a5876ea17ca1 [formerly 3e1d8d83a9]]
Former-commit-id: 66190dcbfae8433d1114faa1702550156ed8f5da [formerly c3be043b3a]
Former-commit-id: 73c0213b36
|
2014-09-25 15:16:42 -04:00 |
|
Brian.Dyke
|
b8b9d3105b
|
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: 6dafb062e9 [formerly b49b13f77e] [formerly 4b418918d4] [formerly 6dafb062e9 [formerly b49b13f77e] [formerly 4b418918d4] [formerly 87fa32d2d4 [formerly 4b418918d4 [formerly e04ad21771ce410beb25e15fe300a34796a1a062]]]]
Former-commit-id: 87fa32d2d4
Former-commit-id: e16e6e5a2a [formerly cf8f88a5b3] [formerly cd9613c4078591bf28ad1064690bfbbbf551cbaa [formerly 1f09dad9e9]]
Former-commit-id: c0bfed574e2fa14299c865bac77af847704ef3c7 [formerly 8997f79ae4]
Former-commit-id: c22973f909
|
2014-09-24 11:05:37 -04:00 |
|
David Friedman
|
997b9dc024
|
ASM #15658 - WarnGen: inclusion of watch information in marine products
Change-Id: I545d1b07444c9ca00ea2e95c4ccaed79946bbead
Former-commit-id: c4d6fe5af5 [formerly 0ed1ce5726] [formerly a6acf71a0a] [formerly c4d6fe5af5 [formerly 0ed1ce5726] [formerly a6acf71a0a] [formerly 2ee1ebe72d [formerly a6acf71a0a [formerly e0f6cc70bf5258d66bfa8a4ddb1daf871b6c92c5]]]]
Former-commit-id: 2ee1ebe72d
Former-commit-id: c5af2266fd [formerly c720756850] [formerly 8caec0f0bc6117c054c47d1e5c4fa6b1b4883937 [formerly 4b3f5bc5c7]]
Former-commit-id: 25bc3b6da45e1701a23211212a847830e8a6c910 [formerly 3ee52065d1]
Former-commit-id: 7ee76a9b2a
|
2014-09-23 18:39:22 +00:00 |
|
Steve Harris
|
b316e73f24
|
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: e3a7796362 [formerly da530db540] [formerly 091555cf10] [formerly e3a7796362 [formerly da530db540] [formerly 091555cf10] [formerly 4c56844e29 [formerly 091555cf10 [formerly 69c52fb4a22997d0a0f9c620bd20f00b8c5fd4ce]]]]
Former-commit-id: 4c56844e29
Former-commit-id: a1bf8ecdb1 [formerly 84a98ec4ca] [formerly 275a024694cc566f868a949d844ab91490e424f6 [formerly 214b48dcb8]]
Former-commit-id: 9adb015794435a13e656ce09cd891bfd9e4d53db [formerly fdc523a026]
Former-commit-id: f4ea796cea
|
2014-09-19 10:28:57 -05:00 |
|
Qinglu.Lin
|
efdd4beb40
|
ASM #15465 - No variable for failed site's MND Header location available for WarnGen to use
Change-Id: I8bc59786379680f635e85917eebf4c9d6b4ea683
Former-commit-id: ac3b48719e [formerly 1aac17e599] [formerly 10da99d3f7] [formerly ac3b48719e [formerly 1aac17e599] [formerly 10da99d3f7] [formerly c2047b94b1 [formerly 10da99d3f7 [formerly f79ed1b1867b5516a390a8f70b2141052be3eb38]]]]
Former-commit-id: c2047b94b1
Former-commit-id: 25b7db654e [formerly 9c70d41d38] [formerly 61650c2f46b5493aaec391f67b4222df9caec990 [formerly ab0eb6a507]]
Former-commit-id: 4de38279e5fedd8b80b8985a1c7a0ef0310ee788 [formerly 448d4ceb2d]
Former-commit-id: 1e3f3e2b84
|
2014-09-18 11:21:18 -04:00 |
|
Qinglu.Lin
|
122ceb205d
|
ASM #15551 - WarnGen: only WCN should be used while including TOR/SVR watches in WarnGen products
Change-Id: Ia4350f8c17166c8f972779f8bde1763ec4cd3bd5
Former-commit-id: 7e6097f690 [formerly 4bce4db9ef] [formerly 0e2be5afd8] [formerly 7e6097f690 [formerly 4bce4db9ef] [formerly 0e2be5afd8] [formerly 5e93999662 [formerly 0e2be5afd8 [formerly e7ab29fbfebb1943e0b0702547dbd353367e797d]]]]
Former-commit-id: 5e93999662
Former-commit-id: 9f70edbb34 [formerly 6ef0e3bb6e] [formerly a8ad02db889c2638f302a347fea519b0862584fe [formerly 94ca48dcdf]]
Former-commit-id: b0c58a4e8b0cd34baed6965762135dcfe9cd113d [formerly 95bf760e81]
Former-commit-id: f3f0f4d5c6
|
2014-09-17 10:26:25 -04:00 |
|
Matthew Howard
|
df6fb9c83d
|
Merge "ASM #641 - Filtered cases where Areas do not match Zones." into asm_14.3.1
Former-commit-id: 7f1afc7176 [formerly 4c650fec35] [formerly aa273ffb70] [formerly 7f1afc7176 [formerly 4c650fec35] [formerly aa273ffb70] [formerly 6e0d48d840 [formerly aa273ffb70 [formerly f33abc302597a3120c9220278e28d865d5f185b6]]]]
Former-commit-id: 6e0d48d840
Former-commit-id: c7fa5827ad [formerly 7f464afac7] [formerly 4bca28549f5bfe6ca45333848dfc7ace2b7c045b [formerly 5a54cf0d33]]
Former-commit-id: 2b9e0b35c5abc3678ee07bfccfa56f1e3169fa46 [formerly 3508956a81]
Former-commit-id: 6bd366d178
|
2014-09-15 15:03:36 -05:00 |
|
Daniel.Huffman
|
f3e3d97263
|
ASM #641 - Filtered cases where Areas do not match Zones.
Change-Id: I1207442f77aece9d79b010669755ee7fc6f82362
Former-commit-id: 2240767eec [formerly da198f916a] [formerly bacc914bd0] [formerly 2240767eec [formerly da198f916a] [formerly bacc914bd0] [formerly 0f30c0f897 [formerly bacc914bd0 [formerly bf6acaafc42ba98e4257d3eb089b7a1e7adf7bd4]]]]
Former-commit-id: 0f30c0f897
Former-commit-id: 0e58d65d18 [formerly 5e9b53f601] [formerly 0b5d98fae41ce8317528285ee24937bbb30161fc [formerly 716bc02504]]
Former-commit-id: ab0f889515c3fe9a6c8949e9ec5201c2552e4137 [formerly 49797e0c78]
Former-commit-id: 3621d185ed
|
2014-09-15 19:18:33 +00:00 |
|
Roger Ferrel
|
caf360be46
|
Omaha #3353 Fix null pointer opening GenerateGeoDataSetDialog.
Former-commit-id: d7700a6ae1 [formerly e121422e82] [formerly a31f3e670f] [formerly d7700a6ae1 [formerly e121422e82] [formerly a31f3e670f] [formerly bab69dc58c [formerly a31f3e670f [formerly f7fe3c9351d354046ef5038ae561db469421a442]]]]
Former-commit-id: bab69dc58c
Former-commit-id: 845a5dee1f [formerly 42882fa28e] [formerly c3cb403a73e8ee21ff8f4d19aad42344b3412901 [formerly 4385e34dd8]]
Former-commit-id: a7c3f8f7b4f919d13e8710ca611a3994ae5ece22 [formerly e289919fca]
Former-commit-id: 681b93eb57
|
2014-09-15 13:00:02 -05:00 |
|
Brian.Dyke
|
c8f3fbfa22
|
Merge branch 'master_14.3.1' into asm_14.3.1
Former-commit-id: eb63c3e61a [formerly 54b26b3616] [formerly 216f34fb25] [formerly eb63c3e61a [formerly 54b26b3616] [formerly 216f34fb25] [formerly 1541e4c255 [formerly 216f34fb25 [formerly 8e4f6e96f7b70d6f2b7517f3f0695350506169c7]]]]
Former-commit-id: 1541e4c255
Former-commit-id: f2750cb31f [formerly 5115becdef] [formerly f7dde4d7662c0fb29ffb1d09bf474a5e8a04ae17 [formerly ffa56ef950]]
Former-commit-id: 4de6d3d3fa8ae33113a69367f47a1402cf7fe844 [formerly 26b1938813]
Former-commit-id: 55a25f2525
|
2014-09-15 10:46:25 -04:00 |
|
David Friedman
|
4310c40a9d
|
ASM #16730 - WarnGen Watch wording error when issuing product only over Marine Locations
Change-Id: I361a1635cf11f3c66801f33c74034028b3e0271d
Former-commit-id: ea4aed7b84 [formerly 94d78ed010] [formerly 8d7ba120a2] [formerly ea4aed7b84 [formerly 94d78ed010] [formerly 8d7ba120a2] [formerly bed361fe35 [formerly 8d7ba120a2 [formerly 17d27fca04fb733d74e5bac99bfed3112bd81b6c]]]]
Former-commit-id: bed361fe35
Former-commit-id: aaba0a2933 [formerly 78217ab3e9] [formerly 69acf378f1c22370ad97e1e83cf8c1e6f9500f7d [formerly 93e07181c0]]
Former-commit-id: c544543f8ff90995d32456eb0339301c79318170 [formerly 8a1e71f784]
Former-commit-id: a80f112c90
|
2014-09-10 19:28:57 +00:00 |
|
Brian.Dyke
|
74f3dd287f
|
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: d8271549ff [formerly fe85eb9f70] [formerly 3d9a3de6e4] [formerly d8271549ff [formerly fe85eb9f70] [formerly 3d9a3de6e4] [formerly 01dfe503f5 [formerly 3d9a3de6e4 [formerly a3365943e7b7972a5c86f8cb1ad39667ab9e0695]]]]
Former-commit-id: 01dfe503f5
Former-commit-id: 3319853886 [formerly 29364e2b9f] [formerly 3c59646613e08582e0a259ecdec538060ca047c5 [formerly c42733eb39]]
Former-commit-id: 582e8cd843a57e8f4ac7a6572a5b3e23cd3b4f25 [formerly a31d3d702e]
Former-commit-id: 0f9fe8301a
|
2014-09-09 11:44:30 -04:00 |
|
Qinglu.Lin
|
e4c8ecb46f
|
ASM #15551 - WarnGen: only WCN should be used while including TOR/SVR watches in WarnGen products
Change-Id: I0438af111b0db290373c7553006002edec2b2110
Former-commit-id: efd54751a5 [formerly 62bcefb9e1] [formerly 8c28597210] [formerly efd54751a5 [formerly 62bcefb9e1] [formerly 8c28597210] [formerly 902b6c55bd [formerly 8c28597210 [formerly 33adaf353c6a4b7dc418dc86428257dae260c4c5]]]]
Former-commit-id: 902b6c55bd
Former-commit-id: 750951ed31 [formerly 920b6bb53b] [formerly 4fb24f077ee8254399c85a7e1b5bdb926ee3bf91 [formerly 9c67b89df7]]
Former-commit-id: 24838cc154dff53eef269cc01790469a9c0466f9 [formerly c746dbabad]
Former-commit-id: ec9b3fa971
|
2014-09-04 14:09:24 -04:00 |
|
Nate Jensen
|
b9e7dd0aa8
|
Omaha #3356 remove more unnecessary register buddies and policies
Change-Id: I3e39f9b8274b2b9104f3b3d037601c1553c43e13
Former-commit-id: 0fb9fc4f59 [formerly 2c74d90cc4] [formerly c0dab26b92] [formerly 0fb9fc4f59 [formerly 2c74d90cc4] [formerly c0dab26b92] [formerly 9d462e1dd9 [formerly c0dab26b92 [formerly b535d54c52c3e38bb9fa083ba911ad49c090f214]]]]
Former-commit-id: 9d462e1dd9
Former-commit-id: 25000511be [formerly d5e948b7e2] [formerly 50853652fc8d12a23e8399b69c56c2269a0b8e23 [formerly 05a73b1e4b]]
Former-commit-id: 9728aa8c5981d6ffdaa1baa487fe07048ea977fa [formerly d87cfb8131]
Former-commit-id: 3188cd0af2
|
2014-09-03 11:34:10 -05:00 |
|
Ben Steffensmeier
|
afd34c4e2a
|
Omaha #3390 Remove references to deprecated API.
Former-commit-id: 59e6ec282f [formerly 950075dc59] [formerly 1d2144e840] [formerly 59e6ec282f [formerly 950075dc59] [formerly 1d2144e840] [formerly e32037b42a [formerly 1d2144e840 [formerly ec7eeeb08af2cbad5d7880ae17ba7b351de23dc3]]]]
Former-commit-id: e32037b42a
Former-commit-id: 31f58cc68e [formerly 068653ac95] [formerly 978887cb907a630899b357400937ea888e94a9f4 [formerly b77166c26e]]
Former-commit-id: 7c80d8b87912c05d70384388c8b2a77908c257b7 [formerly 6e1981d6f6]
Former-commit-id: 5b35e526f4
|
2014-09-02 15:39:45 -05:00 |
|
Qinglu.Lin
|
175af9a9d3
|
ASM #15551 - WarnGen: only WCN should be used while including TOR/SVR watches in WarnGen products
Change-Id: I286bc4cc809fcc9257f72051f1bb74f8acc24c05
Former-commit-id: dda32f85e9 [formerly b32ea40289] [formerly 2374673f8d] [formerly dda32f85e9 [formerly b32ea40289] [formerly 2374673f8d] [formerly ae13ea419e [formerly 2374673f8d [formerly 59890eef397f3282ef26f259ca85ffea3db7b710]]]]
Former-commit-id: ae13ea419e
Former-commit-id: 5c521a214c [formerly 3fcdc279ea] [formerly 153a4d5b66ab5d399ab180ca9af559bd33c0b1bf [formerly 075df9d234]]
Former-commit-id: 04e6c13acdb23e049d0e8a380998b12c7056105a [formerly 415af39911]
Former-commit-id: 7ec0ec8877
|
2014-09-02 14:37:19 -04:00 |
|
Steve Harris
|
3c8bfc8160
|
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: 3619a11a8a [formerly bddf9c0f27] [formerly 793064063b] [formerly 3619a11a8a [formerly bddf9c0f27] [formerly 793064063b] [formerly 5d58625abc [formerly 793064063b [formerly 8793dca41f756ba812206b48391caea6e593a657]]]]
Former-commit-id: 5d58625abc
Former-commit-id: 10070d2762 [formerly 66b485c000] [formerly db0dcd3c8aec6653a2b81e49b72319049b73eb54 [formerly d984dd538f]]
Former-commit-id: ecf6e2073b4dd08f6ed165eae9b0647f2d0b9dc4 [formerly e681e0a457]
Former-commit-id: ecf26b3ac5
|
2014-08-29 10:17:52 -05:00 |
|
Brian.Dyke
|
42e17418ed
|
Merge branch 'master_14.3.1' into asm_14.3.1
Former-commit-id: 8f69c4b855 [formerly cbe59aded5] [formerly 6f3d0508e4] [formerly 8f69c4b855 [formerly cbe59aded5] [formerly 6f3d0508e4] [formerly 2c25f68437 [formerly 6f3d0508e4 [formerly f34bc4f81eb5ac92ef306f73f8c34243d3f78e31]]]]
Former-commit-id: 2c25f68437
Former-commit-id: 4afabdfb18 [formerly 07ffb04445] [formerly a36a933e1051f5ac6e37163907155d158df993b0 [formerly 2abed9c0eb]]
Former-commit-id: 1bf17b8d14f9883ca968441daded2fdc1e43f653 [formerly 8d7b13548f]
Former-commit-id: b01c60ca50
|
2014-08-29 10:19:02 -04:00 |
|
David Friedman
|
64b66c9dde
|
ASM #15658 - WarnGen: inclusion of watch information in marine products
Change-Id: I9f99e6136027f1a6419800f87e5a5709fe5be6b9
Former-commit-id: bb421fd3e4 [formerly ea1e9feb1d] [formerly a2dfe8e8f6] [formerly bb421fd3e4 [formerly ea1e9feb1d] [formerly a2dfe8e8f6] [formerly ea9230b37c [formerly a2dfe8e8f6 [formerly 6bfa1d6662b00925814be7126592bbe340651649]]]]
Former-commit-id: ea9230b37c
Former-commit-id: 25e0bcdc6f [formerly 10114b0bd1] [formerly 74a7d88387ec143a88a15084374737200a0e031a [formerly bc22f7309c]]
Former-commit-id: 2553d508e5b2d1bb6b928ee04f40220c66d897ac [formerly bfc3fa98b4]
Former-commit-id: 39c7024668
|
2014-08-28 15:43:32 +00:00 |
|
Brian.Dyke
|
2da6c7b93b
|
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: 0a5ddf7457 [formerly a08db8d73d] [formerly e654318431] [formerly 0a5ddf7457 [formerly a08db8d73d] [formerly e654318431] [formerly aa83bf804f [formerly e654318431 [formerly 7334d3991903dfe8a62728de33c21e81534fdbb6]]]]
Former-commit-id: aa83bf804f
Former-commit-id: 4a56b6f6e1 [formerly f90649d7e7] [formerly c580412a81e899b2803a785d3de77c4ea7ca97b3 [formerly f7f16ff9eb]]
Former-commit-id: 2b5f667a78842762d60c8ab0ba442f22b9229095 [formerly c0dc594eda]
Former-commit-id: 7e4ab705cc
|
2014-08-27 11:19:19 -04:00 |
|
Roger Ferrel
|
b3d2996e76
|
Omaha #3353 Changes to remove Geospatial data set generation off the UI thread.
Change-Id: I5213f627a97a27bdb92c4857eac4071c5450b790
Former-commit-id: 20362833cf [formerly a610e0a34b] [formerly ca3a0595d2] [formerly 20362833cf [formerly a610e0a34b] [formerly ca3a0595d2] [formerly d0779ef059 [formerly ca3a0595d2 [formerly f16a8ff2c51c392957e13ef63423abe9f99b3301]]]]
Former-commit-id: d0779ef059
Former-commit-id: 248bd0a393 [formerly be7d387a4b] [formerly 1fd4b3451da3ccea875b5e6dc43fa6eacddc8994 [formerly cfe1212590]]
Former-commit-id: 745fe2a291852f43240cb02cd4c30d6024a6d7fa [formerly a9d8c8f3f5]
Former-commit-id: c534338504
|
2014-08-25 07:59:26 -05:00 |
|
David Friedman
|
b970f9769c
|
ASM #16703 - Errors issuing Marine Products over areas under a Watch
Change-Id: Idd28b86771295c90cec3c9b3e7e2dfc96c84ff4f
Former-commit-id: 280f4a4b64 [formerly b053e1e2ce] [formerly 78ee5a56c5] [formerly 280f4a4b64 [formerly b053e1e2ce] [formerly 78ee5a56c5] [formerly 6a7638ddae [formerly 78ee5a56c5 [formerly 7027ff533991251f64f2e5a0deb31e2945cdde5f]]]]
Former-commit-id: 6a7638ddae
Former-commit-id: 4f3458f5fb [formerly 95fbbdf730] [formerly e0968bdffeb4e1072679ff80338a84d7bb82e1e9 [formerly 76d78ff72e]]
Former-commit-id: 2eb00233e833c805596310a628d40ea6515979a3 [formerly 2ce533f866]
Former-commit-id: 40c7d1971e
|
2014-08-20 14:13:32 +00:00 |
|
Michael Gamazaychikov
|
aa8278e995
|
ASM #15701 WarnGen displaying error for Watch Wording when switching from backup site to local site
Change-Id: I9ff834f0b3717d046f278b8a21ca955e5f5c4805
Former-commit-id: d0c9d21538 [formerly 2b450af136] [formerly 9897417235] [formerly d0c9d21538 [formerly 2b450af136] [formerly 9897417235] [formerly c14a5287ac [formerly 9897417235 [formerly 126ec43423a864df597bd6dd745671ee0bf4fbfb]]]]
Former-commit-id: c14a5287ac
Former-commit-id: 3050ad699d [formerly ab21a0f8e9] [formerly 2fcf1110fa9581e169e37c41d84f20cc066eb8b5 [formerly 4097a7ddd0]]
Former-commit-id: 158147e009c43f9b7c0c8b9b3edd0709f3289054 [formerly 2115121def]
Former-commit-id: 65daa0f117
|
2014-08-15 11:03:23 -04:00 |
|
Nate Jensen
|
f7ae70ac02
|
Omaha #3356 cleanup of unnecessary register buddies and buddy policies
Change-Id: I1d6c279478f38876a8df67d2f9dd186a2efdeca0
Former-commit-id: d61c65787b [formerly 253198b5bc] [formerly b3083a663e] [formerly d61c65787b [formerly 253198b5bc] [formerly b3083a663e] [formerly 9b72a1399d [formerly b3083a663e [formerly 48536dd79d933508ac54b3b6e9bbd166fd218330]]]]
Former-commit-id: 9b72a1399d
Former-commit-id: e7b11aaf88 [formerly 58a4cb95c1] [formerly 1fed4e6852cd8eca79ebee598c5badd5a0a3fe14 [formerly d67083655a]]
Former-commit-id: 7e191ad12969bca5c4c6b83a1e9488c58f4c6928 [formerly 951feab33d]
Former-commit-id: 7336692b85
|
2014-08-14 10:22:37 -05:00 |
|
Steve Harris
|
8bce1903ec
|
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: d606269c5b [formerly a92dc418c6] [formerly 0fb743ec44] [formerly d606269c5b [formerly a92dc418c6] [formerly 0fb743ec44] [formerly bf9a0fa5de [formerly 0fb743ec44 [formerly f7d474895366eb23ae5eef242a4568f911435aa3]]]]
Former-commit-id: bf9a0fa5de
Former-commit-id: 386dfebe65 [formerly b848e05aa1] [formerly af44a55101128b715bc6595cfc378e8fcdc2eb3d [formerly 46fe792d83]]
Former-commit-id: 5636830e013729a270565af661d066aa2f000390 [formerly 5e2f7a9f74]
Former-commit-id: a0fdc76880
|
2014-08-04 22:20:29 -05:00 |
|
Brian.Dyke
|
2e18cc1022
|
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: 770b56e740 [formerly 8ea5c4f98b] [formerly 6f6daaa249] [formerly 770b56e740 [formerly 8ea5c4f98b] [formerly 6f6daaa249] [formerly 7fbb3b6a54 [formerly 6f6daaa249 [formerly f22cc09d0a6fdc7a806726d5207f6b3507972b94]]]]
Former-commit-id: 7fbb3b6a54
Former-commit-id: 05a368a3e1 [formerly 3e56f7e403] [formerly 0500f4276b4789b2caf13c0deac9ff644eca9eb5 [formerly 45cfe1aa9c]]
Former-commit-id: 4b8332900546e194d9cc4c27193213c3281c4d78 [formerly 861a40ce5a]
Former-commit-id: 4be2bcf64a
|
2014-08-04 16:40:02 -04:00 |
|
Mark Peters
|
8d1732d0cf
|
Omaha #3471 Replace Raytheon plugin calls to deprecated IGraphicsTarget.createShadedShape()
Change-Id: Iea874ecfa2c7f16eacdc7f097039ba20f10fc2b9
Former-commit-id: 1342f67614 [formerly 9be02c8dfe] [formerly 22c077d77f] [formerly 1342f67614 [formerly 9be02c8dfe] [formerly 22c077d77f] [formerly 88b334cf14 [formerly 22c077d77f [formerly 4bcf01e33f1d2e038499fdece63e81b6288b7152]]]]
Former-commit-id: 88b334cf14
Former-commit-id: 8ccec2e2c8 [formerly 469f73cb43] [formerly 3dc8f434a87e7d966a11f8dc0dd83eee4a57069c [formerly 666c988f64]]
Former-commit-id: f178c14861fee90813e282109070e3d0703c6657 [formerly ca4003ca7f]
Former-commit-id: 7a4c25190e
|
2014-08-04 13:27:45 -05:00 |
|
Brian.Dyke
|
1d9494a502
|
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: 590e37a8f2 [formerly 301f3094be] [formerly 9abb02ea8a] [formerly 590e37a8f2 [formerly 301f3094be] [formerly 9abb02ea8a] [formerly 270d2b0ddb [formerly 9abb02ea8a [formerly b209604e1f0d6e790980d0bc8f1760e38f448076]]]]
Former-commit-id: 270d2b0ddb
Former-commit-id: b9da27608c [formerly bbe6ec4d50] [formerly 4f6e23e0fe3a5044b75abe6a89c965ab32b19947 [formerly 37aacfcb96]]
Former-commit-id: ea25ca2fdedff8bbe1c901d0538886147f633e65 [formerly b9daa26f7d]
Former-commit-id: 803ceadaec
|
2014-08-04 13:10:13 -04:00 |
|
Brian.Dyke
|
a395bc2a5a
|
Merge branch 'asm_14.2.2' into master_14.2.2
Former-commit-id: a9cf7e9951 [formerly eeca2f2ec8] [formerly 3598f7b549] [formerly a9cf7e9951 [formerly eeca2f2ec8] [formerly 3598f7b549] [formerly 905728d2fb [formerly 3598f7b549 [formerly 96ff2234e0d8893695b33a79d24a026a1a409073]]]]
Former-commit-id: 905728d2fb
Former-commit-id: d40310d407 [formerly 370b180653] [formerly cb0d54b6f5c9c825dfeb23dea6bf566569b45e86 [formerly e3745633a3]]
Former-commit-id: 5fff891aca335077a8aa0592db78791cd85164e7 [formerly f5030dfeb5]
Former-commit-id: 29bc56c37f
|
2014-07-31 09:56:21 -04:00 |
|
Shawn.Hooper
|
a774213fa9
|
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 9732ea69398c323fee2b61570bfc18ab595da709 [formerly 8cffe955a9] [formerly c71189dd92 [formerly e24dd6958e] [formerly ba4c386f30] [formerly c71189dd92 [formerly e24dd6958e] [formerly ba4c386f30] [formerly 8cffe955a9 [formerly ba4c386f30 [formerly 00ec5e2d47809d084b3e24e1f1503af96d129fed]]]]].
Change-Id: Ie01ca9463a4db371ffce0b6e38d5c43e1f9addf2
Former-commit-id: adcd4dfa64 [formerly 27f50397aa] [formerly 976c7b2d4a] [formerly adcd4dfa64 [formerly 27f50397aa] [formerly 976c7b2d4a] [formerly 4e322737ce [formerly 976c7b2d4a [formerly d272d426f8bd218954a75a7b2e19d21b30f975cb]]]]
Former-commit-id: 4e322737ce
Former-commit-id: 6388744d4f [formerly af19d9f9c4] [formerly 04fd2b332f2591e977341aaaa648d03eb4ecc9c3 [formerly fe0fffe51b]]
Former-commit-id: 0693c97544c8dd01a9ad695768ee8e2df2354373 [formerly 17ac974932]
Former-commit-id: 53daf4e3bc
|
2014-07-30 14:03:51 -04:00 |
|
Mark Peters
|
5cbe006dc9
|
Omaha #3429 Replace Raytheon plugin calls to deprecated IGraphicsTarget.drawLine()
Change-Id: I9de68a9a047a2d6c3744b29de292efb7cfb44bbf
Former-commit-id: 6376572795 [formerly 11abefd4de] [formerly 437e127ebc] [formerly 6376572795 [formerly 11abefd4de] [formerly 437e127ebc] [formerly bac12d844b [formerly 437e127ebc [formerly a222b29ff24bf81d1c8aefd54fa33f52461c9c25]]]]
Former-commit-id: bac12d844b
Former-commit-id: 88edbdafea [formerly 95886b5ded] [formerly 1492820d8873fe4e06b826ecddbb5536f26a2abc [formerly 6edd39cc9e]]
Former-commit-id: cdffd110dc0c39f2afadf75b08b0881b15b96f9a [formerly baecaaaca0]
Former-commit-id: 011ef40360
|
2014-07-29 11:20:53 -05:00 |
|
Michael Gamazaychikov
|
b280c3f5c7
|
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: c71189dd92 [formerly e24dd6958e] [formerly ba4c386f30] [formerly c71189dd92 [formerly e24dd6958e] [formerly ba4c386f30] [formerly 8cffe955a9 [formerly ba4c386f30 [formerly 00ec5e2d47809d084b3e24e1f1503af96d129fed]]]]
Former-commit-id: 8cffe955a9
Former-commit-id: 4c4132f0aa [formerly f186b49e92] [formerly ff7f89fdff34c0527901d834458ee4e10d6f19f3 [formerly bb7b43be49]]
Former-commit-id: 6829c833cd21836bdce90d24a801642877a0b282 [formerly 134b1286fc]
Former-commit-id: cc3172ead3
|
2014-07-28 15:12:10 -04:00 |
|
Qinglu.Lin
|
7f7869a810
|
ASM #15554 - Improve speed/efficiency of WarngenLayer.populateStrings
Change-Id: I6a3b9823ac7c23ba171206708187ab3fc3c7c1ca
Former-commit-id: 632ec498ff [formerly f69a06238b] [formerly 1eca5ef51a] [formerly 632ec498ff [formerly f69a06238b] [formerly 1eca5ef51a] [formerly 2aa16c114a [formerly 1eca5ef51a [formerly 3b971d52a82099142fe08986df879a379dfa6314]]]]
Former-commit-id: 2aa16c114a
Former-commit-id: 3cdad48a5d [formerly 28842008ec] [formerly 0530943e480469d1125783c548c7f3e20af3002b [formerly 80c41d8904]]
Former-commit-id: eb074bc63aab17207cd6f4a5ebca29b3dd524c6a [formerly b3b4c058aa]
Former-commit-id: 000daa2716
|
2014-07-28 12:36:07 -04:00 |
|
Jonathan Sanchez
|
1eebd8ac53
|
Issue #3419 Refactored watches to use the county table.
Change-Id: Ide7e07813203213511640d5ee515e73b278089c1
Former-commit-id: c479178882 [formerly 997485dd22] [formerly 86a8ca4a30] [formerly c479178882 [formerly 997485dd22] [formerly 86a8ca4a30] [formerly b991838494 [formerly 86a8ca4a30 [formerly 135d7ffa84af58d7b3c9575e654fa1298b76b2e2]]]]
Former-commit-id: b991838494
Former-commit-id: 3d434c29c1 [formerly f7bc9a8023] [formerly 850ffbd991e733a0bd522e120fa37ad963197e14 [formerly 025c29acc0]]
Former-commit-id: 5b450f5b49602fd2a5be013c2018216984912a58 [formerly 56cbd23141]
Former-commit-id: e4268f814e
|
2014-07-22 15:32:12 -05:00 |
|
David Friedman
|
b2c35e26d6
|
ASM #15052 - WarnGen: service backup should use config.xml from failed site
Change-Id: Icff8ca2a124da595be6b83ac9f9999831daee0b1
Former-commit-id: b82fb691e0 [formerly 8784501bba] [formerly a45fe1dad0] [formerly b82fb691e0 [formerly 8784501bba] [formerly a45fe1dad0] [formerly db8977e281 [formerly a45fe1dad0 [formerly f9c0dc09ee7bc692c6f70b4a5ad67bb2c2ed5a20]]]]
Former-commit-id: db8977e281
Former-commit-id: 363de7a3c5 [formerly 5270711c5d] [formerly c850f84db3b8b601f2bbda41059ace7ce49e7f85 [formerly d36834080e]]
Former-commit-id: bb504fd33ed91e33e9927f5c6b5ff9592840208c [formerly 4f53bbd556]
Former-commit-id: c44e9f88f6
|
2014-07-03 13:58:24 +00:00 |
|
Richard Peter
|
0b0b58e89c
|
Merge branch 'omaha_14.3.1' (14.3.1-12) into omaha_14.4.1
Conflicts:
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/datastructure/LoopProperties.java
cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java
edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-spring.xml
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/AbstractWatchNotifierSrv.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/SPCWatchSrv.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/TPCWatchSrv.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/WCLWatchSrv.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/WclInfo.java
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
edexOsgi/com.raytheon.edex.plugin.warning/WarningDecoder.py
Change-Id: I6208fb3e1589dd3f2356f19ea9bbdfaa79ae6d61
Former-commit-id: ed38bf2372 [formerly 6636b301e5] [formerly 93bbd98cbc] [formerly ed38bf2372 [formerly 6636b301e5] [formerly 93bbd98cbc] [formerly 8ecc27f714 [formerly 93bbd98cbc [formerly fc71e1cb26481e91c7d0c16ed0bd06ec5c8c22b9]]]]
Former-commit-id: 8ecc27f714
Former-commit-id: 948e0cd011 [formerly 552ac6d640] [formerly bb5cc0ca71fa6abf17e95b29fbe41a184ac1297e [formerly fc27824dbc]]
Former-commit-id: 98c7362b289abd5b8e115f957b14dcd73116b99a [formerly 0fefdc7cd6]
Former-commit-id: 342192e967
|
2014-07-01 15:34:39 -05:00 |
|
Brian.Dyke
|
71e18fa7dd
|
Merge branch 'master_14.3.1' into asm_14.3.1
Former-commit-id: 31d8874e14 [formerly da6b0f2adf] [formerly b64d38be69] [formerly 31d8874e14 [formerly da6b0f2adf] [formerly b64d38be69] [formerly 6d93f8f3ef [formerly b64d38be69 [formerly 765d6440b1b19d7b0cf789fb7a873e14b4a679e1]]]]
Former-commit-id: 6d93f8f3ef
Former-commit-id: 3a84980ab9 [formerly 685b53d6bc] [formerly 56b741117eb426467c35c0e97c314eea4a29c418 [formerly 55fa980898]]
Former-commit-id: d0af7de2148b40803d2d1faeaccbc88b78b22e66 [formerly d62782613b]
Former-commit-id: 52977a745e
|
2014-07-01 13:47:12 -04:00 |
|