xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
11552 commits 31 branches 40 tags 3.8 GiB
Commit graph

92 commits

Author SHA1 Message Date
Steve Harris
cf8756b433 Merge tag 'OB_16.2.2-8' into omaha_16.2.2 
16.2.2-8


Former-commit-id: 902012b504a1894a43e83963f52303fa56d6d5fe
 2016-05-24 12:52:13 -05:00
Steve Harris
89e25dd014 Merge branch 'omaha_16.2.1-lx' into omaha_16.2.2 
Conflicts:
	cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/dialogs/PrintDialog.java
	cave/com.raytheon.viz.hydro/META-INF/MANIFEST.MF
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/flashfloodguidance/FlashFloodGuidanceDlg.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDisplayCanvas.java
	cave/com.raytheon.viz.hydrobase/src/com/raytheon/viz/hydrobase/HydroBaseDlg.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java


Former-commit-id: 30e9ffce1a90bd85f5b310944b309188447439ce
 2016-05-19 22:07:52 -05:00
Shawn.Hooper
cb2a92c16d Merge remote-tracking branch 'vlab/ohd_16.2.2' into master_16.2.2 
Former-commit-id: 621247965d7e00d548804e7f2871739b2a6867f6
 2016-05-13 13:16:13 -04:00
Jingtao Deng
bb33cfa4c0 VLab Issue #18549 - Hydrobase UELE when updates River Gage data; fixes #18549 
Change-Id: I4783ee8b723cbb95ec1819fc206f1deefcccc1cc

Former-commit-id: 91568da77e23d0d314b027cb63845c2d4a3dc8e5
 2016-05-12 10:43:35 -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
Ron Anderson
9b08575a41 Merge "Omaha #5483 - Fix hi-dpi issues in hydro Data Sources dialog." into omaha_16.2.1-lx 
Former-commit-id: 16bed3bd4b49a02e12f8411bdb02b4b2cc2e4678
 2016-04-27 08:49:28 -05:00
Steve Harris
7faad794f1 Merge branch 'omaha_16.2.1' into omaha_16.2.1-lx 
Conflicts:
	cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java


Former-commit-id: 8a69fb3ce7c65b73e4f7bc760400cf064a72d40e
 2016-04-26 16:10:22 -05:00
Mike Duff
ffffe0f529 Omaha #5217 - Fixed the code so the basin polygon is reprojected into the HRAP coordinate reference system. 
(cherry picked from commit ab4f83692917d1ffc43b8c3bd89512521d140a22)


Former-commit-id: a1e43d84143651c18abd1743dc959a577d28c9a8
 2016-04-26 12:11:51 -05:00
Mike Duff
0c6b6450ef Omaha #5217 - Fixed an issue calculating column number 
(cherry picked from commit ce24655216866322bffd53d79f4a84968cbb348d)


Former-commit-id: 55a4472f8923b61bd12df02314f031529fc48702
 2016-04-26 12:11:41 -05:00
David Gillingham
810f7888e7 Omaha #5483 - Fix hi-dpi issues in hydro Data Sources dialog. 
Change-Id: If2e1d1279b09ce97b1ec8b7804c1a2e3c968efa0

Former-commit-id: 5ebba7665c39ca689aec696b01f5de3d69073dcf
 2016-04-22 14:42:45 -05:00
David Gillingham
6e866901a2 Omaha #5483 - Fix hi-dpi issues in HBPasswordDlg.java. 
Change-Id: I27c19dcd310191a17b03ef25d1009c1149425216

Former-commit-id: e6c094b0568bbde930dd67b4a487ca8f3f01e851
 2016-04-14 15:12:26 -05:00
Shawn.Hooper
449307b46c Merge tag 'OB_16.2.1-22' into master_16.2.2 
16.2.1-22


Former-commit-id: 102f706a27808f2627f3d9ed8c6be11e0dc978ee
 2016-04-12 14:28:16 -04:00
