Commit graph

55 commits

Author SHA1 Message Date
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
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
Xuezhi.Wei
fbc513cf97 ASM #14630 Not able to import basins.dat with apostrophe and incorrect data posted
Change-Id: Icb37fa478bac99a7214e391c9237caa4c298528a

Former-commit-id: 27ec9fc2bfec99ba60fe48753237bcfb104e05f6
2015-06-29 15:17:11 +00:00
Slav Korolev
497fe6e160 Omaha #4380 - Added new hydro forecast issuance stage and flow
Former-commit-id: 544d831ab3467af567ced94f97fe479b667d915c
2015-05-21 08:57:22 -04: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
Jingtao Deng
74d8aa9c25 VLab Issue #7440 - DR17338 Apostrophe in the Hydrobase textfields are not saved; fixes #7440
Change-Id: Ifa008dc2cbdb77a60230a66724dd1a5d56a7c696

Former-commit-id: 6cdfbaba29b9ed4b4130218d765dc59919c1a513
2015-04-13 11:12:46 -04:00
Jingtao Deng
1f964dc9d9 VLab Issue #6377 - Hydrobase menus using incorrect time; fixes #6377
Change-Id: I6addf618f131ca21fa41bdf35ab8ae18332b10d3

Former-commit-id: be543921987b5a9bb2591dce6a5114802cb4d1ed
2015-03-02 16:13:42 -05:00
Jingtao Deng
d97da779b5 VLab Issue #6375 - Hydrobase can not enter apostrophes in text fields; fixes #6375
Change-Id: I6c7dda03ccfbad2350f06754d5e011d1e3825b76

Former-commit-id: 73fd2358b4fe0f5063691d3ef8905b0b48ea7cda
2015-03-02 16:13:07 -05:00
Jingtao Deng
338dd05bdb VLab Issue #6374 - HydroBase does not save update due to apostrophe; fixes #6374
Change-Id: I270e51c2a8282ddd68cf38559d8e0cc1d5863091

Former-commit-id: 66d852168ca99dc791576a27594c940dbe1904ba
2015-03-02 16:12:19 -05:00
Nate Jensen
25e09348c0 Omaha #3549 remove dead code
Change-Id: I211a20875c93e678852c45a0e5be15b9980e78f2

Former-commit-id: 70209fbc92c5459dab007224e1f5783a5bb08fd0
2014-12-03 17:35:08 -06:00
Nate Jensen
8dbe6abbe4 Omaha #3549 remove jdt prefs for faster builds
Change-Id: I82156718a52c37adecc8260fa40a2b0d93453b29

Former-commit-id: 3ba611e111585d2aa9cd9f647687fedb794077f7
2014-12-03 15:47:10 -06:00
Xuezhi.Wei
071a1ae06a ASM #545 Hydrobase IngestFilter GUI fixes
Change-Id: I368113a8ccb0356198a52a9d5c8a39247dce68e8

Former-commit-id: a8710a68e4aa28861c03c5d988bc36a553704c31
2014-05-02 16:55:36 +00:00
Richard Peter
21ae3b5fcd Merge branch 'omaha_14.2.2' (14.2.2-3) into development
Conflicts:
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResource.java
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
	cave/com.raytheon.viz.hydrobase/src/com/raytheon/viz/hydrobase/dialogs/QcAlertAlarmLimitsDlg.java
	cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/resource/HRAPOverlayResource.java
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/MPEDisplayManager.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.textdb/src/com/raytheon/edex/textdb/dbapi/impl/TextDBStaticData.java
	edexOsgi/com.raytheon.edex.textdb/src/com/raytheon/edex/textdb/ingest/TextDBStaticDataSubscriber.java
	edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/styleRules/d2dContourStyleRules.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/styleRules/gridImageryStyleRules.xml
	edexOsgi/com.raytheon.uf.edex.plugin.manualIngest/res/spring/manualIngest-spring.xml

