Steve Harris
25cee1be8c
Merge branch 'omaha_16.2.1' into omaha_16.2.2
...
Conflicts:
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/alarmalert/util/AlarmAlertFunctions.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
Former-commit-id: 58b1a82b5cf59525bf266416bc8c3ca6c0dea4ad
2016-01-13 09:20:51 -06:00
Shawn.Hooper
f3fafae42e
Merge remote-tracking branch 'origin/master_16.2.1' into asm_16.2.1
...
Conflicts:
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
Change-Id: Ie67d751b1c68099a98826e6542ebff4cf0aae7e5
Former-commit-id: b9b551d68ed55536b2480b60ef1269bcf5402004
2016-01-04 16:47:59 -05:00
Nate Jensen
07abf15280
Omaha #4834 correct some menu items
...
fix copy/paste errors on menus
remove dead menus
Change-Id: Ief9e357f09b61a1f068bfbdb78691a7293b96552
Former-commit-id: 9220aa63ef9b99a1991f6c9cf14fb4e958da7d87
2015-12-14 12:12:03 -06:00
Michael Gamazaychikov
12981ba3d4
ASM #14752 - Word wrap not working properly for WarnGen impact warnings.
...
Change-Id: Ifdb6393cf070dc6e55b15dda22e8c93072ae1d79
Former-commit-id: 0c3307554bda52b437bdf2019c500bb4f6b8adcf
2015-12-14 09:49:22 -05:00
Nate Jensen
a54a33166e
Omaha #4834 changes for LocalizationFile.delete() signature
...
Change-Id: I14a8dceac65cc9509079ca6d0a922c3fa451bd19
Former-commit-id: 4ed3e71084421dfa53180e2fbed9c067ba796886
2015-12-09 17:00:33 -06:00
Michael Gamazaychikov
ada11a5c8d
ASM #14995 - TextWS Alarm/Alert proximity alarm can error on certain product formats.
...
Change-Id: Iaaa894796932aff68af6e40f3a1431ec231911a7
Former-commit-id: bc4e9abbe6d49e9fc49294b55bac4a3e5fa28422
2015-11-29 15:38:44 -05:00
Nate Jensen
acc931788c
Omaha #4834 remove catch LocalizationOpFailedException
...
replace catching LocalizationOpFailedException with
LocalizationException
Change-Id: Ib5ed69539474d798d04363106a5a2aaf47ac6e58
Former-commit-id: c465340cf3d5215c10409354b380ed76bbbca270
2015-11-12 14:32:01 -06:00
Steve Harris
260d20c920
Merge branch 'omaha_16.2.1' into omaha_16.2.2
...
Conflicts:
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResource.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
edexOsgi/com.raytheon.uf.edex.ogc.common/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.uf.edex.ogc.common/src/com/raytheon/uf/edex/ogc/common/OgcLayer.java
edexOsgi/com.raytheon.uf.edex.ogc.common/src/com/raytheon/uf/edex/ogc/common/db/LayerCollector.java
edexOsgi/com.raytheon.uf.edex.ogc.common/src/com/raytheon/uf/edex/ogc/common/db/LayerTransformer.java
edexOsgi/com.raytheon.uf.edex.ogc.common/src/com/raytheon/uf/edex/ogc/common/filter/ComparisonFilter.java
edexOsgi/com.raytheon.uf.edex.ogc.common/src/com/raytheon/uf/edex/ogc/common/gml3_1_1/EnvelopeConverter.java
edexOsgi/com.raytheon.uf.edex.ogc.common/src/com/raytheon/uf/edex/ogc/common/gml3_2_1/EnvelopeConverter.java
edexOsgi/com.raytheon.uf.edex.ogc.common/src/com/raytheon/uf/edex/ogc/common/gml3_2_1/GeometryConverter.java
edexOsgi/com.raytheon.uf.edex.ogc.common/src/com/raytheon/uf/edex/ogc/common/http/IOgcHttpPooler.java
edexOsgi/com.raytheon.uf.edex.ogc.common/src/com/raytheon/uf/edex/ogc/common/http/OgcHttpHandler.java
edexOsgi/com.raytheon.uf.edex.ogc.common/src/com/raytheon/uf/edex/ogc/common/http/SingleHttpPool.java
edexOsgi/com.raytheon.uf.edex.ogc.common/src/com/raytheon/uf/edex/ogc/common/spatial/CoordinateUtil.java
edexOsgi/com.raytheon.uf.edex.wfs/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.uf.edex.wfs/src/com/raytheon/uf/edex/wfs/filter/v1_1_0/QueryFilterVisitor.java
edexOsgi/com.raytheon.uf.edex.wfs/src/com/raytheon/uf/edex/wfs/filter/v2_0_0/AbstractQueryFilterVisitor.java
edexOsgi/com.raytheon.uf.edex.wfs/src/com/raytheon/uf/edex/wfs/filter/v2_0_0/QueryExpressionVisitor.java
edexOsgi/com.raytheon.uf.edex.wfs/src/com/raytheon/uf/edex/wfs/reg/WfsRegistryImpl.java
Former-commit-id: b9aab5f7931fde1d2aaf9ba0402bf35314cd0c5f
2015-11-12 13:57:32 -06:00
Roger Ferrel
05d66de1c9
Omaha #5039 Allow editing of component name lines and clean up of streams.
...
Change-Id: I3940d6c012f47e1fc9e046bfeca98c235ecf57bc
Former-commit-id: ce4f546a045b483a469bdcd414f2f382959d55cc
2015-11-05 14:24:47 -06:00
Steve Harris
3ab5d8752a
Merge branch 'omaha_16.2.1' into omaha_16.2.2
...
Former-commit-id: 435c46c950cfafd67fd9cef2a2152adbbf7f6ab7
2015-11-04 15:58:15 -06:00
Roger Ferrel
084f269445
Omaha #5039 Prevent wrapping/editing of component name line.
...
Former-commit-id: 24adf04acb60b5647c42d612f4fff3b2d746f1bf
2015-11-04 09:51:27 -06:00
Roger Ferrel
2190e72727
Omaha #5086 Generate sound while showing message about to expire dialog.
...
Former-commit-id: a383e2a03c9ccc7563ff5468f41d00eedf532e9b
2015-11-03 10:40:07 -06:00
Ron Anderson
5085377b9d
Omaha #5054 Fix Text workstation window locations on multimonitor display
...
Change-Id: I0bdb999ccd7f033e46dc62d2b8b6b31dcc9aa34f
Former-commit-id: bbd448c086fd28c777d434d7308d137ba553840a
2015-10-28 11:39:02 -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
026bfbbc72
Merge branch 'asm_15.1.2' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_15.1.2
...
Conflicts:
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
Former-commit-id: a9f1a28c4b9b8ce19d110fb26864268a89085481
2015-10-08 13:14:29 -04:00
David Friedman
6536afe67e
ASM #18132 - Text Workstation incorrectly reassigns ETN of TCV products
...
Change-Id: I19db78aa384a12f238a3be1375c276f7ff0f601f
Former-commit-id: 69492727ae30b793cf26a9431350b019f7eb6dd8
2015-10-07 16:01:38 +00:00
Roger Ferrel
9c7321a9a5
Omaha #4899 Checks to prevent sending product while in operational mode and simulated time.
...
Former-commit-id: 8f422c4fe573ab1d1391d4d975f6b245ed933938
2015-10-01 16:14:51 -05:00
Slav Korolev
df92008e48
Omaha #4860 - Fixed TAF editor Store to DB option.
...
Former-commit-id: ce07a97d87a549406c7bb8407d79b761f2d4e61a
2015-09-30 09:25:56 -04:00
David Gillingham
c2ec09be70
Omaha #4781 : Make improvements to spell checker.
...
Change-Id: I8e5c951166308ae06f0371711144ee12f8ec8b17
Former-commit-id: f473c8ba23b01cdb43be88bedb6c5bf83c2a196b
2015-09-08 21:22:47 -05:00
Nate Jensen
687dcb9453
Omaha #4749 release references to dialogs on close()
...
Change-Id: Ib077a066883e01005922f1423e54985476f85638
Former-commit-id: b29739316c96177265ab9aa7f375c6c30ffccfd7
2015-08-31 09:42:39 -05:00
David Friedman
a0c82a85ae
ASM #17843 - UHELE when closing Text WS while "No product..." banner is displayed
...
Change-Id: I50e45c01e3d454d2278248ba073bd09b39ad7f46
Former-commit-id: 90fddd16408d7e45850dad5c1f4c4d3a27d64ea0
2015-08-07 14:00:05 +00: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
David Friedman
876ed4837a
ASM #17534 - TextWS "No product" message box prevents WarnGen scratch products from being edited
...
Change-Id: Id7ae458cb978f2e0cf644eca82fb17b65cf0eb38
Former-commit-id: f47ecc5c2f83f890431a70464ce08c8303c69033
2015-07-22 15:37:40 +00:00
Daniel.Huffman
2bc03d1bf4
ASM #15044 Implemented tabbing and tabs to spaces in Text Workstation
...
Change-Id: I9707994490ff80d29a7e45dec0a2e7ffb47bf8e7
Former-commit-id: 38480f629c04003db315f0e439ce556084909bb2
2015-07-10 13:09:50 +00:00
Ron Anderson
dfffdececc
Omaha #4441 Fix UGC count error for Baltimore City
...
Change-Id: I8627d6835dccae8180ca608034375cf646cd30b4
Former-commit-id: b8b694cdd9a71d1054a019c8e627f89abc983b27
2015-07-09 13:34:30 -05:00
Ron Anderson
ba9cfeb66a
Omaha #4441 Fix QC issues in WarnGen
...
Change-Id: I0e4cce76063b164916f876aaf4615b939e79adf9
Former-commit-id: a527e014887319629977747349e2bf170e474477
2015-06-22 16:37:53 -05:00
Ron Anderson
d6c45829d7
Omaha #4442 and #4441 Fix QC and locking issues in SWS follow up.
...
Change-Id: Ie8aa0bb350d98296855e4a5c66ce16e83ab8c39b
Former-commit-id: 5d1bcc495e1b589ac8145523a2d965394c1744e2
2015-06-10 11:58:51 -05:00
Ron Anderson
15dfb5afef
Omaha #4441 and #4442 Fix WarnGen QC and locking issues with mixed case.
...
Change-Id: I95705831aa37e0774b09a0d2acee42c86d361368
Former-commit-id: ac3c7983f3c287cad4e0f38b0231b64ad69a60a6
2015-06-08 08:27:41 -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
adc53a4b48
Merge "Omaha #4259 avnfps, textws, uengine, handleOUP, qc changes for jep 3.3" into omaha_16.1.1
...
Former-commit-id: adc93b14a7222cabc8d2f6e17392eba9b2af94be
2015-05-07 08:42:44 -05:00
Steve Harris
23cb520937
Merge tag 'OB_15.1.1-8' into omaha_16.1.1
...
15.1.1-7
Conflicts (these files were moved to AWIPS2_baseline):
rpms/awips2.core/Installer.java/build.sh
rpms/awips2.core/Installer.java/common/scripts/profile.d/awips2Java.sh
Former-commit-id: df806c9479cb29a5f47f1511ad70e140b2bbf8ec
2015-05-05 15:24:22 -05:00
Steve Harris
0a7e5a4474
Merge tag 'OB_15.1.1-8' into omaha_15.1.1
...
15.1.1-7
Former-commit-id: 56bb5952e20c8ff817d1ca05b68bf9a8424f6df9
2015-05-05 13:33:32 -05:00
Steve Harris
815a30871b
Merge branch 'omaha_15.1.1' into omaha_16.1.1
...
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/reference/MapManager.java
Former-commit-id: c6156764c2c4fb068f994cbb17d1f373d75f7070
2015-05-05 09:19:28 -05:00
Nate Jensen
7df44931e7
Omaha #4259 avnfps, textws, uengine, handleOUP, qc changes for jep 3.3
...
Change-Id: I409f6743f4d901fd7dbce250d277a693e00329ad
Former-commit-id: f5ad526339c73623da4ccc7aee9c6b0fd2f387b0
2015-04-30 14:41:13 -05:00
Ron Anderson
551d1bee91
Omaha #4027 More changes for Mixed Case
...
Change-Id: Id47f1c68877e8df0cbf84df09bdaa000a41a863e
Former-commit-id: 0e48bfe4de5c227ebf96b0b59f9c7a9c39415f2e
2015-04-29 13:18:27 -05:00
Fay.Liang
ff11d4f55a
Merge branch 'asm_15.1.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_15.1.1
...
Conflicts:
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
Former-commit-id: efff4511cb01552b757678fb2ac64dca2da6f9c0
2015-04-20 15:38:33 -04:00
Steve Harris
7ec7cdf232
Merge tag 'OB_15.1.1-4' into omaha_16.1.1
...
15.1.1-4
Former-commit-id: c9f9bc2c612dae6d355fb3c5de313aa7274adc8b
2015-04-13 12:22:22 -05:00
Fay.Liang
1579e023ea
Merge branch 'asm_15.1.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_15.1.1
...
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
Former-commit-id: 6608975224ad22f454a243c919d498a5a2369e32
2015-04-08 12:24:58 -04:00
Michael Gamazaychikov
06506f01c4
ASM #14968 - TextWS: Problems inserting text into pathcast section.
...
Change-Id: I9a9bc6c91b6d15087acf0e08c9168211745dfa88
Former-commit-id: 9f42d943954adc1f3e9c365381f46d4c5a375d71
2015-04-06 10:08:28 -04:00
Kiran.Shrestha
8f981c5fa4
ASM #15025 WRK product changes header to alternate- long-line pil in header block.
...
Change-Id: If5776bbddbf8b5eddf8dff85d913ce8a4862bd12
Former-commit-id: 3ab4df17a7fd40f93de6cb32798ee5a2385f4814
2015-04-03 18:43:24 +00:00
Steve Harris
f7af8ee606
Merge branch 'omaha_15.1.1' into omaha_16.1.1
...
Former-commit-id: cf70a7888a39667c54b344274c76d5106927fa30
2015-04-01 17:22:45 -05:00
David Gillingham
6569868378
Omaha #4320 : fix grammar error in javadoc.
...
Change-Id: I16dc49753d31f6510d883a4b48421e44d113b428
Former-commit-id: e9f57c24bb73378eef489c56dadf8661979bfdc9
2015-03-26 09:54:49 -05:00
David Gillingham
0e07177b94
Omaha #4320 : Add QC check to warngen products to test that product passes through WarningDecoder without error.
...
Change-Id: I1b5ccfafa9701cc9387a7f29459df02367c2c249
Former-commit-id: e08bcbfbd25286e547dccafbf00269c41392fccb
2015-03-25 23:14:18 -05:00
Fay.Liang
86a8041062
Merge branch 'asm_15.1.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_15.1.1
...
Conflicts:
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/resource/MultiPointResource.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
edexOsgi/build.edex/edex/common.properties
Former-commit-id: ba576b948587ea7b1c077ebad7113bc4e7504c00
2015-03-19 12:35:31 -04:00
Kiran.Shrestha
01dc0567ad
ASM #14866 -TextWS: QC GUI pops up for products that did not have GUI in AWIPS 1
...
Change-Id: Ic14667386eeaef84f6849193c60b8199f8b07ed5
Former-commit-id: 1aea5a4cd3d6a9476dc6dd3b590a15170b0e4031
2015-03-10 13:51:56 +00:00
Kiran.Shrestha
25608f610c
ASM #15025 - WRK product changes header to alternate- long-line pil in header block
...
Change-Id: I34b571406ceac8888b744064b75b6dcb7000757a
Former-commit-id: d5564b8ffaeff4a24468b45cb64f15a45b2321ca
2015-03-05 18:54:20 +00:00
Steve Harris
118f52263f
Merge branch 'omaha_14.4.1' into omaha_15.1.1
...
Former-commit-id: ffee274d844442a36d633deda5776c09a758cb38
2015-02-12 12:48:29 -06:00
Nate Jensen
fa547ac3dd
Omaha #4086 resurrect undead textws scripting code and make it work with
...
TextDBQuery
Change-Id: I33ddf04b2f02ee088f7b8956c5c31e874747ddf8
Former-commit-id: 9cdf82d433bd07289002c1f4df9f5242dce0de7e
2015-02-04 16:46:21 -06:00
Steve Harris
9234ceb485
Merge tag 'OB_14.4.1-2m' into omaha_15.1.1
...
Conflicts:
cave/com.raytheon.viz.gfe/localization/gfe/userPython/utilities/SmartScript.py (self-resolved)
edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/grid/dataset/alias/gfeParamInfo.xml (took both Anna and David's additions)
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py (took both Anna and David's additions)
Former-commit-id: 01c4aa19ab0b21f331c2200076efbd44eb3b2af6
2015-01-23 09:32:44 -06:00