Penghai Wang
1ff00e7088 Merge branch 'master_16.2.2' into asdt_16.2.2 
Conflicts:
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TabularTimeSeriesDlg.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDisplayCanvas.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDlg.java
	cave/com.raytheon.viz.hydrobase/src/com/raytheon/viz/hydrobase/dialogs/DataIngestFilterDlg.java
	cave/com.raytheon.viz.hydrobase/src/com/raytheon/viz/hydrobase/dialogs/RiverGageDlg.java
	cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/rsc/graphic/RadarGraphicFunctions.java
	cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/rsc/graphic/RadarGraphicsPage.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
	edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/styleRules/gridImageryStyleRules.xml

Former-commit-id: 51bcd1df67c24bce021a89b8708e48306dd0691e
 2016-04-12 16:45:34 +00:00
Shawn.Hooper
8a618519ec Merge remote-tracking branch 'vlab/ohd_16.2.2' into master_16.2.2 
Former-commit-id: c3a9e71a1dd7a971701ac3c157a8a7b2eb1f3182
 2016-04-07 16:02:01 -04:00
Steve Harris
e2719ac948 Merge branch 'omaha_16.2.1' into omaha_16.2.1-lx 
Former-commit-id: 5e8f5c6bc014369458edb5adccd98f1940c77b41
 2016-04-05 23:06:41 -05:00
Mike Duff
b475dd13af ASM #18746 - Cherry-pick Omaha #5217 from 16.1.2-p to 16.2.1 
Calculated interior longitudes are now always > 0.

Change-Id: I408eb04aa8ca344910a5e3d7773dbb0cb7277902
(cherry picked from commit b6eaf35398bf6126d7ee8ca140cd05880504a184)
(cherry picked from commit 6c8d7863e8d9dc8df3c983ec0de657c9fdc2a13d [formerly 85832fb048cc36b8d3baa66595585b906d686fdc])

Former-commit-id: 5c77638d0e2ef792a66e86cddfafb5a626450f46
 2016-03-31 12:34:03 -04:00
Shawn.Hooper
1cf2f19e65 Merge tag 'OB_16.2.1-17' into asm_16.2.2 
16.2.1-17

Change-Id: I3cb4abf93fd7729ea54cbe4c8ecea781579c5db7

Former-commit-id: 17fb0b31a7377334925e852db6fabb7b223594dd
 2016-03-29 16:43:12 -04:00
Steve Harris
4db3d83cd5 Merge branch 'omaha_16.2.1' into omaha_16.2.1-lx 
Former-commit-id: 1326695462feadf36857209b39d3061c4d493384
 2016-03-16 09:02:02 -05:00
Mike Duff
6e2fb75837 Omaha #5217 - Fixed column values to be full hrap columns rather than relative to the subgrid. 
(cherry picked from commit 06d906370f484bb470fb6012e47752cfe5ba36b5 [formerly 84b98033630ce6ac446ef637f4d6001065f07916])


Former-commit-id: d79abd1be1b8dd8e7faadac8971dd41db4ad9e26
 2016-03-14 16:29:56 -04: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
Steve Harris
bbd0a34445 Merge branch 'omaha_16.2.1' into omaha_16.2.1-lx 
Conflicts:
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java


Former-commit-id: 50282f22b76f6d393c1918652a9e0da8696847f0
 2016-02-29 13:18:08 -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
Penghai Wang
af411b7b07 Merge "VLab Issue #13015 - DCS 14232, change locarea table's area column to 500 characters. Java changes; fixes #13015" into asdt_16.2.2 
Former-commit-id: a45f0fd471daeac3be9d23b22e6ae6446ae9ad32
 2016-02-22 14:30:58 +00:00
Penghai Wang
be300a7e04 Merge "VLab Issue #12793 - DCS 14607, added filter, backend logic. Followed model of physical element filter and found it to be faulty, so corrected by appending a space after the comma for separated elements. Change was needed due to apostrophe logic later on, or queries do not run; fixes #12793" into asdt_16.2.2 
Former-commit-id: c5f890a8147e364313926484e8d11a89c35f3efc
 2016-02-22 14:30:31 +00:00
