Ron Anderson
d109fd978e
Omaha #5054 Fix dialog parenting of avaiation dialogs
...
Change-Id: Ibfe4e152f8d779556ee4427dff6a3d8cf7939336
Former-commit-id: d0224012e3f4a2462db62956bce860b071823078
2016-01-27 15:04:05 -06:00
Steve Harris
dfcc52e766
Merge tag 'OB_16.2.1-6' into omaha_16.2.1
...
16.2.1-6
Former-commit-id: 29a43c58b69086667c47e86c4a0bb1c849ad4367
2016-01-20 13:29:19 -06:00
Shawn.Hooper
bd27f40c6d
Merge tag 'OB_16.1.2-9' into master_16.2.1
...
16.1.2-9
Conflicts:
cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/data/ObHourReports.java
cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/data/ObMultiHrsReports.java
cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/AddNewStationDlg.java
cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/AddNewZoneDlg.java
cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/DeleteStationDlg.java
cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/EditNewZoneDlg.java
cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/MonitoringAreaConfigDlg.java
cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/ZoneTableDlg.java
cave/com.raytheon.viz.gfe/localization/gfe/userPython/procedures/TCFloodingRainThreat.py
cave/com.raytheon.viz.gfe/localization/gfe/userPython/procedures/TCStormSurgeThreat.py
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/ProductEditorComp.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/StyledTextComp.java
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TabularTimeSeriesDlg.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
cave/com.raytheon.viz.warngen/META-INF/MANIFEST.MF
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
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFED2DDao.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/smartinit/Init.py
edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_NCEP-7.xml
edexOsgi/com.raytheon.edex.plugin.warning/src/com/raytheon/edex/plugin/warning/gis/GeospatialDataGenerator.java
edexOsgi/com.raytheon.uf.common.dataplugin.fssobs/src/com/raytheon/uf/common/dataplugin/fssobs/FSSObsRecord.java
edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/config/FSSObsMonitorConfigurationManager.java
edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/xml/AreaIdXML.java
edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/xml/MonAreaConfigXML.java
edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/xml/StationIdXML.java
edexOsgi/com.raytheon.uf.edex.plugin.fssobs/src/com/raytheon/uf/edex/plugin/fssobs/FSSObsGenerator.java
edexOsgi/com.raytheon.uf.edex.plugin.npp.viirs/utility/edex_static/base/viirs/viirsHeaderMapping.xml
rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
Change-Id: Ife2115435399146e4873a14f80e73acc15ad1b5c
Former-commit-id: 3d8811acf334fb06854bbaa71d35cff2657b3b7b
2016-01-12 15:10:02 -05:00
Slav Korolev
6e365fe428
Omaha #4860 - Fixed issue TextWorkstationNotStartedException
...
Former-commit-id: 6f5222c617c6f130b3a827beff5f1ec4bda45ee4
2016-01-07 09:56:49 -05:00
Steve Harris
77e9dd0e31
Merge tag 'OB_16.2.1-4' into omaha_16.2.1
...
16.2.1-4
Conflicts:
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
Former-commit-id: 8cf6955bc2f007b352bea3b2ffea1927f549caec
2016-01-04 19:43:07 -06:00
Shawn.Hooper
dc86635bb9
Merge remote-tracking branch 'omaha/omaha_16.2.1' into master_16.2.1
...
Conflicts:
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
Former-commit-id: 071dbbc21ea440c1c4cb5bbd739ddcba861cdefd
2015-12-31 09:31:25 -05:00
Zhidong.Hao
40c3cb9749
ASM #18342 AvnFPS: Climatology chart calculation is incorrect as compared to A1
...
Change-Id: I19568e71de43f3eeec8412431e437ea01b76d7bc
Former-commit-id: 35d85e0599f73b5da4c4cc287fa7d25493ef5cab
2015-12-22 14:29:14 -05:00
Slav Korolev
fdcddb9f50
Omaha #4645 - Removed popup menu persistance.
...
Former-commit-id: db10233638a504ed2455c43272d1fd1dff2b4194
2015-12-14 08:28:30 -05:00
Slav Korolev
852e19b6d1
Omaha #4645 - Initiated wrapChk using ResourceTag.
...
Former-commit-id: e4da0f9f61b8a6d62b6bc27dd630d1db9931bcbd
2015-12-09 14:17:11 -05:00
Roger Ferrel
313365d533
Omaha #5156 MonitorData.Util.getCcfpData() only shrinks dtList when it size is greater then 3.
...
Change-Id: I81069010b9bdbe0484af4e47c7822c85876e3540
Former-commit-id: 6bc0b9e2e4dad9b799843874c62d798422c5c678
2015-12-01 14:47:30 -06:00
Shawn.Hooper
e93839673c
Merge branch 'asm_16.2.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_16.2.1
...
Conflicts:
cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/headline/HazardsTable.py
Former-commit-id: 0d5c4caf82d74459f9412800955d6cb9da18f3fb
2015-11-25 14:31:20 -05:00
Roger Ferrel
2ef2bf0347
Omaha #5108 Display warning when sending forecast with same header time as one in the pending queue.
...
Change-Id: Id616718b1bb2c4af79d68f3569f5256fc06d9e87
Former-commit-id: 7670322cfa2e88c48dc0f10f44814ca736774555
2015-11-09 14:36:07 -06:00
Roger Ferrel
a5c93be09f
Omaha #5060 Remove scaling of top value to allow proper plotting of cig values.
...
Change-Id: If1c571eb38864027e2508d8fbbcf3df0e55b3531
Former-commit-id: ea172bb90d9fba6108831ede3d1ed16a09a57adb
2015-11-03 08:58:04 -06:00
Matthew Howard
22e0fc97f8
Merge "ASM #18061 AvnFPS: Problem with syntax checking (wrong error message)" into asm_16.2.1
...
Former-commit-id: be9f9d9d7c1e9daa7c99c1a10d59bf7058b66b8e
2015-10-23 10:27:12 -05:00
Yun.Teng
7eea886ae0
ASM #17445 - Set configurable alert interval for all AvnFPS alerts
...
Change-Id: I1683942429bd358daedca5c72dc2f635e20bd064
Former-commit-id: a3622c531fd3cc0702d341bb711dd002a5e8effb
2015-10-23 16:10:36 +01:00
Zhidong.Hao
db46c4dc50
ASM #18061 AvnFPS: Problem with syntax checking (wrong error message)
...
Change-Id: I826b51da95d08a6505c782235b397f02db196cc1
Former-commit-id: e9aa99d35c5893a9483d56f9eab0385e3b6db955
2015-10-23 10:58:16 -04:00
Roger Ferrel
c477bb1c80
Omaha #5015 Fixed merge issue.
...
Former-commit-id: 866f4e7f8e9854920cf593efb16edde150a22fc9
2015-10-21 10:42:09 -05:00
Steve Harris
56131ac305
Merge branch 'omaha_16.1.1' into omaha_16.2.1
...
Conflicts:
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/smarttool/Tool.java
cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/data/GageData.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
Former-commit-id: fa9ad9b8a3900bd5f94017f27bec9a5673ecb881
2015-10-21 09:22:00 -05:00
Slav Korolev
650a078730
Omaha #4645 - Fixed AvnFPS TAF Viewer Editor issue.
...
Former-commit-id: 5909e51dc7cc03b749c50f74e78fe0de49ffe878
2015-10-16 12:04:58 -04:00
Shawn.Hooper
90badd7a3e
Merge tag 'OB_15.1.2-9' into master_16.1.1
...
15.1.2-9
Conflicts:
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/data/RiverStatData.java
cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/datamanager/ContactsDataManager.java
cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/datamanager/DescriptionDataManager.java
cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/datamanager/LocationAreaManager.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
Former-commit-id: e9e9660925d0afc016f88ec73182f9eae6ab0c18
2015-10-15 17:10:19 -04:00
Slav Korolev
2836ca0525
Omaha #4855 - Fixed problem with syntax checking.
...
Former-commit-id: 47e85b3b66a7b3adb887d17e41cf279cfdb7e402
2015-10-05 10:50:59 -04:00
Roger Ferrel
4bbc7f67e9
Omaha #4898 Prevent sending of TAF when in DRT mode.
...
Former-commit-id: 37f33962fae292bd531540f96b034017683ba2ea
2015-10-05 08:13:53 -05:00
Roger Ferrel
94ea173199
Omaha #4918 Allow forecaster to send out TAF as another forecaster.
...
Change-Id: I5b6bab07c60d4e77a31cb74410cc6f61d07070c5
Former-commit-id: 12b740baca30447aa753d703442ae68f44561320
2015-09-25 14:25:09 -05:00
Nate Jensen
429a844041
Omaha #4880 don't request tafs without a station name
...
Change-Id: If6460a791b091bdc85a0963b7c53b52b40503213
Former-commit-id: 5eee206be30097f09fe7b7c7093a5583e1a3729a
2015-09-21 16:35:34 -05:00
Nate Jensen
1c1d83f44c
Omaha #4880 optimized avnfps monitor data requests
...
Change-Id: I08f916e2fd2f4b2b30cf7b02df5ca63097c4bb1a
Former-commit-id: 7d29da0fcc48cac0623431aa7b749e605c7dbf6a
2015-09-16 19:02:46 -05:00
Nate Jensen
a6c2a05e75
Merge "Omaha #4880 remove dead avnfps java code" into omaha_16.2.1
...
Former-commit-id: 892b612e66d7ab98afec1784929fc67d0708a9e2
2015-09-15 18:06:43 -05:00
Nate Jensen
97c8f777a1
Omaha #4880 remove dead avnfps java code
...
Change-Id: Iefdc821cdb21f7947ee8c2d97a346ff532a61fb3
Former-commit-id: 50136bba2d368b68d41ce76c0ce0a660ff5e73ce
2015-09-15 14:01:51 -05:00
Nate Jensen
b550d5a1f3
Omaha #4880 don't request ccfps if there are no times
...
Change-Id: Ia3e247452fe62d03dbdabdaae6db9a426f95882e
Former-commit-id: 445f60226e7e23fcd8a364f7f86c759a81dfe43c
2015-09-15 13:42:17 -05:00
David Friedman
4bdfeb8da8
Merge remote-tracking branch 'origin/master_16.1.1' into asm_16.1.1
...
Conflicts:
cave/build/static/linux/alertviz/alertviz.sh
cave/build/static/linux/cave/cave.sh
cave/com.raytheon.uf.viz.alertviz/src/com/raytheon/uf/viz/alertviz/AlertvizJob.java
cave/com.raytheon.uf.viz.d2d.core/src/com/raytheon/uf/viz/d2d/core/time/D2DTimeMatcher.java
cave/com.raytheon.viz.core.contours/src/com/raytheon/viz/core/contours/ContourRenderable.java
cave/com.raytheon.viz.gfe/localization/gfe/userPython/utilities/SmartScript.py
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/BaseGfePyController.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/smarttool/SmartUtil.java
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/resource/MultiPointResource.java
cave/com.raytheon.viz.hydrobase/src/com/raytheon/viz/hydrobase/dialogs/RiverGageDlg.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/text/AbstractLockingBehavior.java
cave/com.raytheon.viz.xdat/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.uf.common.dataplugin.shef/src/com/raytheon/uf/common/dataplugin/shef/tables/Riverstat.java
edexOsgi/com.raytheon.uf.tools.gfesuite.servicebackup/svcBackup/ServiceBackup/scripts/process_configuration
Change-Id: I9acfead0148ca1df35b8f69cd556b40d8189c226
Former-commit-id: 33053b2a6b55dacfecb24d5cde2cd3068e999f2f
2015-07-30 20:53:19 +00:00
Zhidong.Hao
3e12a5ecf4
ASM #16907 AvnFPS: Climate download files from NCDC server changed in format
...
Change-Id: Ifa6ee6b0fb64ce2a4fd9a9ac0f7976e855242d33
Former-commit-id: fc4a2bcfb918cce995444464aefe92a438ba995f
2015-07-10 15:13:44 -04:00
Zhidong.Hao
02599a6039
ASM #16907 AvnFPS: Climate download files from NCDC server changed in format
...
Change-Id: Ibfd5fa35b58ffd66eaf81945fb0b31f7ea632b65
Former-commit-id: 81c22bdd36a80a1f5deaf81926f8f07f24c929f9
2015-07-07 14:33:12 -04:00
Slav Korolev
819a164ffa
Omaha #4588 - Fixed Insert/Overwrite issue.
...
Former-commit-id: 4f2ba806562a15a2efa8c00ce79ab8623b6c2c34
2015-06-30 08:56:54 -04:00
Slav Korolev
af4e5dc302
Omaha #2282 - Corrected CLEAR case in updateSettings.
...
Former-commit-id: 22411fb937070c1b71989bbe220952ce92376fcb
2015-06-25 07:52:42 -04:00
Roger Ferrel
3ec2a46074
Omaha #4515 Removal of no longer needed xmit field.
...
Change-Id: I73580d7776702c56c656db769f64e2eaa5a03eed
Former-commit-id: 3c26b3056dd8ff2c4937386d7046df41b7d6b02f
2015-06-10 08:35:03 -05:00
Steve Harris
4de63454fc
Merge tag 'OB_15.1.1-16' into omaha_16.1.1
...
15.1.1-16
Conflicts:
cave/com.raytheon.viz.gfe/build.properties
cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/AbstractGridResource.java (moved to ufcore)
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/reference/MapManager.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
edexOsgi/com.raytheon.uf.edex.activetable/utility/common_static/base/vtec/ActiveTable.py
edexOsgi/com.raytheon.uf.edex.activetable/utility/common_static/base/vtec/MergeVTEC.py
Former-commit-id: 9f115206966a85c409a731e51bb4360c44ccc7fc
2015-06-05 15:38:00 -05:00
Fay.Liang
31496dac17
Merge tag 'OB_14.4.1-47' into int_15.1.1
...
14.4.1-47
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
Former-commit-id: 602505383d4a1ec8a2cea08f94b7350cabae39b7
2015-05-29 15:42:40 -04:00
Roger Ferrel
77482ac4cc
Omaha #4510 - No longer send TAF when uable to obtain forecaster's ID.
...
Change-Id: I3abdc4ff7efe855ec03397ad64975ff821a7d9ac
Former-commit-id: 74b6383da97fc437307a515492862101fa0cbf61
2015-05-22 15:09:33 -05:00
Roger Ferrel
58e4feae4c
Omaha #4510 Sending TAF now uses forecaster ID instead of name.
...
Change-Id: If8dd7c6cbea2da7b5c392786e26e67c96eb616c4
Former-commit-id: 81e54aad427a151b1fd61a3d2ea25ecd50686a04
2015-05-20 15:57:56 -05:00
David Lovely
80dc4c85d9
Omaha #4146 Bundled class files in a jar when unpacked.
...
Change-Id: Ie3e2a65f9696459774f67bcd4b6dee395e6f4e02
Former-commit-id: 2931134f27cd858716d5c0d97ef1d71c9f7ac165
2015-05-19 10:23:35 -05:00
Nate Jensen
2e97a349d6
Omaha #4259 avnfps updates for jep upgrade
...
Change-Id: I86620b99eb602f87a6f31e93a7d2241a7c3d5f9a
Former-commit-id: c5ed8f62498b2675deda279816e3387623c963b4
2015-05-14 13:51:47 -05:00
Fay.Liang
6cd66bff93
Merge tag 'OB_14.4.1-25' into master_15.1.1
...
This merge includes all changes in 14.4.1-22, -23, -24, and -25
Conflicts:
cave/com.raytheon.uf.viz.localization.perspective/src/com/raytheon/uf/viz/localization/perspective/view/FileTreeView.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
edexOsgi/com.raytheon.uf.common.dataplugin.text/utility/common_static/base/mixedCase/mixedCaseProductIds.txt
Former-commit-id: 857d0d89ae214ccf53713f74ef6778ba80c637fe
2015-04-13 13:02:24 -04:00
Zhidong.Hao
f44e6c7deb
ASM #17332 AvnFPS: Error message is displayed when cancel the TAF from 'Restore From....' option
...
Change-Id: I9ae9bf9b725db77e025b1b1bb508ddcc163a6c06
Former-commit-id: d7d664dce1959257676755bb0632e904c05593a6
2015-04-07 14:37:56 -04:00
Zhidong.Hao
42a2137c70
ASM #15639 AvnFPS Climate Data Menu Gui Too Large
...
Change-Id: I9d8dfce7889e75b65f20242519ab90e125237123
Former-commit-id: e49b373ed86eb9b18e7e46b0f4e07f9b75ea84b5
2015-03-04 14:29:35 -05:00
Zhidong.Hao
1e0ffe6a38
ASM #15007 AvnFPS: TAF Editor 'Restore From' function not working properly
...
Change-Id: I6cd12030643a1bbc68b6be8cfb70961e4aac7234
Former-commit-id: 96e179b48217dab20e8e657ed8e2a74410cf56ae
2014-12-02 10:13:53 -05:00
Steve Harris
5d58625abc
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: 8793dca41f756ba812206b48391caea6e593a657
2014-08-29 10:17:52 -05:00
Brian.Dyke
aa83bf804f
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: 7334d3991903dfe8a62728de33c21e81534fdbb6
2014-08-27 11:19:19 -04:00
Nate Jensen
9b72a1399d
Omaha #3356 cleanup of unnecessary register buddies and buddy policies
...
Change-Id: I1d6c279478f38876a8df67d2f9dd186a2efdeca0
Former-commit-id: 48536dd79d933508ac54b3b6e9bbd166fd218330
2014-08-14 10:22:37 -05:00
Nate Jensen
389ae22829
Issue #3497 refactored syntax check to prevent infinite loop possibility
...
and apply some sanity
Change-Id: I8118a99729c75fc756313db13654f34087a1e648
Former-commit-id: b080e8ef12dc3223b1676b97bc153f9422657514
2014-08-13 16:13:31 -05:00
Brian Clements
fc322a74b2
Omaha #3502 common.util changes
...
moved ConvertUtil, reworked StringUtil.split()
Change-Id: I82114f8a9ec7fb907c85258a070169dcba61be03
Former-commit-id: 72b5092e87e71f78fa35065dfc8bcb8e746f67b8
2014-08-07 16:48:57 -05:00
Steve Harris
bf9a0fa5de
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: f7d474895366eb23ae5eef242a4568f911435aa3
2014-08-04 22:20:29 -05:00