Former-commit-id: bd13bc332bcdd87723bec8669885f4594ad483b9
2014-04-11 16:23:09 -05:00
Lee Venable
4714913a8c Issue #2970 - added SWT dispose checks to runAsync methods.
Former-commit-id: b07ebb73405c3421c6afa3e45db57162a7ca622b
2014-03-31 16:06:59 -05:00
brian.dyke
f10f6d4e8a merge 14.2.1-3 into asm-14.2.2
Former-commit-id: a116be206fc8a24dd12610db37db6f26c65a19b0
2014-01-27 15:27:49 -05:00
Steve Naples
68ff510bc8 Issue #125
Change-Id: I677be3fa551206e6c8b024a1aef45edb2c4e18ba

Former-commit-id: 6ddb1bb4204a1b405976720c9f48fc20ff84e7c4
2014-01-14 16:30:19 +00:00
Loubna.Bousaidi
226c767f96 Issue #207
Change-Id: Ia50dedd9b2a8340403131596ebb0e73b21c5ba90

Former-commit-id: eabfef02dc20e810ca9731a77bb96d73a800503b
2013-12-23 20:30:13 +00:00
Lee Venable
2c46c54a87 Issue #2346 - fixed cursor memory leaks
Former-commit-id: 645aceffd1d205eb4be4c8fd122e6cdf7b3b368e
2013-09-09 15:12:05 -05:00
Roger Ferrel
edb32da7ce Issue #2088 Changes for non-blocking PrintTextReportDlg and TextReportDlg.
Change-Id: I0f999c8334aefb3f2d0e27d91bdea419a96d65e6

Former-commit-id: 648aa82a0d6b10a92a44df55eb278b6cc4c9bc1b
2013-07-16 14:03:20 -05:00
Roger Ferrel
3eacead9bb Issue #2088 changes for non-blocking RatingCurveDlg, FindReplaceDlg and TextEditorDlg.
Change-Id: I8d651254e862a45c1dad33c0d4991b29f1611828

Former-commit-id: d71b87606a93f744984f45aec8887dbc0052bb4e
2013-07-16 10:28:32 -05:00
Roger Ferrel
e8d21c5d91 Issue #2088 Changes for non-blocking DataSourcesDlg, ImpactStatementDlg and LowWaterStatementDlg.
Change-Id: Ib6b6a6b6a2b0c433c30ac31beb6858e4c7a0c768

Former-commit-id: cf769302b9a9b2055f42969dfe781d7aa9c2286b
2013-07-15 14:26:35 -05:00
Roger Ferrel
68bc54c334 Issue #2088 Changes for non-blocking CrestHistoryDlg.
Change-Id: Iebb031464ab25d1212b1748789f79051528d0c3a

Former-commit-id: fc0cd12d87493527c6a7ddaddd70b77182a7390f
2013-07-15 07:56:14 -05:00
Roger Ferrel
88e0eeb81c Issue #2088 Changes for non-blocking ContactsDlg.
Change-Id: I8e9bd796b6b811cbcbd4159d7b209733fffa23df

Former-commit-id: 82e4a0edf2dbe2d2eca430b42adb50f8ec4e8125
2013-07-11 13:02:13 -05:00
Roger Ferrel
220818df3a Issue #2088 Made FcstPointGroupDlg, FloodReportDlg, HydroBaseDlg and StationFilterOptionsDlg non-blocking.
Change-Id: I44d41a5e3e4e00d924df190e253ae2568988d987

Former-commit-id: dd9ba84811ee60b4dae7fb940abf6ff2526869ba
2013-07-01 13:03:39 -05:00
Roger Ferrel
b87c394598 Issue #2088 Changes for non-blocking RiverGageDlg, RiverProFcstGrpPointsDlg, RiverProGenParamsDlg and StatesCountiesZonesDlg.
Change-Id: I5f11ffd383622c49dcfbeb91e08904bad3a508b3

Former-commit-id: 769bc48479c0f5d69c54bf1d541ff1f9c89b0330
2013-06-12 08:26:14 -05:00
Steve Harris
fe872355a7 13.5.1-1 baseline
Former-commit-id: 72a49a353cb22c89c9aa19ed1f4a681c3e89d5f3
2013-06-10 15:17:17 -04:00
Roger Ferrel
3e802aa80e Issue #1790 Changes for non-blocking RadarLocationsDlg, ReferenceFieldsDlg, ReferencesDlg and ReservoirDlg.
Change-Id: I9852b92ee80e874d76fcfb428bd7437628a94f14