Jingtao Deng
1e4ce1aa6d VLab Issue #14829 - Hydrobase code improvement based on RODO code review for DR17935; fixes #14829 
Change-Id: I507f7b0b4167d0a7c140b17054a8c5129943dca1

Former-commit-id: 191ae232bf4f73d33bc27302fcc2edee258248e5
 2016-02-18 14:28:01 -05:00
Andrew Moore
d278603bfb VLab Issue #12793 - DCS 14607, added filter, backend logic. Followed model of physical element filter and found it to be faulty, so corrected by appending a space after the comma for separated elements. Change was needed due to apostrophe logic later on, or queries do not run; fixes #12793 
Change-Id: I8922ca2bc8e9558aaf54bb3026e94bed8530b6a9

VLab Issue #12793 - DCS 14607, reworked queries due to common apostrophe causing unexpected issues. Compacted multiple queries into one. Added wfo to be stored in data class; fixes #12793

Change-Id: Ifa8c10512c228957f061f10c3c8e7bf74b62808a

VLab Issue #12793 - DCS 14607 added WFO information to selection section. Realigned/resized elements to make use of empty space generated from the added elements from this DCS. Ready for local testing; fixes #12793

Change-Id: Ifb6994ce0753423f42d05201ac6a2d0d4a93616e

Former-commit-id: 3a8ee6d505aeec82228f67476e6807bf5140fff1
 2016-02-17 20:14:57 +00:00
Bryan Kowal
7825da651f Omaha #5354 - only update the stnclass table when an associated location exists. 
Change-Id: I26bd7903cda7f266ef4fa018588fd49b36aa62b9

Former-commit-id: 3e31242ebba9ab7187a8f6fd26e4153c02bd3a2e
 2016-02-16 13:39:07 -06:00
Mike Duff
acb2014779 Omaha #5217 - Convert longitude values back to positive for storage in DB. 
Former-commit-id: 210da6aeccfbb0428dbb6c89f97a66bdeb350a3d
 2016-02-15 11:57:55 -06:00
Andrew Moore
4daeed6be2 VLab Issue #13015 - DCS 14232, change locarea table's area column to 500 characters. Java changes; fixes #13015 
Change-Id: I6006354d63828c2b7753b4cbb854eecc473d180c

VLab Issue #13015 - DCS 14232, change locarea table's area column to 500 characters. SQL change; fixes #13015

Change-Id: I620701d51c14359726d4c1d0229e2c536dc67bc5

Former-commit-id: 5df7cdcf86c8216b0df2b5ae824f2a70487e82f1
 2016-02-08 17:23:42 +00:00
Wen Kwock
d7e937a6ec VLab Issue #12791 - DCS14228 Double remark field; fixes #12791 
Change-Id: Iba08f9cbfd1c7730365df16b819e588c2d5698e5

Former-commit-id: a4ecfaf8aa590bb6aba3bebe39ed98aae56c6ae9
 2016-02-05 21:50:39 +00: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
dcaaf9f52b Merge branch 'omaha_16.2.1' into omaha_16.2.1-lx 
Conflicts:
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java


Former-commit-id: 13a968811d1cdde95f663d7af4b8a6030ece556e
 2016-01-28 15:47:31 -06:00
Shawn.Hooper
2861d7abd7 Merge tag 'OB_16.1.2-14' into master_16.2.1 
16.1.2-14

Conflicts:
	cave/com.raytheon.uf.viz.d2d.core/src/com/raytheon/uf/viz/d2d/core/time/D2DTimeMatcher.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java

Change-Id: If4483610b92d4c2ef975c3ac75403e12a70d612c

Former-commit-id: 66d3cd35731e59996c34f003e42cbb2a41010717
 2016-01-25 14:32:31 -05:00
Steve Harris
e4202dd626 Merge branch 'omaha_16.2.1' into omaha_16.2.1-lx 
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


Former-commit-id: 6e31f1b2e4f7c30faf67d0d62b5907b111e4b52f
 2016-01-20 16:49:18 -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
