Fay.Liang
|
55e0d315e7
|
Merge tag 'OB_14.3.2-19m' into master_14.4.1
14.3.2-19m
Conflicts:
cave/com.raytheon.uf.viz.core.maps/src/com/raytheon/uf/viz/core/maps/rsc/AbstractDbMapResource.java
cave/com.raytheon.viz.core/src/com/raytheon/viz/core/rsc/jts/JTSCompiler.java
cave/com.raytheon.viz.mpe/src/com/raytheon/viz/mpe/util/InitPrecipClimo.java
cave/com.raytheon.viz.mpe/src/com/raytheon/viz/mpe/util/MeanMonthlyPrecip.java
cave/com.raytheon.viz.product.awips/awips.product
edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTable.java
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/dao/CoreDao.java
nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.pproc.so
nativeLib/files.native/edex/lib/native/linux32/library.ohd.pproc.so
ncep/gov.noaa.nws.ncep.edex.uengine/META-INF/MANIFEST.MF
ncep/gov.noaa.nws.ncep.edex.uengine/src/gov/noaa/nws/ncep/edex/uengine/tasks/profile/MdlSoundingQuery.java
ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/display/rsc/NsharpResourceHandler.java
ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/display/rsc/NsharpSkewTPaneResource.java
ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/display/rsc/NsharpTimeStnPaneResource.java
ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/view/NsharpPaletteWindow.java
rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
Former-commit-id: 0e475cb704 [formerly a9945f1981 [formerly 059eb032b1 ] [formerly 0e475cb704 [formerly 4b3626307cf35ada45985c25cf062e7b857db764]]]
Former-commit-id: a9945f1981 [formerly 059eb032b1 ]
Former-commit-id: a9945f1981
Former-commit-id: 1138f48ee9
|
2015-03-09 16:11:13 -04:00 |
|
Qinglu.Lin
|
7a00f68c60
|
ASM #17169: WarnGen Templates: IBW marine CTA and impact updates
Change-Id: I59e000340b6a82dc439128f3ad6963476b669344
Former-commit-id: dcef82c4d6 [formerly 5258c8f8b7 [formerly cf66bb11f3 ] [formerly dcef82c4d6 [formerly 441be68f8726618225b0c7a5077443b8a7815d99]]]
Former-commit-id: 5258c8f8b7 [formerly cf66bb11f3 ]
Former-commit-id: 5258c8f8b7
Former-commit-id: 9ee1b4a0a2
|
2015-02-27 16:10:22 -05:00 |
|
Fay.Liang
|
3b67540902
|
Merge branch 'master_14.3.2' into master_14.4.1
Conflicts:
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/PointPrecipPlotResource.java
cave/com.raytheon.viz.mpe/src/com/raytheon/viz/mpe/util/DailyQcUtils.java
edexOsgi/com.raytheon.edex.plugin.gfe/.settings/org.eclipse.jdt.core.prefs
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/textproducts/AreaDictionaryMaker.java
edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTableSrv.java
edexOsgi/com.raytheon.uf.edex.datadelivery.service/src/com/raytheon/uf/edex/datadelivery/service/services/overlap/SubscriptionOverlapHandler.java
rpms/awips2.core/Installer.java/1.7/component.spec
Former-commit-id: 43c7161dcf [formerly e3107ce1e4 [formerly 59f3f87190 ] [formerly 43c7161dcf [formerly e91a78eec910b84f44350d3aae68a26f4e0dcd72]]]
Former-commit-id: e3107ce1e4 [formerly 59f3f87190 ]
Former-commit-id: e3107ce1e4
Former-commit-id: 4bcae42022
|
2015-02-09 17:19:41 -05:00 |
|
David Friedman
|
378a586bad
|
ASM #17009 - Add Guam to countyTypes.txt file to account for "no counties"
Change-Id: Ic8dc2519b1cfb35bf3a2e0d8d61c007e108429a8
Former-commit-id: d1b3f2a5f4 [formerly 8a31830def [formerly beb5074ddd ] [formerly d1b3f2a5f4 [formerly 61ee73806f184b0d4092b8474f18b3525d92a20b]]]
Former-commit-id: 8a31830def [formerly beb5074ddd ]
Former-commit-id: 8a31830def
Former-commit-id: fb304398b0
|
2015-02-04 19:56:47 +00:00 |
|
Qinglu.Lin
|
ffc44d3f98
|
ASM #14929 - Baseline change needed to prevent getting marine locations outside of CWA in impact SMW's
Change-Id: I843e5dd289c9e2841a28b228a8dbc38dce965ad1
Former-commit-id: 30b5bc6a62 [formerly 761fc43aad [formerly 94ee166aa1 ] [formerly 30b5bc6a62 [formerly d4e1fca39f82eb39fc911c091eb579a785a6cef9]]]
Former-commit-id: 761fc43aad [formerly 94ee166aa1 ]
Former-commit-id: 761fc43aad
Former-commit-id: fe02279038
|
2015-01-20 16:20:58 -05:00 |
|
Roger Ferrel
|
a5e45966b7
|
Omaha #3353 Fix deadlock that freezes cave.
Change-Id: I4afa5c505178f30ada5dd58612b0703ab9529e6b
Former-commit-id: acbde703a2 [formerly 334b156d2e [formerly 398a8d6043 ] [formerly acbde703a2 [formerly 871fa68ddf242f1e63286939b1324fc3197c7336]]]
Former-commit-id: 334b156d2e [formerly 398a8d6043 ]
Former-commit-id: 334b156d2e
Former-commit-id: 733a59f2f1
|
2014-11-04 14:13:29 -06:00 |
|
Steve Harris
|
968950b551
|
Merge tag 'OB_14.3.1-31m' into omaha_14.4.1
Conflicts:
cave/com.raytheon.uf.viz.spellchecker/src/com/raytheon/uf/viz/spellchecker/dialogs/SpellCheckDlg.java
Former-commit-id: e770670ebf [formerly 472d9bd206 [formerly a5398d8035 ] [formerly e770670ebf [formerly 361f7bcf425edaf687cbfc63d4c165790b45a5bf]]]
Former-commit-id: 472d9bd206 [formerly a5398d8035 ]
Former-commit-id: 472d9bd206
Former-commit-id: aca1f23f98
|
2014-11-04 13:17:44 -06:00 |
|
Shawn.Hooper
|
55de90e891
|
ASM #15033 - Allow generic warning types to show up continuously during Warning cycle
Change-Id: I6e0884b1bbc1e4bed3300bb9dc0f0b3f779aa212
Former-commit-id: f8ee619f16 [formerly a9b50b13ce [formerly 58db54ff05 ] [formerly f8ee619f16 [formerly 41e18e5104eac8ee3335a80d678d74c7a56b196a]]]
Former-commit-id: a9b50b13ce [formerly 58db54ff05 ]
Former-commit-id: a9b50b13ce
Former-commit-id: 4dc9aaf835
|
2014-11-03 10:30:05 -05:00 |
|
Steve Harris
|
c98389d407
|
Merge tag 'OB_14.3.1-30m' into omaha_14.4.1
Former-commit-id: 5efdd0d572 [formerly b78ff0ee6e [formerly 54c14a5f5b ] [formerly 5efdd0d572 [formerly 9f4fc2a9cbff7f8555c7bf8326bb785f791e8b00]]]
Former-commit-id: b78ff0ee6e [formerly 54c14a5f5b ]
Former-commit-id: b78ff0ee6e
Former-commit-id: 6e09051282
|
2014-10-30 09:40:20 -05:00 |
|
Brian.Dyke
|
399757b2d9
|
Merge branch 'ops_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Former-commit-id: 94ddd59bfc [formerly 77b206664f [formerly 9907c37a0e ] [formerly 94ddd59bfc [formerly d12d6cf7e6862a87c00f833ee02e72e5c0ad8252]]]
Former-commit-id: 77b206664f [formerly 9907c37a0e ]
Former-commit-id: 77b206664f
Former-commit-id: 807a6372e8
|
2014-10-28 15:25:05 -04:00 |
|
Brian.Dyke
|
9cb98c7c68
|
Merge branch 'ops_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Conflicts:
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/VM_global_library.vm
Former-commit-id: 765359aee6 [formerly fe00e65407 [formerly f8ce701c85 ] [formerly 765359aee6 [formerly 52ba693c7d77f4e29db6bc5202c9764509bce58d]]]
Former-commit-id: fe00e65407 [formerly f8ce701c85 ]
Former-commit-id: fe00e65407
Former-commit-id: 839438530c
|
2014-10-28 15:23:11 -04:00 |
|
Baoyu Yin
|
3a8070a3ac
|
VLab Issue #4796 - AWIPS2_DR_17420 WarnGen templates and 14.2.1 template corrections UPDATE on Oct 28 fix for FFW error ; fixes #4796
Change-Id: I4f43f1365c3ad4d11314f199c4d896aa542a48c0
Former-commit-id: 4252ccfcb1 [formerly 3481a6eee5 [formerly c9bc14a668 ] [formerly 4252ccfcb1 [formerly 54d2f956f53d2fe8a6fa0550a4236d95013b8ba8]]]
Former-commit-id: 3481a6eee5 [formerly c9bc14a668 ]
Former-commit-id: 3481a6eee5
Former-commit-id: 2f5803a63d
|
2014-10-28 14:32:31 -04:00 |
|
Baoyu Yin
|
e292f0e31b
|
VLab Issue #4796 - AWIPS2_DR_17420 WarnGen templates and 14.2.1 template corrections UPDATE on Oct 27 ; fixes #4796
Change-Id: I636b0cbb46b31f46cb2d017a4b3047108c98f0c9
Former-commit-id: bb89f99643 [formerly cc1bf99ad3 [formerly 2c0c42dcdd ] [formerly bb89f99643 [formerly b447742f498bceaf5f522a637d6ae501f80dfa23]]]
Former-commit-id: cc1bf99ad3 [formerly 2c0c42dcdd ]
Former-commit-id: cc1bf99ad3
Former-commit-id: ccb29356ed
|
2014-10-27 10:15:39 -04:00 |
|
Baoyu Yin
|
924160ad97
|
VLab Issue #4796 - AWIPS2_DR_17420 WarnGen templates and 14.2.1 template corrections UPDATE on Oct 24 ; fixes #4796
Change-Id: I2df1ea83b9cd17735ee835914febd3739ff4671d
Former-commit-id: fe574dd41d [formerly e0b0edd8e1 [formerly c1d51b3588 ] [formerly fe574dd41d [formerly ecc2b0c99a4e849b9472dd6c0cd63416e880d4cb]]]
Former-commit-id: e0b0edd8e1 [formerly c1d51b3588 ]
Former-commit-id: e0b0edd8e1
Former-commit-id: a8fdfd014e
|
2014-10-24 14:28:08 -04:00 |
|
Benjamin Phillippe
|
81a16aa4de
|
Omaha #3454 Upgrading to Hibernate 4.2.15
Change-Id: I4ab0970abf9755f69e09ad3d9c79084b76761c29
Former-commit-id: fdd16051e8 [formerly e6deeb6fb5 [formerly 7845e8e40f ] [formerly fdd16051e8 [formerly 293e59403b6d6e1d792d9fc6d8a0ac106a490bf5]]]
Former-commit-id: e6deeb6fb5 [formerly 7845e8e40f ]
Former-commit-id: e6deeb6fb5
Former-commit-id: af4f8e1c8a
|
2014-10-20 12:42:19 -05:00 |
|
Steve Harris
|
637c664043
|
Merge tag 'OB_14.3.1-26m' into omaha_14.4.1
Former-commit-id: f2fdf98d2f [formerly 4fde31539e [formerly aff75d954b ] [formerly f2fdf98d2f [formerly 4be51191bc64978e3c455702bede3456666fbffe]]]
Former-commit-id: 4fde31539e [formerly aff75d954b ]
Former-commit-id: 4fde31539e
Former-commit-id: 85d5b72d04
|
2014-10-15 08:42:02 -05:00 |
|
Qinglu.Lin
|
d2f3fbdd53
|
ASM #556 - WarnGen: use noon/midnight instead of 1200 PM/1200 AM
Change-Id: I2a64416b861d3b374538db8efad51a9509a87892
Former-commit-id: 47be3aa143 [formerly 8372c15a61 [formerly 636f054077 ] [formerly 47be3aa143 [formerly 7124fd252f130417a9dcdac148480058d6eb0aba]]]
Former-commit-id: 8372c15a61 [formerly 636f054077 ]
Former-commit-id: 8372c15a61
Former-commit-id: b11f115e03
|
2014-10-06 16:05:26 -04:00 |
|
Steve Harris
|
772969f5c8
|
Merge tag 'OB_14.3.1-24m' into omaha_14.4.1
Former-commit-id: 2db03d95b3 [formerly 06a27b2d3c [formerly 39c5e9c314 ] [formerly 2db03d95b3 [formerly df9ef1f664e14fa7843328338c5b234022f4bfd4]]]
Former-commit-id: 06a27b2d3c [formerly 39c5e9c314 ]
Former-commit-id: 06a27b2d3c
Former-commit-id: 53dc9657e2
|
2014-10-06 13:57:59 -05:00 |
|
Steve Harris
|
fe9e274e09
|
Merge branch 'master_14.3.1' (14.3.1-23m) into omaha_14.4.1
Conflicts:
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/IFPClient.java
cave/com.raytheon.viz.volumebrowser/localization/menus/xml/planesMenusPlanView.xml
Issue #3648:
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFEDao.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/IFPGridDatabase.java
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
Issue #3560:
edexOsgi/com.raytheon.uf.common.registry.ebxml/src/com/raytheon/uf/common/registry/services/RegistryRESTServices.java
edexOsgi/com.raytheon.uf.common.registry.ebxml/src/com/raytheon/uf/common/registry/services/RegistrySOAPServices.java
Also modified with the resolution of #3560:
edexOsgi/com.raytheon.uf.common.registry.ebxml/src/com/raytheon/uf/common/registry/services/RegistryServiceConfiguration.java
Former-commit-id: 2616fe04b6 [formerly f4b771ea72 [formerly da463c484e ] [formerly 2616fe04b6 [formerly 8dc5abec482b4c1c3f3469c0ffc7e06fa697c6cd]]]
Former-commit-id: f4b771ea72 [formerly da463c484e ]
Former-commit-id: f4b771ea72
Former-commit-id: fa1fa76dd9
|
2014-10-03 10:18:34 -05:00 |
|
Shawn.Hooper
|
523f51a655
|
ASM #15033 - Fix IBW templates and 14.2.1 template corrections
Change-Id: I2677b93f897640318d8f89da72e49ba398d1d720
Former-commit-id: ae02cbc2da [formerly 22c3fde0ef [formerly f9428ace1f ] [formerly ae02cbc2da [formerly ea8e4c3a30bceb2f3b53159317382ae651aa5531]]]
Former-commit-id: 22c3fde0ef [formerly f9428ace1f ]
Former-commit-id: 22c3fde0ef
Former-commit-id: 5254c781ef
|
2014-10-01 15:58:48 -04:00 |
|
dmsys
|
c7895c80f6
|
Merge branch 'master_14.2.4' into master_14.3.1 CM-MERGE:14.2.4-13-14 into 14.3.1
Conflicts:
cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/StormTrackDisplay.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/IFPClient.java
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/specialWeatherStatement.vm
Former-commit-id: 9f4560c480 [formerly f704781f4f [formerly 8c3625cfec ] [formerly 9f4560c480 [formerly 0bf7ecb27d41f81f1d6727674fc1475eeaa8512c]]]
Former-commit-id: f704781f4f [formerly 8c3625cfec ]
Former-commit-id: f704781f4f
Former-commit-id: 70cb8d81b0
|
2014-09-30 13:45:54 -04:00 |
|
Steve Harris
|
9be38903d8
|
Merge branch 'master_14.3.1' (14.3.1-22m) into omaha_14.4.1
Conflicts:
cave/com.raytheon.viz.volumebrowser/localization/menus/xml/fieldsMenus.xml
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/ohdlib/GagePP.java
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/T.xml
edexOsgi/com.raytheon.uf.tools.cli/impl/src/textdb/TextDB.py
Former-commit-id: 3b6a8a1447 [formerly 3598e9b5b6 [formerly 90e08b96e1 ] [formerly 3b6a8a1447 [formerly c8b5d89c2e202e8bb4ad59d9ced8882ec8c2a6c1]]]
Former-commit-id: 3598e9b5b6 [formerly 90e08b96e1 ]
Former-commit-id: 3598e9b5b6
Former-commit-id: 6900bb61c1
|
2014-09-29 12:58:56 -05:00 |
|
Brian.Dyke
|
c9d59dd05e
|
Merge branch 'master_14.2.3' into master_14.2.4
Former-commit-id: 46af1d0857 [formerly fce029653d [formerly 0a497fc015 ] [formerly 46af1d0857 [formerly 01cb1dc674ae1249d97dc10be5c068de0ed2a222]]]
Former-commit-id: fce029653d [formerly 0a497fc015 ]
Former-commit-id: fce029653d
Former-commit-id: fac7a6aaa1
|
2014-09-29 11:20:57 -04:00 |
|
Shawn.Hooper
|
2c7be9438d
|
ASM #600 - WarnGen: template optional watch inclusion
Change-Id: I282e94236389a907326926a68e2ed810a00b9688
Former-commit-id: 831af82c23 [formerly 56cd6483ef [formerly da77322fd0 ] [formerly 831af82c23 [formerly 04bd69f437b897d63ac78d6cbd7c60451366cc6d]]]
Former-commit-id: 56cd6483ef [formerly da77322fd0 ]
Former-commit-id: 56cd6483ef
Former-commit-id: 645452e694
|
2014-09-25 16:25:43 -04:00 |
|
Brian.Dyke
|
5dd9692bc6
|
Merge branch 'master_14.2.4' into master_14.3.1 CM-MERGE:14.2.4-10-11-12 into 14.3.1
Conflicts:
cave/com.raytheon.viz.grid/localization/volumebrowser/FieldDisplayTypes.xml
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
ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/GRID/HRRR/HRRR.xml
ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/ResourceFilters.xml
Former-commit-id: 87fa32d2d4 [formerly b49b13f77e [formerly 4b418918d4 ] [formerly 87fa32d2d4 [formerly e04ad21771ce410beb25e15fe300a34796a1a062]]]
Former-commit-id: b49b13f77e [formerly 4b418918d4 ]
Former-commit-id: b49b13f77e
Former-commit-id: 6dafb062e9
|
2014-09-24 11:05:37 -04:00 |
|
David Friedman
|
507851b8cf
|
ASM #15658 - WarnGen: inclusion of watch information in marine products
Change-Id: I545d1b07444c9ca00ea2e95c4ccaed79946bbead
Former-commit-id: 2ee1ebe72d [formerly 0ed1ce5726 [formerly a6acf71a0a ] [formerly 2ee1ebe72d [formerly e0f6cc70bf5258d66bfa8a4ddb1daf871b6c92c5]]]
Former-commit-id: 0ed1ce5726 [formerly a6acf71a0a ]
Former-commit-id: 0ed1ce5726
Former-commit-id: c4d6fe5af5
|
2014-09-23 18:39:22 +00:00 |
|
Brian.Dyke
|
8c14ee378b
|
Merge branch 'ops_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Former-commit-id: 1018c65552 [formerly b94198ffb3 [formerly c0dc990974 ] [formerly 1018c65552 [formerly 41a854146a3f4ab156b63e2ea24e60681fc586f2]]]
Former-commit-id: b94198ffb3 [formerly c0dc990974 ]
Former-commit-id: b94198ffb3
Former-commit-id: 2b25aa4b01
|
2014-09-19 16:59:12 -04:00 |
|
Baoyu Yin
|
dd8033cb5e
|
VLab Issue #4796 - AWIPS2_DR_17420 WarnGen IBW templates and 14.2.1 template corrections; fixes #4796
Change-Id: Ieb4a6d68b48351deacbddda65f1ff53485c3402d
Former-commit-id: 28b7e8d6e2 [formerly 957c12653b [formerly 8568cd8419 ] [formerly 28b7e8d6e2 [formerly f077d3cd4084faf8ad7c8865e84df53e59a5db72]]]
Former-commit-id: 957c12653b [formerly 8568cd8419 ]
Former-commit-id: 957c12653b
Former-commit-id: 0ed507f8d1
|
2014-09-19 15:02:23 -04:00 |
|
Brian.Dyke
|
0f69ae2089
|
Merge branch 'master_14.2.3' into master_14.2.4
Former-commit-id: e601d3fa51 [formerly 279f67ff54 [formerly 7f49052445 ] [formerly e601d3fa51 [formerly 88e26cd8b378ffc81db87aee226ceca47ae58aa7]]]
Former-commit-id: 279f67ff54 [formerly 7f49052445 ]
Former-commit-id: 279f67ff54
Former-commit-id: 1704e76ac1
|
2014-09-19 13:08:06 -04:00 |
|
Steve Harris
|
cf2e045de3
|
Merge branch 'omaha_14.3.1' into omaha_14.4.1
Conflicts:
cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/ArchiveRetentionDlg.java
cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/Cities.xml
cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/FAA/Airports.xml
cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/FAA/Fix.xml
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/SubClassLocator.java
cave/com.raytheon.uf.viz.monitor.fog/src/com/raytheon/uf/viz/monitor/fog/ui/dialogs/FogMonitoringAreaConfigDlg.java
cave/com.raytheon.uf.viz.monitor.safeseas/src/com/raytheon/uf/viz/monitor/safeseas/ui/dialogs/SSMonitoringAreaConfigDlg.java
cave/com.raytheon.uf.viz.monitor.snow/src/com/raytheon/uf/viz/monitor/snow/ui/dialogs/SnowMonitoringAreaConfigDlg.java
cave/com.raytheon.uf.viz.ui.menus/src/com/raytheon/uf/viz/ui/menus/widgets/tearoff/MenuItemComposite.java
cave/com.raytheon.uf.viz.ui.menus/src/com/raytheon/uf/viz/ui/menus/widgets/tearoff/TearOffMenuDialog.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/ext/imaging/GLDataMappingFactory.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/DataManager.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/ParmManager.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/textformatter/CombinationsFileUtil.java
cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/rsc/graphic/RadarGraphicsPage.java
cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/rsc/mosaic/RadarMosaicResource.java
cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/ui/xy/RadarGSMResource.java
cave/com.raytheon.viz.ui.personalities.awips/src/com/raytheon/viz/ui/personalities/awips/AbstractCAVEComponent.java
cave/com.raytheon.viz.ui/META-INF/MANIFEST.MF
cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/colormap/ColorMapTree.java
cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/dialogs/ColormapComp.java
cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/dialogs/ImagingDialog.java
cave/com.raytheon.viz.volumebrowser/localization/menus/xml/fieldsMenus.xml
cave/com.raytheon.viz.volumebrowser/localization/menus/xml/planesMenusPlanView.xml
cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
edexOsgi/com.raytheon.uf.common.datadelivery.registry/src/com/raytheon/uf/common/datadelivery/registry/web/IRegistryFederationManager.java
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TP.xml
edexOsgi/com.raytheon.uf.common.localization/src/com/raytheon/uf/common/localization/IPathManager.java
edexOsgi/com.raytheon.uf.common.localization/src/com/raytheon/uf/common/localization/PathManager.java
edexOsgi/com.raytheon.uf.edex.datadelivery.registry/src/com/raytheon/uf/edex/datadelivery/registry/dao/ReplicationEventDao.java
edexOsgi/com.raytheon.uf.edex.datadelivery.registry/src/com/raytheon/uf/edex/datadelivery/registry/federation/RegistryFederationManager.java
edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/src/com/raytheon/uf/edex/datadelivery/retrieval/util/WfsConnectionUtil.java
Former-commit-id: 4c56844e29 [formerly da530db540 [formerly 091555cf10 ] [formerly 4c56844e29 [formerly 69c52fb4a22997d0a0f9c620bd20f00b8c5fd4ce]]]
Former-commit-id: da530db540 [formerly 091555cf10 ]
Former-commit-id: da530db540
Former-commit-id: e3a7796362
|
2014-09-19 10:28:57 -05:00 |
|
Qinglu.Lin
|
378e8599a5
|
ASM #15551 - WarnGen: only WCN should be used while including TOR/SVR watches in WarnGen products
Change-Id: Ia4350f8c17166c8f972779f8bde1763ec4cd3bd5
Former-commit-id: 5e93999662 [formerly 4bce4db9ef [formerly 0e2be5afd8 ] [formerly 5e93999662 [formerly e7ab29fbfebb1943e0b0702547dbd353367e797d]]]
Former-commit-id: 4bce4db9ef [formerly 0e2be5afd8 ]
Former-commit-id: 4bce4db9ef
Former-commit-id: 7e6097f690
|
2014-09-17 10:26:25 -04:00 |
|
Brian.Dyke
|
e6457a002e
|
Merge branch 'master_14.2.4' into master_14.3.1 CM-MERGE:14.2.4-6-7-8 into 14.3.1
Conflicts:
cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/ArchiveRetentionDlg.java
cave/com.raytheon.uf.viz.ui.menus/src/com/raytheon/uf/viz/ui/menus/widgets/tearoff/MenuItemComposite.java
Former-commit-id: 01dfe503f5 [formerly fe85eb9f70 [formerly 3d9a3de6e4 ] [formerly 01dfe503f5 [formerly a3365943e7b7972a5c86f8cb1ad39667ab9e0695]]]
Former-commit-id: fe85eb9f70 [formerly 3d9a3de6e4 ]
Former-commit-id: fe85eb9f70
Former-commit-id: d8271549ff
|
2014-09-09 11:44:30 -04:00 |
|
Nate Jensen
|
9dd5f0fe7a
|
Omaha #3356 more removal of unnecessary register buddies
Change-Id: Ic91c2d5ab93bb220a69be23c54640edae26302a3
Former-commit-id: b46f23d01b [formerly 606642b99f [formerly 26e2ff44a4 ] [formerly b46f23d01b [formerly 39bfb8fd0548c74ed9a4e95b914e90ab2f6ad526]]]
Former-commit-id: 606642b99f [formerly 26e2ff44a4 ]
Former-commit-id: 606642b99f
Former-commit-id: 390f427158
|
2014-09-08 17:18:22 -05:00 |
|
Brian.Dyke
|
306438d296
|
Merge branch 'master_14.2.3' into master_14.2.4 CM-MERGE:14.2.3-1 (14.2.2-30,-31) into 14.2.4
Former-commit-id: 14e64881a1 [formerly 9e156775e5 [formerly fd8ad016ef ] [formerly 14e64881a1 [formerly bc9f03426304e3bb194fbf7f356d8dd3816cd836]]]
Former-commit-id: 9e156775e5 [formerly fd8ad016ef ]
Former-commit-id: 9e156775e5
Former-commit-id: bdba05f6b1
|
2014-09-02 16:32:54 -04:00 |
|
Qinglu.Lin
|
d7c4258d6d
|
ASM #15551 - WarnGen: only WCN should be used while including TOR/SVR watches in WarnGen products
Change-Id: I286bc4cc809fcc9257f72051f1bb74f8acc24c05
Former-commit-id: ae13ea419e [formerly b32ea40289 [formerly 2374673f8d ] [formerly ae13ea419e [formerly 59890eef397f3282ef26f259ca85ffea3db7b710]]]
Former-commit-id: b32ea40289 [formerly 2374673f8d ]
Former-commit-id: b32ea40289
Former-commit-id: dda32f85e9
|
2014-09-02 14:37:19 -04:00 |
|
Steve Harris
|
e31665a400
|
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: 5d58625abc [formerly bddf9c0f27 [formerly 793064063b ] [formerly 5d58625abc [formerly 8793dca41f756ba812206b48391caea6e593a657]]]
Former-commit-id: bddf9c0f27 [formerly 793064063b ]
Former-commit-id: bddf9c0f27
Former-commit-id: 3619a11a8a
|
2014-08-29 10:17:52 -05:00 |
|
David Friedman
|
3228a1557b
|
ASM #15658 - WarnGen: inclusion of watch information in marine products
Change-Id: I9f99e6136027f1a6419800f87e5a5709fe5be6b9
Former-commit-id: ea9230b37c [formerly ea1e9feb1d [formerly a2dfe8e8f6 ] [formerly ea9230b37c [formerly 6bfa1d6662b00925814be7126592bbe340651649]]]
Former-commit-id: ea1e9feb1d [formerly a2dfe8e8f6 ]
Former-commit-id: ea1e9feb1d
Former-commit-id: bb421fd3e4
|
2014-08-28 15:43:32 +00:00 |
|
Brian.Dyke
|
f13953059a
|
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: aa83bf804f [formerly a08db8d73d [formerly e654318431 ] [formerly aa83bf804f [formerly 7334d3991903dfe8a62728de33c21e81534fdbb6]]]
Former-commit-id: a08db8d73d [formerly e654318431 ]
Former-commit-id: a08db8d73d
Former-commit-id: 0a5ddf7457
|
2014-08-27 11:19:19 -04:00 |
|
Roger Ferrel
|
94dc629314
|
Omaha #3353 Changes to remove Geospatial data set generation off the UI thread.
Change-Id: I5213f627a97a27bdb92c4857eac4071c5450b790
Former-commit-id: d0779ef059 [formerly a610e0a34b [formerly ca3a0595d2 ] [formerly d0779ef059 [formerly f16a8ff2c51c392957e13ef63423abe9f99b3301]]]
Former-commit-id: a610e0a34b [formerly ca3a0595d2 ]
Former-commit-id: a610e0a34b
Former-commit-id: 20362833cf
|
2014-08-25 07:59:26 -05:00 |
|
Brian.Dyke
|
e6e748f80c
|
Merge branch 'master_14.2.2' into master_14.2.4 CM-MERGE:14.2.2-25-29 into 14.2.4
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscMosaic.py
Former-commit-id: dd9d7133d9 [formerly 2ddc920a4a [formerly 325887e605 ] [formerly dd9d7133d9 [formerly 65e2373d13c7d5b33d579b87d98a8265252ea391]]]
Former-commit-id: 2ddc920a4a [formerly 325887e605 ]
Former-commit-id: 2ddc920a4a
Former-commit-id: 6402cb7d89
|
2014-08-22 14:16:22 -04:00 |
|
Fay.Liang
|
5e6874ceb2
|
ASM #600 - the fixes for DR 17380
Change-Id: Iacd1c3dde4f43086dc1ba60ae47e1b0066a0187a
Conflicts:
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/VM_global_library.vm
Former-commit-id: 77a6ab632f [formerly c2dd7c183f [formerly f5901b8ede ] [formerly 77a6ab632f [formerly 89c29c1228830d301b7046ebb7d4281666c2b768]]]
Former-commit-id: c2dd7c183f [formerly f5901b8ede ]
Former-commit-id: c2dd7c183f
Former-commit-id: 802de9c08f
|
2014-08-15 11:03:15 -05:00 |
|
Qinglu.Lin
|
a51248941c
|
ASM #515 - WarnGen product QC incorrectly reports UGC/area mismatch
Change-Id: I5ef8e83c826d3fb1d5ef72d5866f882d9c97e1f5
Former-commit-id: ff551ea143 [formerly 8693097b0b [formerly 9a9e32dc53 ] [formerly ff551ea143 [formerly bafc616881af28b5397c45c5155a3c812a9c048d]]]
Former-commit-id: 8693097b0b [formerly 9a9e32dc53 ]
Former-commit-id: 8693097b0b
Former-commit-id: dbb3a9f8b6
|
2014-08-15 11:01:30 -05:00 |
|
Nate Jensen
|
48e85580e2
|
Omaha #3356 cleanup of unnecessary register buddies and buddy policies
Change-Id: I1d6c279478f38876a8df67d2f9dd186a2efdeca0
Former-commit-id: 9b72a1399d [formerly 253198b5bc [formerly b3083a663e ] [formerly 9b72a1399d [formerly 48536dd79d933508ac54b3b6e9bbd166fd218330]]]
Former-commit-id: 253198b5bc [formerly b3083a663e ]
Former-commit-id: 253198b5bc
Former-commit-id: d61c65787b
|
2014-08-14 10:22:37 -05:00 |
|
Jonathan Sanchez
|
a2ce9254c5
|
Issue #3493 Grouped common VTECs together
Change-Id: Ia72150a4782e95ea075f42979c489f7ef5d69fb9
Former-commit-id: 31c3135496 [formerly 46c3625f0c [formerly 0302efdc77 ] [formerly 31c3135496 [formerly 47de8da4cadd899ae9aa0ffe6c89a109491966bc]]]
Former-commit-id: 46c3625f0c [formerly 0302efdc77 ]
Former-commit-id: 46c3625f0c
Former-commit-id: e9b5d0afe0
|
2014-08-06 17:40:44 -05:00 |
|
Jonathan Sanchez
|
642cfc1712
|
Issue #3493 Allowed multiple watches to be displayed.
Change-Id: I8c69a07a5162868bc2a179960c7beb07d350cde9
Former-commit-id: 27d0e8eb52 [formerly a07674c864 [formerly 2946dc1904 ] [formerly 27d0e8eb52 [formerly e06ba2d33f9969ee3dc87491ac6bfa3e9ccb40b8]]]
Former-commit-id: a07674c864 [formerly 2946dc1904 ]
Former-commit-id: a07674c864
Former-commit-id: 290cd3eb49
|
2014-08-05 12:23:16 -05:00 |
|
Steve Harris
|
50461a5ba1
|
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: bf9a0fa5de [formerly a92dc418c6 [formerly 0fb743ec44 ] [formerly bf9a0fa5de [formerly f7d474895366eb23ae5eef242a4568f911435aa3]]]
Former-commit-id: a92dc418c6 [formerly 0fb743ec44 ]
Former-commit-id: a92dc418c6
Former-commit-id: d606269c5b
|
2014-08-04 22:20:29 -05:00 |
|
Brian.Dyke
|
2053a5f543
|
Merge branch 'master_14.2.2' into master_14.3.1 CM-MERGE:14.2.2-17,-18,-19,-20,-21,-22,-23,-24 into 14.3.1
Conflicts:
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/RadarBiasTableDialog.java
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
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTable.java
Former-commit-id: 270d2b0ddb [formerly 301f3094be [formerly 9abb02ea8a ] [formerly 270d2b0ddb [formerly b209604e1f0d6e790980d0bc8f1760e38f448076]]]
Former-commit-id: 301f3094be [formerly 9abb02ea8a ]
Former-commit-id: 301f3094be
Former-commit-id: 590e37a8f2
|
2014-08-04 13:10:13 -04:00 |
|
Jonathan Sanchez
|
5d8c79b3a4
|
Issue #3419 Refactored watches to use the county table.
Change-Id: Ide7e07813203213511640d5ee515e73b278089c1
Former-commit-id: b991838494 [formerly 997485dd22 [formerly 86a8ca4a30 ] [formerly b991838494 [formerly 135d7ffa84af58d7b3c9575e654fa1298b76b2e2]]]
Former-commit-id: 997485dd22 [formerly 86a8ca4a30 ]
Former-commit-id: 997485dd22
Former-commit-id: c479178882
|
2014-07-22 15:32:12 -05:00 |
|
David Friedman
|
59c9cbaaa6
|
ASM #15052 - WarnGen: service backup should use config.xml from failed site
Change-Id: Icff8ca2a124da595be6b83ac9f9999831daee0b1
Former-commit-id: db8977e281 [formerly 8784501bba [formerly a45fe1dad0 ] [formerly db8977e281 [formerly f9c0dc09ee7bc692c6f70b4a5ad67bb2c2ed5a20]]]
Former-commit-id: 8784501bba [formerly a45fe1dad0 ]
Former-commit-id: 8784501bba
Former-commit-id: b82fb691e0
|
2014-07-03 13:58:24 +00:00 |
|
Richard Peter
|
94dfb1d2b8
|
Merge branch 'omaha_14.3.1' (14.3.1-12) into omaha_14.4.1
Conflicts:
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/datastructure/LoopProperties.java
cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java
edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-spring.xml
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/AbstractWatchNotifierSrv.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/SPCWatchSrv.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/TPCWatchSrv.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/WCLWatchSrv.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/WclInfo.java
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
edexOsgi/com.raytheon.edex.plugin.warning/WarningDecoder.py
Change-Id: I6208fb3e1589dd3f2356f19ea9bbdfaa79ae6d61
Former-commit-id: 8ecc27f714 [formerly 6636b301e5 [formerly 93bbd98cbc ] [formerly 8ecc27f714 [formerly fc71e1cb26481e91c7d0c16ed0bd06ec5c8c22b9]]]
Former-commit-id: 6636b301e5 [formerly 93bbd98cbc ]
Former-commit-id: 6636b301e5
Former-commit-id: ed38bf2372
|
2014-07-01 15:34:39 -05:00 |
|