Brian.Dyke
a4f68caac6
Merge branch 'master_14.3.1' into asm_14.3.1
...
Former-commit-id: 6ed90023551e25216c10d05f2568593992326900
2014-09-26 13:02:49 -04:00
Brian.Dyke
bd983e1932
Merge branch 'omaha_14.2.3' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.2.3
...
Former-commit-id: d6369c8346d1ed4d86ed3eb7adc47de0891c7fd7
2014-09-26 11:47:38 -04:00
David Friedman
db29ec9dec
ASM #15551 - WarnGen: only WCN should be used while including TOR/SVR watches in WarnGen products
...
Change-Id: I8b8e9ae40596e5a3d5f0aa44d2e946aa7a68a1ae
Former-commit-id: c8aa2fbfc35c872e2d50de2212eaf16db9b5483d
2014-09-26 15:13:56 +00:00
David Friedman
c85b0d1cfd
ASM #15551 - WarnGen: only WCN should be used while including TOR/SVR watches in WarnGen products
...
Change-Id: I1698025cad4310f8fc30938294c161c1f9797f03
Former-commit-id: 70b520c08670646047ffa753814f98c032938ff8
2014-09-26 13:07:28 +00:00
David Friedman
e82f96193e
ASM #16783 - Warngen: Possible problem when there are two effective VTEC actions for a watch
...
Change-Id: I76599d23396fe64c9448440787e67d752ed6b028
Former-commit-id: 117c2f072b647e353456832f2f0088d51a660d65
2014-09-25 22:10:42 +00:00
David Friedman
8ab4649312
ASM #16773 - WarnGen can become disabled when a followup is selected
...
Change-Id: Ibe0e3b18914840515f8bc9d844a2ffb0a6abddf0
Former-commit-id: 5048af915b004067ec8a6e788a0e9ad3e006c9d8
2014-09-25 21:07:16 +00:00
Qinglu.Lin
ef851d0016
ASM #15551 - WarnGen: only WCN should be used while including TOR/SVR watches in WarnGen products
...
Change-Id: I33fb6fab8d49aca4f12f76c763e5f3ddbd9272b5
Former-commit-id: 8b194664458246dad7509c44bcc07480cb088ddd
2014-09-25 15:16:42 -04:00
Ana Rivera
a72725f9ef
VLab Issue #4794 - O&M RM16720; Update planesMenusPlanView.xml; fixes #4794
...
Change-Id: I8e4b7c563e74e18c3c60e858cd7e6bd3cdaff8e8
Former-commit-id: 833cff4f37542078578de96b3b59723f77c31f4c
2014-09-25 17:46:53 +00:00
Nate Jensen
987060f56c
Omaha #3571 better error handling of invalid geom with map caching
...
Change-Id: I3947613aab5a7789b32ea1d0e3a8e3091d9690d8
Former-commit-id: 0f2066e985dcbcedd2794ce226232efe999b1312
2014-09-25 11:30:27 -05:00
Nate Jensen
174b036c56
Merge "Omaha #3220 - Changes in the area configuration files for FSSObs monitors." into omaha_14.4.1
...
Former-commit-id: e2f23221c3f8301460df2945deb8c760cdf216e9
2014-09-25 08:44:50 -05:00
Slav Korolev
ce2ef5019b
Omaha #3220 - Changes in the area configuration files for FSSObs monitors.
...
Former-commit-id: d7a921d6206f5b09e7a6784c7e86b9167b74685f
2014-09-25 09:02:27 -04:00
Lee Venable
5efe3232a7
Merge "Issue #2757 - Fixed problem with adding and removing zones." into omaha_14.3.1
...
Former-commit-id: 2ec651b767555946485c8a087f891c8736f59105
2014-09-24 16:23:23 -05:00
Nate Jensen
36556fc48b
Omaha #3663 move airep and pirep plguins to ncep features
...
Change-Id: I2c9a274ee85b24e93800fa7c0f73739030995219
Former-commit-id: 8f743862722b2af08e6659ca3beb0366095bcf79
2014-09-24 15:20:17 -05:00
Ana Rivera
9a0e9b17f4
VLab Issue #4669 - Add Beach Hazards Statement (RM 13467); fixes #4669
...
Change-Id: I54c1055b87b7bfab0a35fd391c6ef7156fc3d297
Former-commit-id: 2c16492202230dcbec93cf390b47f400a77a545e
2014-09-24 20:11:29 +00:00
Brian.Dyke
87fa32d2d4
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: e04ad21771ce410beb25e15fe300a34796a1a062
2014-09-24 11:05:37 -04:00
Ron Anderson
61baeb4bcc
Issue #2729 Revert changes made to PythonPreferenceStore.java in favor changes to GfePyIncludeUtil.java made in #3500 .
...
This reverts commit 2abfe6de77
2014-09-24 09:17:43 -05:00
Slav Korolev
a4914bd85d
Issue #2757 - Fixed problem with adding and removing zones.
...
Former-commit-id: 31ccaf218df628327fe4b27d69a4500eb1dc8d84
2014-09-24 09:34:43 -04:00
Ying-Lian.Shi
12c545ef7a
ASM #16693 Fix spelling checker swear words
...
Change-Id: I0a31429fa35a5c5a8f4d2f000021db4e4304de9e
Former-commit-id: 1686a947c8a740c34339d9cf17749a6b92d776ab
2014-09-24 12:08:43 +00:00
Ron Anderson
c37618c16c
Issue #3648 Improve GFE error handling for getAllAvailableParms.
...
Change-Id: I13d41a3c231a56fe7d6fc4bc3cbfd96e1bdcdccf
Former-commit-id: b77b3c916b4dcc9034408220006f941cd301ed3c
2014-09-23 18:47:38 -05:00
Nate Jensen
e34c1a6fe8
Omaha #3009 make ffmp play nice with collaboration
...
Change-Id: Iccccec6dbe999d7677520a5b0f0464a2186f8174
Former-commit-id: ac15b82ed3c493a5ea8cca01ba304e95c965365e
2014-09-23 15:37:09 -05:00
David Friedman
2ee1ebe72d
ASM #15658 - WarnGen: inclusion of watch information in marine products
...
Change-Id: I545d1b07444c9ca00ea2e95c4ccaed79946bbead
Former-commit-id: e0f6cc70bf5258d66bfa8a4ddb1daf871b6c92c5
2014-09-23 18:39:22 +00:00
Steve Harris
b979960b7b
Merge tag 'OB_14.3.1-19m' into omaha_14.4.1
...
Conflicts:
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/ext/imaging/GLColormappedImageExtension.java
cave/com.raytheon.viz.satellite/src/com/raytheon/viz/satellite/rsc/SatResource.java
cave/com.raytheon.viz.volumebrowser/localization/menus/xml/planesMenusPlanView.xml
edexOsgi/com.raytheon.edex.plugin.satellite/src/com/raytheon/edex/util/satellite/SatSpatialFactory.java
edexOsgi/com.raytheon.uf.common.colormap/src/com/raytheon/uf/common/colormap/prefs/DataMappingPreferences.java
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/mmp.xml
nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.pproc.so
nativeLib/files.native/edex/lib/native/linux32/library.ohd.pproc.so
ohd/gov.noaa.nws.ohd.edex.plugin.hydrodualpol/src/gov/noaa/nws/ohd/edex/plugin/hydrodualpol/DSAProductProcessor.java
Former-commit-id: 72f387d2802c12eedfe5643616fe5a54420aef66
2014-09-23 11:41:10 -05:00
Lee Venable
114010674f
Merge "Omaha #3356 remove unnecessary import" into omaha_14.4.1
...
Former-commit-id: a158d4dbdf27311a04684bbda1afb3991fb0e09a
2014-09-23 10:56:20 -05:00
Nate Jensen
568559f2ce
Omaha #3356 remove unnecessary import
...
Change-Id: Id1ad295d1adb29de072173a4137a5e5f612b48ac
Former-commit-id: ad3753d57709fe8efeab2fb400d92b6ec61c2a3e
2014-09-23 08:21:18 -05:00
Steve Harris
00eda3f982
Merge branch 'master_14.3.1' (14.3.1-20) into omaha_14.3.1
...
Former-commit-id: 68ff0acbe3739e2fd3aa89b13ed070c39db48551
2014-09-22 22:18:26 -05:00
Brian.Dyke
7996916e36
Merge branch 'master_14.3.1' into asm_14.3.1
...
Former-commit-id: 414a695e6423fa291936d15a999113f4a518b097
2014-09-22 16:51:47 -04:00
Nate Jensen
e637963736
Omaha #3356 fix apps_dir setting detection in viz/cave
...
Change-Id: If78a4ec84f6237450a6494c06b5a5271c66f10a3
Former-commit-id: ca8195c7835b9d96158d048fdd548cc744ba96bc
2014-09-22 13:00:04 -05:00
Brian.Dyke
8d665b93b5
Merge branch 'asm_14.3.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.3.1
...
Former-commit-id: 8d5d8cdfd272f8000a6a21a4128998889eb2ab30
2014-09-19 16:56:50 -04:00
Ben Steffensmeier
217caaba15
Omaha #3300 Fix component and mosaic merge problems
...
Former-commit-id: 201854ac4154dc8526bf99bde69674ad51ec50ad
2014-09-19 15:08:21 -05:00
Slav Korolev
23ec338be0
Issue #2757 - Updated handlers for dialog buttons.
...
Former-commit-id: 69a82633c287bf18c9f436014bb552829dcb62ea
2014-09-19 15:02:59 -04:00
Brian.Dyke
9c33ae6d2c
Merge branch 'ncep_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
...
Former-commit-id: e895f7927a95c2416c05953e131d9e0c6095beb3
2014-09-19 14:42:29 -04:00
Brian.Dyke
9435507b27
Merge branch 'field_14.2.4' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.2.4
...
Former-commit-id: aaae61509d743553186cdefdea0557158b139527
2014-09-19 13:14:13 -04:00
Brian.Dyke
e601d3fa51
Merge branch 'master_14.2.3' into master_14.2.4
...
Former-commit-id: 88e26cd8b378ffc81db87aee226ceca47ae58aa7
2014-09-19 13:08:06 -04:00
Mark Peters
26e4f86248
Omaha #3300 Merge fixes for 14.4.1
...
Change-Id: I9a7e4131bfbd6503e70001594b93492c7cbad5fd
Former-commit-id: 1ecf38ee8614f3df751fe9debbdfdb2771e5bea1
2014-09-19 12:01:07 -05:00
Darrel Kingfield
88a8dddef3
VLab Issue #4603 - MRMS SBN Display initial code check-in v3 - update purge rules; fixes #4603
...
Change-Id: Ic38722b3080edc3f9a9f8d35d4b2271d34b63872
Former-commit-id: a9bc901ed4b9157a4cb1a042d5fabe628cfd4b2a
2014-09-19 11:14:09 -05:00
Steve Harris
fbab75af66
Merge branch 'master_14.3.1' (14.3.1-19) into omaha_14.3.1
...
Former-commit-id: c72e05b87f6eb6d094bde5e7caec3cccb20476ce
2014-09-19 11:13:46 -05:00
Steve Harris
4c56844e29
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: 69c52fb4a22997d0a0f9c620bd20f00b8c5fd4ce
2014-09-19 10:28:57 -05:00
Ana Rivera
56f409717f
VLab Issue #4794 - RM 16720 Update LevelMappingFile.xml; fixes #4794
...
Change-Id: I58d0cb7e38d5ed483db5c87cc322c93764e21f06
Former-commit-id: 3af534fb2778268fee650c09c5aa0346df746ce8
2014-09-19 15:17:46 +00:00
Nate Jensen
83cc50ad69
Merge "Omaha #2735 unpack plugins that contribute spring xml to viz" into omaha_14.4.1
...
Former-commit-id: 55219fea5034bdc8e9aab3fb2142933e5d65b739
2014-09-18 14:52:17 -05:00
Nate Jensen
81b78b957b
Merge "Omaha #3531 fixed localization perspective refresh issue" into omaha_14.4.1
...
Former-commit-id: 676cffd04cae5ead141e20130c0c682a563d3e85
2014-09-18 14:22:22 -05:00
Nate Jensen
820f1ae0b8
Omaha #2735 unpack plugins that contribute spring xml to viz
...
Change-Id: Iaa9340cb255650d3980daef10f30667b1224ac07
Former-commit-id: f88da1dfebb37e60e7a32ce283495e45366f4975
2014-09-18 12:27:33 -05:00
Nate Jensen
cd7c46dbd6
Merge "Omaha #3356 fix service loader lookup for event bus" into omaha_14.4.1
...
Former-commit-id: 60b40cc4edbbcd7094e31ff3f5e496b8b5baf878
2014-09-18 11:53:11 -05:00
Brian.Dyke
8b0603cdb8
Merge branch 'ohd_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
...
Former-commit-id: de22db308f36c42d5c7e0989dbd7decfaaf3adbb
2014-09-18 12:43:01 -04:00
Chip Gobs
31efce6b8f
VLab Issue #4611
...
Adding missing changed file.
Change-Id: Ifcc56c121bb13806a5a5e7fc4e6de6e36900867e
Former-commit-id: e68f56628f035ca2a20848a0e76f6efa8bbe1e8a
2014-09-18 12:12:42 -04:00
Brian Clements
673ccf5851
Omaha #3531 fixed localization perspective refresh issue
...
paths were compared by string prefixes instead of path prefixes
Change-Id: I6dd55001f505dda65df21e54727f262e247a30ba
Former-commit-id: 3cda9077130f30c21dbee5e8d16b59937a896cdd
2014-09-18 10:56:32 -05:00
Matthew Howard
0d0aae9234
Merge "ASM #15465 - No variable for failed site's MND Header location available for WarnGen to use" into asm_14.3.1
...
Former-commit-id: 0b0c2e1ea8188cd88c92fde4d4b999670aad17dc
2014-09-18 10:36:17 -05:00
Qinglu.Lin
c2047b94b1
ASM #15465 - No variable for failed site's MND Header location available for WarnGen to use
...
Change-Id: I8bc59786379680f635e85917eebf4c9d6b4ea683
Former-commit-id: f79ed1b1867b5516a390a8f70b2141052be3eb38
2014-09-18 11:21:18 -04:00
Nate Jensen
27fee9b714
Omaha #3356 fix service loader lookup for event bus
...
Change-Id: I9d53f7aaf1046c43cd90dfe7bbc957cbf9d1df12
Former-commit-id: f6aa0b18cdc26d8cad5f3e35d134a784fb11f4d5
2014-09-17 16:56:39 -05:00
Nate Jensen
c9e08540d1
Merge "Omaha #3632 fixed index out of bounds for TCSResource" into omaha_14.4.1
...
Former-commit-id: 5bf4208ce50052e64d76c4227f237d85b72cb285
2014-09-17 16:26:52 -05:00
Matthew Howard
bb0e06d09d
Merge "ASM #537 - fix for AvnFPS: Syntax failed to flag format error" into asm_14.3.1
...
Former-commit-id: 45a5185657de4c3e3c330a5a8604078fe1ccde2a
2014-09-17 15:40:40 -05:00
