Commit graph

227 commits

Author SHA1 Message Date
David Friedman
e2844fa3cd ASM #19186 - WarnGen Templates: Case corrections - Make MPH caps for "windTags" and capitalize sentence starters in SPS
Change-Id: Ieda7bcaca5157202c9bf88216c07255dd34e56e9
2016-08-30 13:07:22 -05:00
Qinglu.Lin
1a294ea510 ASM #19177 - WarnGen: Misspelling in BASE impactSevereWeatherStatement.vm WarnGen
Change-Id: Ia52437a507df31f5e367e433dcad5b87b05d2541
2016-08-30 13:04:36 -05:00
Ron Anderson
b1f0159761 Omaha #5712 Fixed a missed ALL CAPS emphasis in extremeWindWarnging.vm. Added delta scripts
Change-Id: If5db1b770a373d39f1e266586acd12249b43819e

Former-commit-id: 9bf3aeed7ff3a8351af59969eada3a4981581b4f
2016-06-23 15:19:10 -05:00
Shawn.Hooper
105e4a5ceb Merge branch 'master_16.2.1-p1-lx' into master_16.2.2
Conflicts:
	cave/com.raytheon.viz.gfe/localization/gfe/userPython/utilities/SmartScript.py
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/Area.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
	edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_NCEP-7.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/extremeWindWarningFollowup.vm
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/impactSevereWeatherStatement.vm

Change-Id: I9093801630eb7c345d0ba69e684943798fb0b5d9

Former-commit-id: 8a4b0527806a73c69dc9be22e7aa1025fcb4b617
2016-06-08 10:55:30 -04:00
Shawn.Hooper
0960d09481 Merge branch 'master_16.1.2p3_for_merges' into master_16.2.1-p1
Conflicts:
	cave/com.raytheon.uf.viz.spellchecker/src/com/raytheon/uf/viz/spellchecker/dialogs/SpellCheckDlg.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/Area.java

Change-Id: I944b2f48026df080e494ab9104bfd63e30c0c9ef

Former-commit-id: f8ebc36d5e1edc7f625bfafc3f8e9d8a7d13303d
2016-05-31 13:13:50 -04:00
David Friedman
cf71c7d648 ASM #18789 - WarnGen: it take a long time to create SPS at LIX
Change-Id: I6fa7bae740c2e369c4505a89dc1145742c38ca2a
(cherry picked from commit 533b14a4270411af6ddacb81914932d33b3191c1)

Former-commit-id: 919da1cff1b911a7de4224710bb38ad8017655a0
2016-05-31 13:12:42 -04:00
Sean.Webb
275cc1926d ASM #18987 - Updates to EWW template
Change-Id: I1308c1ccd89a14ce076017f54d8090b54014c490

Former-commit-id: 1db43b17f6654231d37e0281ae7a627df863a27e
2016-05-18 04:44:57 -04:00
Mark Ruebens
99b1b62c99 Merge changes I7e4d3cca,Id75ad2d2 into asm_16.2.1-p1
* changes:
  ASM #18950 - WarnGen Templates: Special marine warning followup has formatting problem with front event type and line of storms
  ASM #18958 - WarnGen Templates: Misc template fixes post 16.1.2 implementation


Former-commit-id: 7ecb4d6a9904cf2f0552454a9f3fdf991d3ec2bb
2016-05-13 14:28:21 -05:00
Mark Ruebens
236d191804 Merge "ASM #18968 - WarnGen Template: OF needs to be of in VM_global_library.vm" into asm_16.2.1-p1
Former-commit-id: 54b6eff2eddd813b0f08d6344bb0aef6fa6683dd
2016-05-13 13:03:11 -05:00
Shawn.Hooper
c58c624779 ASM #18987 - Updates to Extreme Wind Warning Followup Template
Change-Id: I2a8598e6af722a5fbed353f6c8d41c241ad6c45f

Former-commit-id: 7dd216cc9a264147189806ca3549700acb0d5c0b
2016-05-13 12:51:30 -04:00
Shawn.Hooper
3aea06ff70 ASM #18950 - WarnGen Templates: Special marine warning followup has formatting problem with front event type and line of storms
Change-Id: I7e4d3cca6fa3f87c90b5fcec1aee53b97ccfd644

Former-commit-id: b3417552085340863cf193e7555a581c17ec6332
2016-05-13 11:30:20 -04:00
Shawn.Hooper
52976849d0 ASM #18958 - WarnGen Templates: Misc template fixes post 16.1.2 implementation
Change-Id: Id75ad2d2e0204e5ae85249e431a2a189f56d2a6a