Jingtao Deng
9aa84bb2e8 Merge remote-tracking branch 'remotes/origin/master_16.2.1' into ohd_16.2.2_merge 
Former-commit-id: 5de7d105d0a1c95fd64192d7eb293a2b361cefd0
 2016-01-20 13:54:52 -05:00
Ron Anderson
24bc0a3344 Omaha #5054 Fix Dialog parenting 
Change-Id: Ie7e1727ef9666cf510093f8fb6b06a1a258a30e2

Former-commit-id: 5093e43e9d1d26898f9719e00f6489a7f3ea55c8
 2016-01-19 09:19:13 -06:00
Jingtao Deng
913d4bfcee VLab Issue #14827 - Hydrobase uses location lat/lon as first guess to new RG; fixes #14827 
Change-Id: I53d3b489c4bab7a1327cf965eab50f16dde4be43

Former-commit-id: c9be536c7313eefab4fda3f964f2580613246f5d
 2016-01-13 14:44:40 -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
Mike Duff
36ecc40284 Omaha #5217 - Fixes to basin import for hydrobase. 
Change-Id: I4b9c8bbe46336f24a299ca538920ad4a12722cba

Former-commit-id: 8dcad8fbe28821da3ae70f7562ca35c86d48779b
 2016-01-07 15:19:28 -06:00
Mike Duff
0dd941a578 Omaha #5217 - Fix Areal Import in Hydrobase 
Former-commit-id: 666ba9d0eea16944e4ed57ad225abc611f57ea76
 2015-12-18 14:45:42 -06:00
Wen Kwock
99acc5fb56 VLab Issue #10347 - DCS15095 Add edit/insert feature for hydrobase; fixes #10347 
Change-Id: Ie6312f6845ced90a69bc3c230fb15b97a46432f1

Former-commit-id: 2b03436018a3e4f878889902bd3edf6dfbfa37a3
 2015-11-09 18:51:03 +00: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
Jingtao Deng
1234ccdfae VLab Issue #12477 - Hydrobase cannot update certain textfields with special char; fixes #12477 
Change-Id: I1f97bc6c9c1610080297d7968f7653c446a107eb

Former-commit-id: 37350d2119e037f22fb3c41090512b961347a84e
 2015-10-14 13:31:58 -04:00
Richard Peter
5cacc8ba5c Omaha #4763 - Update to use Number in blind cast 
Change-Id: I47530dffbdd2c29fb9dca61197c2431966d3dbeb

Former-commit-id: 7643aeea81b6d691432414657f8a03e856a853f2
 2015-08-18 17:44:06 -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
Richard Peter
7a79834265 Omaha #4500 - Update hydro blind casts to use Number 
Change-Id: Ide22b937047d254cb3fb003df630c936d601fe22

Former-commit-id: 877a65681207ae7d93ac385e88dbc213980a49de
 2015-07-21 17:17:27 -05:00
Loubna.Bousaidi
63ed0c0cf4 ASM #14104 increased gsno text limit in the GUI to 15 
Change-Id: Ica5e3bb82c78939c1aea75859a09d31e6e5e196b

Former-commit-id: 4e12f27532c66212a039cc6d5ef7a5b630e67ec6
 2015-07-06 20:53:55 +00:00
Xuezhi.Wei
c17cca2362 ASM #15642 Small Enhancement with HydroBase 
Change-Id: I5628dafa97316c9b008987dbbc7c64eb11bf18f3

Former-commit-id: 76f1732245ed24fc1628cc4a60c06ef0dad26c94
 2015-07-01 11:10:21 +00:00
Xuezhi.Wei
555fff2ed3 ASM #17360 AWIPS II - Hydro Database Manager - import of basins.dat fails 
Change-Id: I64b394b5bd34f0a62dab90466ac54b10b87b8ae9

Former-commit-id: 973603ead646d299b83632deae0ed49b3aa45fdd
 2015-06-30 14:26:52 +00:00