Former-commit-id: 06c4fc493c8c3f2bd1281f062855091d402251b6
2013-04-26 16:33:57 -05:00
Roger Ferrel
1f50588858 Issue #1790 Minor changes to bring code up to Raytheon standards.
Change-Id: Iad49a91187bc8f6f4eab9be23fa030399bffd12b

Former-commit-id: 89095dce81484d1629f399d849581585a8c67431
2013-04-23 12:20:53 -05:00
Roger Ferrel
2dafedfed2 Issue #1790 Changes for non-blocking dialogs DescriptionDlg, FloodCategoryDlg, FloodDamageDlg, GageHistoryDlg, HydroGenConfigDlg, LowWaterDlg, NwrTransmitterDlg, PreferencesDlg, PublicationsDlg and QcAlertAlarmLimitsDlg.
Change-Id: Ic4a3ccb3e13344244415786591accbffda0d0e96

Former-commit-id: b9d5321cdeaeb9b37783e96b76321ddb90c0d6dd
2013-04-23 11:42:14 -05:00
Roger Ferrel
ec275df412 Issue #1790 Changes for non-blocking dialogs CountyStateDlg, CountyZoneUgcDlg, DataAdjustFactorDlg, DataIngestFilterDlg, DataPurgeParamsDlg and DatumDlg; also changes to hydro data mangagers to remove ArrayList for method interfaces.
Change-Id: Id5f56669045afd402bed893c13977641ef59835b

Former-commit-id: 23bf9839c60aa33d7bf43492b72acbeedcf518b9
2013-04-19 13:42:46 -05:00
Roger Ferrel
9c428385ee Issue #1790 Changes for non-blocking CountyStateDlg.
Change-Id: I101202dbe8f5c1fdd9bac9b86a629960d9681e7d

Former-commit-id: a1b5f0b08a08bed1b76f81094970594aeae0a1f3
2013-04-18 07:49:08 -05:00
Roger Ferrel
5d23b6a450 Issue #1790 Changes for non-blocking ArealDefinitionsDlg, CoopAgencyOfficeDlg, CopyNewLocationDlg and BenchmarkDlg.
Change-Id: Ie4b0cbe02f0ba74ec6678acb20c9d085b08a4cea

Former-commit-id: f3eb94989b149efb8651f37d2171615829eabf9d
2013-04-17 10:43:32 -05:00
Roger Ferrel
0194324742 Issue #1790 Changes for non-blocking AdministrationDlg.
Change-Id: Iec8d71c747ef5167cd49909caba33176519cd07d

Former-commit-id: aa671a4bcfbd26ade407a8e52c6fe5eac69eb83f
2013-04-16 16:34:00 -05:00
Roger Ferrel
f410ee5f89 Issue #1790 Changes for non-blocking AddModifyLocationDlg.
Change-Id: Ice2d3a8bbeaff0689d2b4e0a2ba8bbee017fb080

Former-commit-id: 8e78b6799404059032f10b97e62d385e07852c53
2013-04-16 15:54:02 -05:00
Steve Harris
9b73b6a2a9 13.1.1-10 baseline
Former-commit-id: 1e337899d45617a8ee1998f2d2c86f2912668b67
2013-02-14 13:24:43 -06:00
Steve Harris
6d610f8e8a 12.12.1-12 baseline
Former-commit-id: ae5110532f5ac5c7842a5483a8e2c3dc299ae814
2012-12-06 09:18:28 -06:00
Steve Harris
cd49ef3eda 12.8.1-5 baseline
Former-commit-id: 99fb675cc2e1b94825ccda1fe09b1be0c3c25b3f
2012-08-01 10:45:37 -05:00
Steve Harris
c42ae0fa39 12.7.1-8 baseline
Former-commit-id: 46767a18a0d6e1f2182720c8a04c6e1e59cb18a1
2012-07-19 16:20:40 -05:00
Steve Harris
27afa60345 12.6.1-9 baseline
Former-commit-id: 8f93efb93ec2d244fe599c16b3af5b33784c0232
2012-07-10 07:53:49 -05:00