Former-commit-id: 1e92a24fe8d7fd3654cb2a0425efce683d7d1d9f
2016-05-13 11:27:01 -04:00
Shawn.Hooper
afd1a817f6 ASM #18968 - WarnGen Template: OF needs to be of in VM_global_library.vm
Change-Id: I8234fa9d8011e77a2d26a36fdb5fc6c6e0596ca5

Former-commit-id: d018dfc0d57751b0cf024bad237d004ff49d5367
2016-05-13 11:23:52 -04:00
Steve Harris
ec8b83dd67 Merge tag 'OB_16.2.1-lx-29' into omaha_16.2.2
16.2.1-lx-29

 Conflicts:
	cave/com.raytheon.uf.viz.alertviz.ui/src/com/raytheon/uf/viz/alertviz/ui/dialogs/SimpleLogViewer.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/smarttool/Tool.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/textformatter/CombinationsFileUtil.java
	cave/com.raytheon.viz.hydrobase/src/com/raytheon/viz/hydrobase/HydroBaseDlg.java
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/QcFreezeOptionsDialog.java
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/QcPrecipOptionsDialog.java
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/QcTempOptionsDialog.java
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/polygon/DeletePolygonDlg.java
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/polygon/DrawPolygonDlg.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	edexOsgi/com.raytheon.edex.plugin.binlightning/src/com/raytheon/edex/plugin/binlightning/total/TotalLightningDecoder.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/handler/SaveCombinationsFileHandler.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/TPCWatchSrv.java
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/impactSevereWeatherStatement.vm


Former-commit-id: 17c68986a20e9a589d40407800dd52678fcda68b
2016-05-12 09:28:49 -05:00
Mark Ruebens
4519a4b4ef Merge "ASM #18884 - WarnGen Templates: Impact templates fail to run when source/basis bullet is not selected" into asm_16.2.1
Former-commit-id: b659a20accf5fafb2fae4e50422262edafd8a8bc
2016-04-18 14:13:55 -05:00
Shawn.Hooper
c76fb2ff2d ASM #18880 - WarnGen Templates: Fixes for a few case issues in Impact SVS
Change-Id: Ia6dc1c2dc1de956d895069b95909481d0916a778

Former-commit-id: ea972cbcfc1f4764ada203d456166e4ae039a90b
2016-04-18 13:53:46 -04:00
Shawn.Hooper
a0184670b2 ASM #18884 - WarnGen Templates: Impact templates fail to run when source/basis bullet is not selected
Change-Id: I60f8f239f3c3304d92acf88dcd7ee908dbb76890

Former-commit-id: cc91434f5e88879baddff8b781ee02df57f00800
2016-04-18 13:34:23 -04:00
Shawn.Hooper
8f1d77ca35 Merge tag 'OB_16.2.1-23' into master_16.2.2
16.2.1-23

Conflicts:
	edexOsgi/com.raytheon.edex.plugin.binlightning/src/com/raytheon/edex/plugin/binlightning/BinLightningDecoder.java
	edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPTemplates.java

Change-Id: I9497704adcca5b6df8728b6124e310a709447061

Former-commit-id: 55fc99c303e27f17f488bf053805622714c9d69c
2016-04-18 12:07:11 -04:00
Shawn.Hooper
f029d157b0 ASM #18864 - WarnGen Templates: Improve CTA parse strings to be case independent
Change-Id: Idf063b4573af3cee87422302df6e4652930c4303

Former-commit-id: 67a56f936708501ec6b5fdc1d28605f6b27bc145
2016-04-08 16:30:07 -04:00
Steve Harris
2ba0e17ff0 Merge branch 'omaha_16.2.1-lx' into omaha_16.2.2
Former-commit-id: 23382d06b2bea731deef5b0a01b1b27bb187fb95
2016-04-05 23:14:48 -05:00
Steve Harris
385401f9ae Merge branch 'omaha_16.2.1-lx' into omaha_16.2.2
Conflicts:
	cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/StormTrackDisplay.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/flashfloodguidance/FlashFloodGuidanceDlg.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java


Former-commit-id: 445a3ae3da804f366c1162104640d8459ab650d0
2016-03-28 17:31:59 -05:00
David Friedman
e376a30501 ASM #18719 - WarnGen Polygons: Look into ways to improve exclusions of zones close to coast
Change-Id: Iaf30609cf792fe1c41eb4ac77104bfc965bd863c

Former-commit-id: ee7a0220729afdc12326c9944d16c99c2b1bc5d9
2016-03-24 20:24:06 +00:00
David Friedman
afe22917c6 ASM #18509 - Make WarnGen polygon extension area display a separate map background
Change-Id: I2a73e87c1398694e5c9c03590e481107a8143f1d

Former-commit-id: 79863e66545307875eb84b5359302c13f2af8e7d
2016-03-15 20:44:27 +00:00
Ron Anderson
5b8ea584ae Omaha #5411 More mixed case changes
Change-Id: If71742bce09174f96fd14dd1029ec2a74dc23b6f

