Fay.Liang
|
9f124dc2e5
|
Merge branch 'ncep_14.4.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.4.1
Former-commit-id: 8d4bab98d5 [formerly 30859f6ee6] [formerly 8d4bab98d5 [formerly 30859f6ee6] [formerly 1208dbde06 [formerly bc482f433223eee5f9a2fa209e1e33a39d3b3aa8]]]
Former-commit-id: 1208dbde06
Former-commit-id: c8b9377e84 [formerly 10c325518c]
Former-commit-id: 9f2f5af448
|
2015-02-11 15:36:05 -05:00 |
|
Ana Rivera
|
7cea67cfc6
|
Merge branch 'master_14.4.1' into gsd_14.4.1
Change-Id: I5b7c7e17031ec4d081c03e3c4378faf6122849d5
Former-commit-id: ccd0a40621 [formerly ea92049aac] [formerly ccd0a40621 [formerly ea92049aac] [formerly 070f0136ec [formerly d5996a81aad0809aaddbb8df99a985c86c66aaf8]]]
Former-commit-id: 070f0136ec
Former-commit-id: e358377ca7 [formerly 1bbb9bad78]
Former-commit-id: 0715e923df
|
2015-01-30 19:29:29 +00:00 |
|
Nate Jensen
|
1915c27938
|
ensure PGEN appears in thinclient D2D Tools menu
Change-Id: Ib02d9f5f3c63edd963129e742da9c3b3e09e89fa
Former-commit-id: 7a10bd5620 [formerly bfcb36eeac] [formerly 7a10bd5620 [formerly bfcb36eeac] [formerly ac9d787a26 [formerly 173c250aa3fd9d3e5b35283b10eb5f37a4732a3a]]]
Former-commit-id: ac9d787a26
Former-commit-id: 74e207f306 [formerly 0b9a5965a0]
Former-commit-id: 86868080c3
|
2015-01-20 11:52:37 -06:00 |
|
Paula McCaslin
|
01dc07b991
|
VLab Issue #5061. LAPS Tools; fixes #5061
Change-Id: I447e7e94b931ad2efad687efa90e16cebb2e7bf9
Former-commit-id: 1375bc38f3 [formerly e2e8faf273] [formerly 1375bc38f3 [formerly e2e8faf273] [formerly a5c805cf4d [formerly e05f01c705953d0c9528cfea6604f88455a5f5ac]]]
Former-commit-id: a5c805cf4d
Former-commit-id: 0b569fcba8 [formerly 1038498ced]
Former-commit-id: 1d9995c826
|
2014-11-12 13:58:24 -07:00 |
|
Roger Ferrel
|
73b08f33c6
|
Omaha #3401 Enter events to upper case verification added.
Change-Id: I32e51568049dcd442b98b929af3041bc741ea6e3
Former-commit-id: 1d6bec894e [formerly 334d738c79] [formerly 1d6bec894e [formerly 334d738c79] [formerly 8cde49f98e [formerly 414f6e16547e0535ae36c5c4cc86f43db54b689c]]]
Former-commit-id: 8cde49f98e
Former-commit-id: 2e30187e47 [formerly ae35ba438a]
Former-commit-id: a5f2fcf963
|
2014-11-12 10:50:43 -06:00 |
|
Steve Harris
|
116b83101e
|
Merge tag 'OB_14.3.1-27m' into omaha_14.4.1
Conflicts:
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/GH.xml
Former-commit-id: e9c9a17f96 [formerly dc557b2d0c] [formerly e9c9a17f96 [formerly dc557b2d0c] [formerly bfade7674d [formerly ea787b645974850607658e5a7dfc4a072d831a3b]]]
Former-commit-id: bfade7674d
Former-commit-id: 879b0608ed [formerly 9e7ce04543]
Former-commit-id: 040e641ec9
|
2014-10-22 11:45:39 -05:00 |
|
David Friedman
|
65eaac9743
|
ASM #16844 - WarnGen can become disabled when moving storm track
Change-Id: Ic54b4f10eea64db40ce7f9c5a787fe344a8d916a
Former-commit-id: 455f1ad7aa [formerly 955809450d] [formerly 455f1ad7aa [formerly 955809450d] [formerly 68f985d668 [formerly f4000b425b8da6bb16fe124c0e5eaaab78a6b3b2]]]
Former-commit-id: 68f985d668
Former-commit-id: 3f1ed65033 [formerly 7176b476a2]
Former-commit-id: f325e4ad55
|
2014-10-10 19:33:21 +00:00 |
|
Steve Harris
|
e05d31ae36
|
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: f4b771ea72 [formerly da463c484e] [formerly f4b771ea72 [formerly da463c484e] [formerly 2616fe04b6 [formerly 8dc5abec482b4c1c3f3469c0ffc7e06fa697c6cd]]]
Former-commit-id: 2616fe04b6
Former-commit-id: 306826aed9 [formerly 523cedbb56]
Former-commit-id: 57f5294f08
|
2014-10-03 10:18:34 -05:00 |
|
dmsys
|
71d6e48473
|
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: f704781f4f [formerly 8c3625cfec] [formerly f704781f4f [formerly 8c3625cfec] [formerly 9f4560c480 [formerly 0bf7ecb27d41f81f1d6727674fc1475eeaa8512c]]]
Former-commit-id: 9f4560c480
Former-commit-id: 07f84c6b26 [formerly b884e5e32d]
Former-commit-id: e00ea2d8cd
|
2014-09-30 13:45:54 -04:00 |
|
Steve Harris
|
4c4380580f
|
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: 3598e9b5b6 [formerly 90e08b96e1] [formerly 3598e9b5b6 [formerly 90e08b96e1] [formerly 3b6a8a1447 [formerly c8b5d89c2e202e8bb4ad59d9ced8882ec8c2a6c1]]]
Former-commit-id: 3b6a8a1447
Former-commit-id: 842abaad49 [formerly 6330a62e85]
Former-commit-id: 30f0d27dfb
|
2014-09-29 12:58:56 -05:00 |
|
David Friedman
|
0a94f1ccfb
|
ASM #16773 - WarnGen can become disabled when a followup is selected
Change-Id: Ibe0e3b18914840515f8bc9d844a2ffb0a6abddf0
Former-commit-id: 973d0b9a55 [formerly b3025aacb0] [formerly 973d0b9a55 [formerly b3025aacb0] [formerly 8ab4649312 [formerly 5048af915b004067ec8a6e788a0e9ad3e006c9d8]]]
Former-commit-id: 8ab4649312
Former-commit-id: a10060f45d [formerly c19d9ee755]
Former-commit-id: f6a6032d61
|
2014-09-25 21:07:16 +00:00 |
|
Matthew Howard
|
5cace9fcbf
|
Merge "ASM #657 - Errors loading Distance Speed tool and Time of Arrival Tool" into asm_14.3.1
Former-commit-id: c0a43b73ce [formerly 6e0dbf4fb5] [formerly c0a43b73ce [formerly 6e0dbf4fb5] [formerly 7121e2e6e1 [formerly 57ba27ba3d21e8f96affe5056d20d6e0b1540dc7]]]
Former-commit-id: 7121e2e6e1
Former-commit-id: 5daf615bb0 [formerly 03f33b687b]
Former-commit-id: 1f79bceb26
|
2014-09-11 08:56:49 -05:00 |
|
Qinglu.Lin
|
7e856c5995
|
ASM #657 - Errors loading Distance Speed tool and Time of Arrival Tool
Change-Id: I68c2b4b336a5145de20f70cb0967c9dc484f3b09
Former-commit-id: 517f0c9d0c [formerly 51d48a6fdc] [formerly 517f0c9d0c [formerly 51d48a6fdc] [formerly 3f666817e0 [formerly 7a75687b76584b4578fad4c31c8557d78e507f46]]]
Former-commit-id: 3f666817e0
Former-commit-id: bb4682b291 [formerly 61d967b1cd]
Former-commit-id: 975fe54092
|
2014-09-09 08:07:46 -04:00 |
|
Nate Jensen
|
064d75be69
|
Merge "Omaha #3467 Error occurs when loading/editing the Range Rings tool multiple times" into omaha_14.4.1
Former-commit-id: 2f0554097a [formerly 51d910af00] [formerly 2f0554097a [formerly 51d910af00] [formerly cf41d7e3a3 [formerly 03fc1d04092135970a6c7089bcbbf11d5c584dd1]]]
Former-commit-id: cf41d7e3a3
Former-commit-id: 3ae925ce87 [formerly 96b3c08bd1]
Former-commit-id: 165b5fd49b
|
2014-09-04 13:49:36 -05:00 |
|
Nate Jensen
|
3188cd0af2
|
Omaha #3356 remove more unnecessary register buddies and policies
Change-Id: I3e39f9b8274b2b9104f3b3d037601c1553c43e13
Former-commit-id: 2c74d90cc4 [formerly c0dab26b92] [formerly 2c74d90cc4 [formerly c0dab26b92] [formerly 9d462e1dd9 [formerly b535d54c52c3e38bb9fa083ba911ad49c090f214]]]
Former-commit-id: 9d462e1dd9
Former-commit-id: d5e948b7e2 [formerly 05a73b1e4b]
Former-commit-id: d87cfb8131
|
2014-09-03 11:34:10 -05:00 |
|
Mark Peters
|
72184dbcaf
|
Omaha #3467 Error occurs when loading/editing the Range Rings tool multiple times
Change-Id: I68642e05ce970545a516d4fab1492a860c530032
Former-commit-id: 447986eed3 [formerly 06b98bb48a] [formerly 447986eed3 [formerly 06b98bb48a] [formerly ee36d09cb0 [formerly 725354074d54112c8658dc34a8ac564739acbebb]]]
Former-commit-id: ee36d09cb0
Former-commit-id: 8ace5b852c [formerly a3feb0de78]
Former-commit-id: e7e58b4e78
|
2014-09-02 16:31:44 -05:00 |
|
Steve Harris
|
ecf26b3ac5
|
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: bddf9c0f27 [formerly 793064063b] [formerly bddf9c0f27 [formerly 793064063b] [formerly 5d58625abc [formerly 8793dca41f756ba812206b48391caea6e593a657]]]
Former-commit-id: 5d58625abc
Former-commit-id: 66b485c000 [formerly d984dd538f]
Former-commit-id: e681e0a457
|
2014-08-29 10:17:52 -05:00 |
|
Brian.Dyke
|
7e4ab705cc
|
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: a08db8d73d [formerly e654318431] [formerly a08db8d73d [formerly e654318431] [formerly aa83bf804f [formerly 7334d3991903dfe8a62728de33c21e81534fdbb6]]]
Former-commit-id: aa83bf804f
Former-commit-id: f90649d7e7 [formerly f7f16ff9eb]
Former-commit-id: c0dc594eda
|
2014-08-27 11:19:19 -04:00 |
|
Qinglu.Lin
|
77e6647de8
|
ASM #15700 - Warngen issues an error and toggles off on Radar update
Change-Id: I51085cd1bb9c7286719f1bff4e04abe5a7a2363b
Former-commit-id: 3cc94603a2 [formerly fb92838427] [formerly 3cc94603a2 [formerly fb92838427] [formerly 2157a4aa3b [formerly b8a4741b2519e8c02a1b80ba8544be9b1c26d35c]]]
Former-commit-id: 2157a4aa3b
Former-commit-id: 787f157850 [formerly 3037a17366]
Former-commit-id: 040e1071b2
|
2014-08-21 10:43:22 -04:00 |
|
Mark Peters
|
d63684feaa
|
Omaha #3523 Replace Raytheon usage of IGraphicsTarget.TextStyle.NORMAL and directly assigning the text style
Change-Id: Idcc31d11251df8de949bd1bd9bf8c402a5d47f4f
Former-commit-id: f6799659ea [formerly 308ada356b] [formerly f6799659ea [formerly 308ada356b] [formerly 4011a4392c [formerly e409b578fcb15caadf28da57d2cb1860e1ea246c]]]
Former-commit-id: 4011a4392c
Former-commit-id: c36257683c [formerly 03229efe86]
Former-commit-id: b7209bee6e
|
2014-08-14 15:43:17 -05:00 |
|
Nate Jensen
|
7336692b85
|
Omaha #3356 cleanup of unnecessary register buddies and buddy policies
Change-Id: I1d6c279478f38876a8df67d2f9dd186a2efdeca0
Former-commit-id: 253198b5bc [formerly b3083a663e] [formerly 253198b5bc [formerly b3083a663e] [formerly 9b72a1399d [formerly 48536dd79d933508ac54b3b6e9bbd166fd218330]]]
Former-commit-id: 9b72a1399d
Former-commit-id: 58a4cb95c1 [formerly d67083655a]
Former-commit-id: 951feab33d
|
2014-08-14 10:22:37 -05:00 |
|
Nate Jensen
|
99c2786f94
|
Merge "Omaha #3472 Clicking & dragging the Az/Ran Overlay tool off the map causes the map to jump" into omaha_14.4.1
Former-commit-id: de91441935 [formerly fed30c111e] [formerly de91441935 [formerly fed30c111e] [formerly 310f314b81 [formerly 76ca557a25e6b09b3412cfe7a2d154b3a522cf74]]]
Former-commit-id: 310f314b81
Former-commit-id: 94081ece24 [formerly b6163075ef]
Former-commit-id: 424d770910
|
2014-08-11 13:25:17 -05:00 |
|
Mark Peters
|
6c55a465eb
|
Omaha #3472 Clicking & dragging the Az/Ran Overlay tool off the map causes the map to jump
Change-Id: I5dc3fc528a8e62dd32d87524f99adb1a8c9e610e
Former-commit-id: 5121ddaa12 [formerly a73ca1f8c1] [formerly 5121ddaa12 [formerly a73ca1f8c1] [formerly 490f7ea209 [formerly 1b0ac4736f7d63c5e49a48a28473ad6a38e6b6ea]]]
Former-commit-id: 490f7ea209
Former-commit-id: bbef55b2ce [formerly ff4ac7cbab]
Former-commit-id: 164928997d
|
2014-08-11 10:08:38 -05:00 |
|
Brian Clements
|
b83ec9df6c
|
Omaha #3503 common.serialization changes
moved adapters to new plugins
Change-Id: I34c66b004ce1c5aa61c093fe2eeb2fe8d3b138b6
Former-commit-id: 9c09de5779 [formerly 90d492c1dc] [formerly 9c09de5779 [formerly 90d492c1dc] [formerly 415f2dff64 [formerly adba61c3714678ce57f0de5bfd4f9aa860098bd9]]]
Former-commit-id: 415f2dff64
Former-commit-id: d6aae6eaeb [formerly 0e415fd863]
Former-commit-id: 54742cff70
|
2014-08-08 12:50:06 -05:00 |
|
Nate Jensen
|
c7512d7308
|
Merge "Omaha #3356 remove unnecessary usage of ext and global buddy policies" into omaha_14.4.1
Former-commit-id: c30297b1b0 [formerly b3af25916c] [formerly c30297b1b0 [formerly b3af25916c] [formerly 61654ad2d1 [formerly 01773a5dfc82902e28fa730e174177b2ce08934e]]]
Former-commit-id: 61654ad2d1
Former-commit-id: 251a3f7686 [formerly 94994852f0]
Former-commit-id: f05fd71463
|
2014-08-04 14:49:57 -05:00 |
|
Nate Jensen
|
cbf0360401
|
Omaha #3356 remove unnecessary usage of ext and global buddy policies
Change-Id: I0007eb5bb21bb3a3d7d0757bb53856054b4f380d
Former-commit-id: 41eb72aefd [formerly 06a64080e7] [formerly 41eb72aefd [formerly 06a64080e7] [formerly 857f1b70cc [formerly 41306351920aee44bdf2d9648616ddc8a4511632]]]
Former-commit-id: 857f1b70cc
Former-commit-id: 94399b57de [formerly a920937cb5]
Former-commit-id: f51d409d97
|
2014-08-04 12:30:55 -05:00 |
|
Mark Peters
|
5fec6a3fa8
|
Omaha #3430 Error returned when MB3 clicking off the map with a snapping tool in edit mode
Change-Id: Iba81f6dc58b1223252711296b66a88a8afb02cdd
Former-commit-id: 7aee990658 [formerly de149c4a4f] [formerly 7aee990658 [formerly de149c4a4f] [formerly cf2a2d47b9 [formerly d81e1ac43cbf10b0cd6f475e41fc242ab3c6a3c7]]]
Former-commit-id: cf2a2d47b9
Former-commit-id: dce12dda03 [formerly 29bd1467dc]
Former-commit-id: 5d22073714
|
2014-08-04 10:24:08 -05:00 |
|
Mark Peters
|
fcdb86686d
|
Omaha #3465 Replace plugin calls to deprecated IGraphicsTarget.drawStrings()
Change-Id: Ib72cf8806852aff718af56c5f2c2cf4e07f9f548
Former-commit-id: b40e589488 [formerly ad794f8fba] [formerly b40e589488 [formerly ad794f8fba] [formerly 47aec2aae3 [formerly 29d170af7a0c36e614a84923c2fb5054db73c390]]]
Former-commit-id: 47aec2aae3
Former-commit-id: 776d62c5f9 [formerly 6103909706]
Former-commit-id: 79b4f922ec
|
2014-07-30 16:03:57 -05:00 |
|
Mark Peters
|
011ef40360
|
Omaha #3429 Replace Raytheon plugin calls to deprecated IGraphicsTarget.drawLine()
Change-Id: I9de68a9a047a2d6c3744b29de292efb7cfb44bbf
Former-commit-id: 11abefd4de [formerly 437e127ebc] [formerly 11abefd4de [formerly 437e127ebc] [formerly bac12d844b [formerly a222b29ff24bf81d1c8aefd54fa33f52461c9c25]]]
Former-commit-id: bac12d844b
Former-commit-id: 95886b5ded [formerly 6edd39cc9e]
Former-commit-id: baecaaaca0
|
2014-07-29 11:20:53 -05:00 |
|
Mark Peters
|
3393501814
|
Omaha #3430 Remove errors returned when MB3 clicking off the map with snapping tool in editable mode
Change-Id: Id4fbe8480e1d796eed448a791982570bb85f657c
Former-commit-id: 23538197f6 [formerly 33e311c361] [formerly 23538197f6 [formerly 33e311c361] [formerly cc690ec2c3 [formerly b27dc2ad7076e73461d880e4daa987f49496f30d]]]
Former-commit-id: cc690ec2c3
Former-commit-id: 0356569e9f [formerly c4eb912c7d]
Former-commit-id: 7685d6ac9a
|
2014-07-28 14:44:28 -05:00 |
|
Lee Venable
|
5eb631d759
|
Omaha #3400 - removed application modal shell style
Former-commit-id: 4ec7dd68dc [formerly 143e42b887] [formerly 4ec7dd68dc [formerly 143e42b887] [formerly c068efccc3 [formerly 4841fab5ff0eab3c4f27b56e71f2e4cb35b32aaa]]]
Former-commit-id: c068efccc3
Former-commit-id: f4555772f1 [formerly 82b9b320c5]
Former-commit-id: 7efc684837
|
2014-07-25 10:56:48 -05:00 |
|
Mark Peters
|
969c6a4685
|
Omaha #3412 Replace drawCircle calls
Change-Id: I812f1941b0fe1c7601126e327bb001772eedf5ca
Former-commit-id: b5a25e7372 [formerly e638d2f41b] [formerly b5a25e7372 [formerly e638d2f41b] [formerly e4c455f5c0 [formerly c176ef7e45f8ad9e8273dd1a74ace2075aacdddd]]]
Former-commit-id: e4c455f5c0
Former-commit-id: 30a6e96d7c [formerly e48c2b7116]
Former-commit-id: 3aee17fbb5
|
2014-07-21 17:07:02 -05:00 |
|
Richard Peter
|
342192e967
|
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: 6636b301e5 [formerly 93bbd98cbc] [formerly 6636b301e5 [formerly 93bbd98cbc] [formerly 8ecc27f714 [formerly fc71e1cb26481e91c7d0c16ed0bd06ec5c8c22b9]]]
Former-commit-id: 8ecc27f714
Former-commit-id: 552ac6d640 [formerly fc27824dbc]
Former-commit-id: 0fefdc7cd6
|
2014-07-01 15:34:39 -05:00 |
|
Steve Harris
|
8fb747ad27
|
Merge branch 'master_14.2.2' (-16) into master_14.3.1 (-11) CM-MERGE:14.2.2-11,-12,-13,-14,-15,-16 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/dialogs/sbu/ServiceBackupDlg.java
cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/GisUtil.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/PortionsUtil.java
edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/postProcessModels/postProcessedModels.xml
edexOsgi/com.raytheon.edex.plugin.shef/res/spring/shef-ingest.xml
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
Change-Id: Ia1c3637d1d6ee482896c9d7a41d77752d70317f5
Former-commit-id: 2f2958df37 [formerly d4dc1723c1] [formerly 2f2958df37 [formerly d4dc1723c1] [formerly 7acd9ab2dd [formerly d25ab509cb53d559edbd520dd1e3c036166f2e29]]]
Former-commit-id: 7acd9ab2dd
Former-commit-id: 7fb4663d75 [formerly dcbab5621f]
Former-commit-id: 71357da9d2
|
2014-07-01 11:08:46 -04:00 |
|
Qinglu.Lin
|
283a952738
|
ASM #657 - Errors loading Distance Speed tool and Time of Arrival Tool
Change-Id: I73ca64048b00338b82ee13c5958d6b823cc4a43d
Former-commit-id: e71e54b5da [formerly edb9dd1ff2] [formerly e71e54b5da [formerly edb9dd1ff2] [formerly 30bc1b7450 [formerly 4d58f21546e01f4dda1414b60d0de48c13608c99]]]
Former-commit-id: 30bc1b7450
Former-commit-id: 28de7f52a2 [formerly 166004b927]
Former-commit-id: 12081d6035
|
2014-06-25 08:28:55 -04:00 |
|
Steve Harris
|
196f53e609
|
CM-MERGE:14.1.3-2,-3 into 14.2.2
Merge branch 'master_14.1.3' (-3) into master_14.2.2 (-14)
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-request.xml
edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-spring.xml
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/spc/SPCWatchSrv.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/tpc/TPCWatchSrv.java
edexOsgi/com.raytheon.edex.plugin.gfe/test/com/raytheon/edex/plugin/gfe/watch/TestWCLWatchSrv.java
edexOsgi/com.raytheon.edex.plugin.warning/WarningDecoder.py
edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/gis/GeospatialFactory.java
Former-commit-id: 16f5ff0979 [formerly b84dda5930] [formerly 16f5ff0979 [formerly b84dda5930] [formerly 419c5f4aba [formerly ce5767f2bbf5c9627bd43e766c6193c261c48af3]]]
Former-commit-id: 419c5f4aba
Former-commit-id: af06c5a890 [formerly 66d30e59a3]
Former-commit-id: 935542914d
|
2014-06-20 14:01:55 -04:00 |
|
Brian.Dyke
|
b602d29456
|
CM-MERGE:OB13.5.6-4 into 14.1.3
Former-commit-id: be589ceb9b [formerly 399c06820a] [formerly be589ceb9b [formerly 399c06820a] [formerly 8ecdd9a192 [formerly 86dc406cd227362abc5274f4cd64813ceb91d00d]]]
Former-commit-id: 8ecdd9a192
Former-commit-id: e28febcf27 [formerly 9031f58d02]
Former-commit-id: 3e10995d87
|
2014-06-18 08:55:49 -04:00 |
|
Ben Steffensmeier
|
2aebff4f06
|
Omaha #2061 Remove references to IDecoderGettable.Amount from Range Rings.
Former-commit-id: 5a4f7a1fd4 [formerly f292f204c9] [formerly 5a4f7a1fd4 [formerly f292f204c9] [formerly fc25774506 [formerly e267e8b0bae314abf3396db6072c6ff8adc732bf]]]
Former-commit-id: fc25774506
Former-commit-id: 217734a2ba [formerly 94b465fa15]
Former-commit-id: 3c8b94e08a
|
2014-06-11 13:45:42 -05:00 |
|
Ben Steffensmeier
|
c0b8a49ee9
|
Omaha #3263 Synchronize dataTimes of storm track resources.
Former-commit-id: 8783e9e23c [formerly eff1921f70] [formerly 8783e9e23c [formerly eff1921f70] [formerly cad15768cc [formerly d0a3a73a3a2375a49dc3e224a1c13956530d3351]]]
Former-commit-id: cad15768cc
Former-commit-id: e4ac81c0e9 [formerly b02383f878]
Former-commit-id: f60667703f
|
2014-06-10 16:34:44 -05:00 |
|
Brian.Dyke
|
1ae1410e46
|
Merge branch 'master_14.1.3' into master_14.2.2 CM-MERGE:14.1.3-1 into 14.2.2
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
Former-commit-id: 0f07e14bf1 [formerly f72380ad60] [formerly 0f07e14bf1 [formerly f72380ad60] [formerly 9ab17ddecb [formerly 797aa6bfbf2802aa7355b7a4a77d0fb4f54dfd6a]]]
Former-commit-id: 9ab17ddecb
Former-commit-id: 816dcf74e4 [formerly 49cd9574d9]
Former-commit-id: a4b39dfca5
|
2014-06-10 13:56:03 -04:00 |
|
Brian.Dyke
|
a39afc1dfa
|
CM-MERGE:OB13.5.6-1,-2 into 14.1.3
Former-commit-id: ef5c74dece [formerly c1b3f9d180] [formerly ef5c74dece [formerly c1b3f9d180] [formerly 8874d41872 [formerly b859032bcec187616adfd414dd1ce5fe27829e9e]]]
Former-commit-id: 8874d41872
Former-commit-id: 4f0fc67b1f [formerly f568b5606a]
Former-commit-id: 81d732477e
|
2014-06-10 12:52:59 -04:00 |
|
Michael Gamazaychikov
|
94595e6af4
|
ASM #114 - Problem with Distance Speed Tool.
Change-Id: I2b3218b2fb407f99cf9c81edf69feb042a6fee75
Former-commit-id: e5a9fa0827 [formerly c07bcacbf8] [formerly e5a9fa0827 [formerly c07bcacbf8] [formerly 50ab77046b [formerly a38308fa5a6efe9a07ecd84bd93662bea32afc94]]]
Former-commit-id: 50ab77046b
Former-commit-id: a2423cfadc [formerly 5efb82ea3e]
Former-commit-id: 29e197404f
|
2014-06-05 13:43:04 +01:00 |
|
Michael Gamazaychikov
|
0217549622
|
ASM #114 - Problem with Distance Speed Tool (merge with 13.5.4 changes).
Change-Id: Ic4d6f50c28d0aba440a02010b09b2e3b3117fe85
Former-commit-id: 8ae5d535de [formerly 63409ef272] [formerly 8ae5d535de [formerly 63409ef272] [formerly 5bff9f2ac8 [formerly f3ee76edfd95e9c25eff89d1ecbff9e466b3ca75]]]
Former-commit-id: 5bff9f2ac8
Former-commit-id: 0d38d04dad [formerly 134f486069]
Former-commit-id: 55d44735ef
|
2014-05-21 15:12:08 +01:00 |
|
brian.dyke
|
b2e3c50ec0
|
Merge branch 'master_14.3.1-4' into asm_14.3.1
Conflicts:
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResource.java
edexOsgi/com.raytheon.uf.edex.grid.staticdata/src/com/raytheon/uf/edex/grid/staticdata/StaticDataGenerator.java
edexOsgi/com.raytheon.uf.edex.plugin.grid/utility/common_static/base/purge/gridPurgeRules.xml
Former-commit-id: 9626317825 [formerly 011d121e4b] [formerly 9626317825 [formerly 011d121e4b] [formerly 58683ad040 [formerly 52358cb3e2ba2c7ff4ff9c9a5de03af50c3a1199]]]
Former-commit-id: 58683ad040
Former-commit-id: 2e105c1d5d [formerly bc4649765a]
Former-commit-id: b42011fc76
|
2014-05-19 09:45:37 -04:00 |
|
Qinglu.Lin
|
03f7862321
|
ASM #514 - Line of Storms functionality behaving oddly in WarnGen
Change-Id: I0bd2b9e4200b5acbb19a06caa45f18d36346de39
Former-commit-id: 5f0e0bda69 [formerly 18e92f03c1] [formerly 5f0e0bda69 [formerly 18e92f03c1] [formerly d8753a4145 [formerly 66a6c50cd501358e0c8c993631b288aa78dfdc97]]]
Former-commit-id: d8753a4145
Former-commit-id: 580d7e3ba7 [formerly 8de2d2f718]
Former-commit-id: 6ba15bd00c
|
2014-05-05 11:54:56 -04:00 |
|
Richard Peter
|
938e39a0fc
|
Merge branch 'master_14.3.1' (14.3.1-2) into omaha_14.3.1
Conflicts:
cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/CaseCreationDlg.java
cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/GenerateCaseDlg.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
edexOsgi/com.raytheon.edex.utilitysrv/res/spring/utility-request.xml
edexOsgi/com.raytheon.uf.common.colormap/src/com/raytheon/uf/common/colormap/image/Colormapper.java
edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/SerializationUtil.java
edexOsgi/com.raytheon.uf.edex.textdbsrv/res/spring/textdbsrv-request.xml
Change-Id: I316979d4036b2e2d05b361c8c466747b04ee4900
Former-commit-id: 67683dd891 [formerly 44b1782461] [formerly 67683dd891 [formerly 44b1782461] [formerly 32957285fc [formerly 311c52426b3715d3a73c1fa79a8fd427a4b1b09d]]]
Former-commit-id: 32957285fc
Former-commit-id: 6966b79246 [formerly 80d4153878]
Former-commit-id: 24a3fe1466
|
2014-04-28 16:27:40 -05:00 |
|
Brian.Dyke
|
f31d8cc8cf
|
Merge branch 'master_14.2.2' into master_14.3.1
Merge (14.2.2-5 into 14.3.1-1)
Conflicts:
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/GFESpatialDisplayManager.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/grid/dataset/alias/gfeParamInfo.xml
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscMosaic.py
edexOsgi/com.raytheon.uf.common.archive/src/com/raytheon/uf/common/archive/config/ArchiveConfigManager.java
edexOsgi/com.raytheon.uf.common.python/utility/common_static/base/python/MasterInterface.py
edexOsgi/com.raytheon.uf.edex.datadelivery.registry/src/com/raytheon/uf/edex/datadelivery/registry/federation/RegistryFederationManager.java
edexOsgi/com.raytheon.uf.edex.registry.ebxml/src/com/raytheon/uf/edex/registry/ebxml/services/lifecycle/LifecycleManagerImpl.java
Former-commit-id: f0b8ea5822 [formerly fb1f5aa593] [formerly f0b8ea5822 [formerly fb1f5aa593] [formerly 3524838f9f [formerly f54d2c639a915db14f01f56a7fcc5841b60e1509]]]
Former-commit-id: 3524838f9f
Former-commit-id: bf3758efa3 [formerly 029f5753ad]
Former-commit-id: c6d3fe6952
|
2014-04-25 11:06:11 -04:00 |
|
Lee Venable
|
d6e34a221f
|
Issue #3041 - added dispose check to runAsync call and cleaned up code.
Change-Id: I50e6ce1a214a884221fbc256a133e57e579862da
Former-commit-id: ac914e72e7 [formerly 3c45a24efb] [formerly ac914e72e7 [formerly 3c45a24efb] [formerly dcb7e697e8 [formerly ed2fc05f61861efe6c70b8fc73ad10d27bb73c12]]]
Former-commit-id: dcb7e697e8
Former-commit-id: 91d37d783c [formerly 20764b1d97]
Former-commit-id: 294d8ff917
|
2014-04-21 13:47:31 -05:00 |
|
Brian.Dyke
|
de500c093f
|
Merged 14.2.1 -17, -18 into 1422-3
Former-commit-id: 9df6fb2d4d [formerly 12a482e1d7] [formerly 9df6fb2d4d [formerly 12a482e1d7] [formerly b8829139a2 [formerly 712064db471de93da585f9c765bb4dfbe510df53]]]
Former-commit-id: b8829139a2
Former-commit-id: 6f35818917 [formerly 0ea7c51ad7]
Former-commit-id: a925ba6219
|
2014-04-17 14:42:35 -04:00 |
|
Richard Peter
|
a22345ea6b
|
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: cd51f3fa87 [formerly 3575d6586f] [formerly cd51f3fa87 [formerly 3575d6586f] [formerly 21ae3b5fcd [formerly bd13bc332bcdd87723bec8669885f4594ad483b9]]]
Former-commit-id: 21ae3b5fcd
Former-commit-id: d65b11d404 [formerly a7ec0bcf66]
Former-commit-id: b6482f2e54
|
2014-04-11 16:23:09 -05:00 |
|