Former-commit-id: b252a62f107c4ea219a9594ce035399d092c9664
2016-03-11 09:11:33 -06:00
Steve Harris
c2b471a870 Merge branch 'omaha_16.2.1-lx' into omaha_16.2.2
Conflicts:
	cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/MonitorDisplayThreshDlg.java
	cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/TableComp.java
	cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/StormTrackDisplay.java
	cave/com.raytheon.viz.gfe/localization/gfe/userPython/utilities/SmartScript.py
	cave/com.raytheon.viz.gfe/localization/gfe/userPython/utilities/TCVDictionary.py
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/IFPClient.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	cave/com.raytheon.viz.textworkstation/src/com/raytheon/viz/textworkstation/TextWorkstationDlg.java
	rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template


Former-commit-id: a7340c2bf23cbc3d27ca52fbf2ccd9c7d1cb09c2
2016-02-29 13:39:42 -06:00
Ron Anderson
31ddc8e3da Omaha #5411 Updates per latest mixed case guidelines
Change-Id: I6e578238e09da773489302895a7e7433d561455f

Former-commit-id: ea79be27628188bab964e3f6be31f96ceb008aca
2016-02-24 17:19:57 -06:00
Shawn.Hooper
663c44637f Merge tag 'OB_16.1.2-20' into asm_16.2.1
16.1.2-20

Conflicts:
	cave/com.raytheon.viz.gfe/localization/gfe/userPython/procedures/TCStormSurgeThreat.py
	rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template

Change-Id: I9ed1c12896ffa710e7995f9682b4be1de88fa077

Former-commit-id: 9e3470f2b741592182dfae3e873503eb22df4f18
2016-02-22 11:13:16 -05:00
Nathan Bowler
87ac557aa0 Omaha #5244 Replace deprecated LocalizationFile methods.
Change-Id: Iea447bd018d203cf9c6a59fc9ed66e00e2b265a7

Former-commit-id: 580b44fedef93778e24af685d0e7d7e03810b6fa
2016-02-16 10:28:39 -05:00
Shawn.Hooper
28598f153b ASM #18626 - Fix typo: parseSting to parseString
Change-Id: I514532b35eb8750ad6acb8b3634879442a048abe

Former-commit-id: 49f2e585dd47426e2395e4f2ab7f6c17b96420ed
2016-02-10 10:41:09 -05:00
Shawn.Hooper
ecaa153f91 ASM #18626 - WarnGen: Softball/Grapefruit hail clarifications and CTA parsing corrections
Change-Id: I65490b00dc2c8beb4424896532d722e76a009e63

Former-commit-id: fe5ed11c398ba08c0beb3681aa433615946604b2
2016-02-09 11:04:47 -05:00
Steve Harris
85055fcc53 Merge branch 'omaha_16.2.1' into omaha_16.2.2
Conflicts:
	cave/com.raytheon.uf.viz.d2d.core/src/com/raytheon/uf/viz/d2d/core/time/D2DTimeMatcher.java
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/climatedata/ClimateDataMenuDlg.java
	cave/com.raytheon.viz.awipstools/localization/menus/tools/baseToolsMenu.xml
	cave/com.raytheon.viz.gfe/localization/gfe/userPython/utilities/SmartScript.py
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java


Former-commit-id: 68c13f9160746f365bd5f896b1400f1a8099ebe8
2016-02-01 11:57:52 -06:00
Steve Harris
11a5db155d Merge branch 'omaha_16.2.1' into omaha_16.2.2
Conflicts:
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/resource/MultiPointResource.java
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/actions/SaveLevel2Data.java
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/QcPrecipOptionsDialog.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParmManager.java
	edexOsgi/com.raytheon.edex.plugin.warning/src/com/raytheon/edex/plugin/warning/gis/GeospatialDataGenerator.java
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/gis/GeospatialFactory.java
	edexOsgi/com.raytheon.uf.edex.plugin.fssobs/src/com/raytheon/uf/edex/plugin/fssobs/common/FSSObsConfig.java


Former-commit-id: 218244406e4be6cb31b3986ff6457398a0a00bb5
2016-01-20 15:23:43 -06:00
Shawn.Hooper
94eba993a6 Merge branch 'master_16.2.1' into asm_16.2.1
Former-commit-id: 10740febfd3631d4c31312c9427a172cd29c9e62
2016-01-14 16:10:45 -05: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
Nate Jensen
8c21ca692b Omaha #5244 replaced deprecated method calls on LocalizationFile
Change-Id: I209036143d3aaf18b754b5484298f7f2156d24ba

Former-commit-id: 2a7817d6959210f4edc376e237604df0dc3dc830
2016-01-12 09:16:37 -06:00
Steve Harris
8a07970ba6 Merge branch 'omaha_16.2.1' into omaha_16.2.2
Conflicts:
	cave/com.raytheon.uf.viz.aviation.advisory/src/com/raytheon/uf/viz/aviation/advisory/rsc/AdvisoryResource.java
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
	cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/headline/HazardsTable.py
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDisplayCanvas.java
	edexOsgi/com.raytheon.uf.edex.site/src/com/raytheon/uf/edex/site/SiteAwareRegistry.java


Former-commit-id: d9745246c0f81ec088b3f4108b30e02c33f6a9ae
2016-01-06 11:55:00 -06:00
Qinglu.Lin
11c90c6c30 ASM #15688 - WarnGen: wrong portions of counties at PQR
Change-Id: Ifb9cbc44ac406727cb541aa676168214008b63c5

Former-commit-id: 092a701c6cf21dcd8a60baf92046ef0d8f6cb0e1
2016-01-05 12:46:43 -05:00
Shawn.Hooper
f7b4040970 ASM #18179 - WarnGen: Template Corrections for the hydro CTA, mixed case and other issues
Change-Id: Ibd5db3a6aa75f80f5700925596753231f484777a

Former-commit-id: fe5c90a91d03a24d5f16f47d4834807576ceac23
2016-01-04 13:59:00 -05:00
Shawn.Hooper
c7c3d81479 Merge remote-tracking branch 'vlab/tcv_16.1.2' into master_16.1.2
Former-commit-id: abfd5978ff55d595eaba09c4a70f763fb56986f9
2015-12-28 09:56:50 -05:00
David Friedman
86673672a5 ASM #17942 - WarnGen Improvements: Polygon extension area
Change-Id: Ic3b0c5e74dddb8dc5f973b41ae78d85ffe50a002

Former-commit-id: dfc678f705d33e1245bec773cc8fac7594de7579
2015-12-21 16:55:59 +00:00
Ana Rivera
01ac45b8cf VLab Issue #12688 - DR18179(set_3) WarnGen: Template Corrections for the hydro CTA, mixed case and other issues; fixes #12688
Change-Id: Icd22291002f7ee2949c8718321e19addfc3b29eb

Former-commit-id: 3329560da2bed8516e69e8100de423ade5940257
2015-12-10 11:06:33 -05:00
David Friedman
d13c574a57 ASM #18209 - WarnGen: dam break FFW outside the local CWA
Change-Id: I03a9a49010bb813a146512af9fda95c934b1c146

Former-commit-id: 47c44418a10af8badd4deea264774748ef5ea3cb
2015-12-09 22:21:35 +00:00
Shawn.Hooper
98e669bb00 ASM #17596 - Update column layout
Change-Id: I924d8ac5e5baa490ac2f06d00b8f4bc06dd86660

Former-commit-id: abdd7962267c4fe06b467441170f7dae9b17c17a
2015-12-04 17:07:20 -05:00
Ana Rivera
95d0d1e81a VLab Issue #12688 - DR18179 WarnGen:Template Corrections-VM_global_library.vm; fixes 12688
Set_2: revised VM_global_library.vm

Change-Id: I0311acc9ecd9a44005c1f6a6b59ab1fa0245ff75

Former-commit-id: ddf5e7aec89cadf041455d5ad7e75c6383fb3014
2015-11-04 20:28:53 +00:00
Qinglu.Lin
0edd2da34d ASM #15688 - WarnGen: wrong portions of counties at PQR
Change-Id: I50c2e123a3d3748c33823fe6a875c3d0bac3c69f

Former-commit-id: 508318d30bfc6f9429e1311429d30e097669d14e
2015-11-04 13:43:40 -05:00
Ana Rivera
93b89ee2c3 VLab Issue #12688 - DR18179 WarnGen: Template Corrections for the hydro CTA, mixed case and other issues; fixes #12688
Change-Id: Ifc130391dc3ec8f1ddd15e49e11332ebe2e5726e

Former-commit-id: dd3cf2d8135473e4dc1daa8731411d2c4e2e4c41
2015-10-30 12:08:43 +00:00
David Gillingham
648bb0e367 Omaha #5003: Update A2 baseline code to utilize apache commons-lang version 3.
Change-Id: I2b23399b2cfd3d37a41f89cb3c3173ca628caecb

Former-commit-id: b9c41fe3354a90a03440e1ea67991e6ecd5885c0
2015-10-28 13:21:07 -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
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
Shawn.Hooper
becd5935a5 Merge branch 'asm_16.1.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_16.1.1
Former-commit-id: 19aefb32d4243a30511b9d5de557c51adf689d2d
2015-10-13 16:21:51 -04:00