Commit graph

6966 commits

Author SHA1 Message Date
Nate Jensen
da45eedb8d Merge "Omaha #3531 added localization perspective link to volume browser menus" into omaha_14.4.1
Former-commit-id: 023138feef [formerly ee4d566f0f] [formerly 023138feef [formerly ee4d566f0f] [formerly e76eb99b1e [formerly ef837132263e16954c571ab5028c24d8fec2d093]]]
Former-commit-id: e76eb99b1e
Former-commit-id: 6989640e65 [formerly f02a7a1dcc]
Former-commit-id: f4ef843a63
2014-09-15 11:01:49 -05:00
Ying-Lian.Shi
17ef08e2b1 ASM #16693 - Fix spelling checker suggests swear words
Change-Id: Ie9e5bc5c26b16655185b81cf4b4cf2f758693566

Former-commit-id: 83536a6b09 [formerly 11b40e167c] [formerly 83536a6b09 [formerly 11b40e167c] [formerly 6e88d5f39c [formerly 094cb9dba5d6e0da22b32b85dcc5049fd629fe5e]]]
Former-commit-id: 6e88d5f39c
Former-commit-id: 7ba6e37a19 [formerly 9b86fdbd15]
Former-commit-id: 45ac127a3b
2014-09-15 14:56:32 +00:00
Brian.Dyke
55a25f2525 Merge branch 'master_14.3.1' into asm_14.3.1
Former-commit-id: 54b26b3616 [formerly 216f34fb25] [formerly 54b26b3616 [formerly 216f34fb25] [formerly 1541e4c255 [formerly 8e4f6e96f7b70d6f2b7517f3f0695350506169c7]]]
Former-commit-id: 1541e4c255
Former-commit-id: 5115becdef [formerly ffa56ef950]
Former-commit-id: 26b1938813
2014-09-15 10:46:25 -04:00
Brian Clements
dda89f79ec Omaha #3531 added localization perspective link to volume browser menus
Change-Id: I876d3c562a6c7d9d02396519d1d214a97ffa5be9

Former-commit-id: 88826380e5 [formerly ba64a77fe4] [formerly 88826380e5 [formerly ba64a77fe4] [formerly 06a6124b64 [formerly b25d8f970caa04375f27f30d86df07542783e24a]]]
Former-commit-id: 06a6124b64
Former-commit-id: ab9720903b [formerly 0494d42b57]
Former-commit-id: 07ef84c212
2014-09-15 09:13:20 -05:00
Brian Clements
b21ad76754 Omaha #3583 productsrv no longer uses serialization util for JAXB
Change-Id: Ifad0e3cc6c875e66e695f7f812b038105ec64b18

Former-commit-id: 1d06a876d7 [formerly b984f9e3ed] [formerly 1d06a876d7 [formerly b984f9e3ed] [formerly 8bf3b0372b [formerly e3dbeb01aa3235db1f6e72a41bdbcd456a60f37f]]]
Former-commit-id: 8bf3b0372b
Former-commit-id: 6e8af95e7b [formerly d0a741a083]
Former-commit-id: 86442d1b24
2014-09-12 15:22:48 -05:00
Roger Ferrel
54064b034c Issue #3516 ColorMapTree change listener now only gets colormaps changes.
Change-Id: Id19d0c0e958ec64a19abc064817780d067add023

Former-commit-id: 76011cb3eb [formerly fa91c4ac44] [formerly 76011cb3eb [formerly fa91c4ac44] [formerly 28347129a1 [formerly bb265611d13e6cb9812aca3966d9fe2a20990a36]]]
Former-commit-id: 28347129a1
Former-commit-id: 7daab1afa3 [formerly 7b052e61ca]
Former-commit-id: e4d01737e2
2014-09-12 15:03:13 -05:00
Mark Peters
75de69198c Omaha #3580 Replace or remove Text Workstation calls to SerializationUtil's JAXB support
Change-Id: Id12d02ebf40cd7c7a1236d88a3776b6a3ee1df3c

Former-commit-id: 9045bb4df8 [formerly 004bc1692a] [formerly 9045bb4df8 [formerly 004bc1692a] [formerly b8dc6d37d8 [formerly 4d5b0516d227eb7b892850753c6bb94f67f01a2d]]]
Former-commit-id: b8dc6d37d8
Former-commit-id: fa39b6b0e5 [formerly 520b5a9a8f]
Former-commit-id: 7f85e1c94c
2014-09-12 13:23:40 -05:00
Brian.Dyke
ccf0104c8b Merge branch 'field_14.2.4' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.2.4
Former-commit-id: 45e7435494 [formerly 21fedc3565] [formerly 45e7435494 [formerly 21fedc3565] [formerly 83099ee81f [formerly ab9b7ec5424512656d2fb343773fa97658c04ecd]]]
Former-commit-id: 83099ee81f
Former-commit-id: d56c30fb40 [formerly 997a7f528f]
Former-commit-id: e97f5bc086
2014-09-12 14:11:57 -04:00
Stephen Gilbert
fa80949d0b VLab Issue #4003 - Minor changes for OB_14.3.1
Change-Id: Ib0430b16b08c9f27238575b4dcdbc568b43709b7

Former-commit-id: 7633b2ca47 [formerly e8c8b6e1b6] [formerly 7633b2ca47 [formerly e8c8b6e1b6] [formerly 4e2ce1fe38 [formerly f4979676c4351e0d5445c95d12d8f58cf8924a66]]]
Former-commit-id: 4e2ce1fe38
Former-commit-id: c32a264f6c [formerly b0f70e0c77]
Former-commit-id: a021a82ce2
2014-09-12 13:20:51 -04:00
Stephen Gilbert
16b8991012 VLab Issue #4001 - Removed old spring config
Change-Id: I0824e9ebabb4cd0884f202899321f2a05198627b

Former-commit-id: 69f8530533 [formerly 0b873558d7] [formerly 69f8530533 [formerly 0b873558d7] [formerly 8d033a8433 [formerly 69e7730adfee0b12daa784e0d884d1bc563356ef]]]
Former-commit-id: 8d033a8433
Former-commit-id: 5d8f60c168 [formerly b34dbeec55]
Former-commit-id: 32e72665a0
2014-09-12 13:18:10 -04:00
Mark Peters
eaf4ad4ffc Omaha #3582 Clean up SerializationUtil's JAXB/XML support
Change-Id: Ic334e43ff0ddb2556f79b04e32a3daeed478f431

Former-commit-id: 5abd331ae3 [formerly 63f44c571d] [formerly 5abd331ae3 [formerly 63f44c571d] [formerly b34220fca5 [formerly fcb1a5c9c93ffe19f9a4e3706f68fab12a0649dc]]]
Former-commit-id: b34220fca5
Former-commit-id: 70c41915ae [formerly 3f251f55bf]
Former-commit-id: a9a6b39f29
2014-09-12 11:46:40 -05:00
Nate Jensen
c915f2b618 Omaha #3356 ensure LevelFactory is initialized on edex before GFE startup
Change-Id: I889b85404fc361dc92ae4323fb20ab44ff12a166

Former-commit-id: 85119e5610 [formerly 0bde7e01fb] [formerly 85119e5610 [formerly 0bde7e01fb] [formerly cbe3d885a2 [formerly 64f5c249ed837f854db743e1b90f2194c01cdbfd]]]
Former-commit-id: cbe3d885a2
Former-commit-id: c377150a59 [formerly 64140e614a]
Former-commit-id: a214a90337
2014-09-12 09:14:01 -05:00
Ana Rivera
3a09bf0228 VLab Issue #4671 - Remove duplicate entries from fieldsMenus.xml, updates SMS RM 16720 (HRRR); fixes #4671
Change-Id: I9708b606e5a7d2c2fc9355d765fbad9113a40493

Former-commit-id: b83fd7501f [formerly 09152bc49b] [formerly b83fd7501f [formerly 09152bc49b] [formerly 909f4d8632 [formerly 94e5089beb782011d107de4aeeb8b35694f2f5c3]]]
Former-commit-id: 909f4d8632
Former-commit-id: df869efb23 [formerly 84538be9a1]
Former-commit-id: 29f8ade06b
2014-09-11 21:17:43 +00:00
Roger Ferrel
e6dd284481 Issue #3516 - Get Color Maps for levels off the dispatch thread.
Change-Id: Icc89f4860eef0b0b404e1e5b66bb0178eedd73dc

Former-commit-id: fffec40c30 [formerly c885873b25] [formerly fffec40c30 [formerly c885873b25] [formerly 246bc4770f [formerly a67a429eb2d266e66a99b6c18916193cd0d20d9d]]]
Former-commit-id: 246bc4770f
Former-commit-id: 9236b1f1fb [formerly 775dd2520d]
Former-commit-id: 5aefd5d28d
2014-09-11 14:36:50 -05:00
Sean.Webb
ff50aaf81d ASM #16720 - Updated to ldm 6.12.6
Change-Id: Ib005b9e9af0979d4aa1463e5555fd7b42c7fcc89

Former-commit-id: 268db31231 [formerly c805e132bd] [formerly 268db31231 [formerly c805e132bd] [formerly 5918cb05c1 [formerly f07bb36b5f5e01000345a37719e43cb2df4ea7d8]]]
Former-commit-id: 5918cb05c1
Former-commit-id: 55190a347f [formerly 213208cbf2]
Former-commit-id: b36a1fdde0
2014-09-11 15:13:58 -04:00
Sean.Webb
0d1375ba3d ASM #16720 - Updated to ldm 6.12.6
Change-Id: I39f4a529c18995e2b400afbaf0b36fbe7d30d001

Former-commit-id: dec97cd06f [formerly 928c334c03] [formerly dec97cd06f [formerly 928c334c03] [formerly a6c15ca070 [formerly fb95ea372530d699c4681cf8ec9e3abce23716c1]]]
Former-commit-id: a6c15ca070
Former-commit-id: d1614ae327 [formerly 6fa9e92a8c]
Former-commit-id: 6299e7382e
2014-09-11 14:18:50 -04:00
Sean.Webb
5fe337b6bf ASM #16720 - Updated to ldm 6.12.6
Change-Id: Icf050791541832b370f7d8ceb7a423b500a62d51

Former-commit-id: eb5418a3bb [formerly dfc004e1f0] [formerly eb5418a3bb [formerly dfc004e1f0] [formerly 0e72b63663 [formerly 8b1b91c79fa7e59610e21f11af3babaf120859e4]]]
Former-commit-id: 0e72b63663
Former-commit-id: e186b2723d [formerly 991ea6c13b]
Former-commit-id: f98fbd8e99
2014-09-11 13:39:17 -04:00
Brian Clements
f3d1bf85b4 Omaha #3608 improved error handling in lightning frame retriever
Change-Id: I02784a7f2d23bf37d56294e55cb9ec759d1f9080

Former-commit-id: ce24dad434 [formerly b9dd6d798b] [formerly ce24dad434 [formerly b9dd6d798b] [formerly c56645dd01 [formerly 0551b91b995c893fddee52cabdfbdccf83121a31]]]
Former-commit-id: c56645dd01
Former-commit-id: 6a333bde00 [formerly 07b48207a2]
Former-commit-id: b4b45c0152
2014-09-11 11:52:23 -05:00
Richard Peter
202279442f Merge "Omaha #3615 Register 2D metar fields" into omaha_14.4.1
Former-commit-id: 8f912115ac [formerly dbd3cd85d6] [formerly 8f912115ac [formerly dbd3cd85d6] [formerly dad8f4c869 [formerly bb317434e32d73c2f1caa2bc335a117be17a2d07]]]
Former-commit-id: dad8f4c869
Former-commit-id: c0cc0e6f02 [formerly 01287e329e]
Former-commit-id: ceb8ed381f
2014-09-11 11:20:43 -05:00
Nate Jensen
7b1bff973f Merge "Omaha #3548 PluginDataObjectFilter fails to start in spring" into omaha_14.4.1
Former-commit-id: 7a57781b2a [formerly 7d664adaf2] [formerly 7a57781b2a [formerly 7d664adaf2] [formerly af1052ccf6 [formerly b70bcdf470e20eed85352e14939f13cbeb91b49b]]]
Former-commit-id: af1052ccf6
Former-commit-id: 9dac021eec [formerly 2d9130b0f4]
Former-commit-id: aeafce9318
2014-09-11 11:11:30 -05:00
Mark Peters
09003ad30b Omaha #3548 PluginDataObjectFilter fails to start in spring
Change-Id: I6db18d15b5a35a081de48a885e3d27495b44b5d0

Former-commit-id: cbb5715b34 [formerly d671d1f432] [formerly cbb5715b34 [formerly d671d1f432] [formerly fb33786001 [formerly e9d50c287b6327ea03437a98fb1077b904daeecd]]]
Former-commit-id: fb33786001
Former-commit-id: 53cf3a043b [formerly a18f767151]
Former-commit-id: 8be9ecd84a
2014-09-11 10:32:11 -05:00
Nathan Bowler
0f4e9d3945 Omaha #3615 Register 2D metar fields
Change-Id: Ic6cfcbfd1fcbab921732366c8803d54ea493845a

Former-commit-id: 7ae1ebfd24 [formerly ede0cbf395] [formerly 7ae1ebfd24 [formerly ede0cbf395] [formerly ab09b948a6 [formerly 3101fdbde5e8023fdc33ff18ad25c9a8c830693a]]]
Former-commit-id: ab09b948a6
Former-commit-id: ccc72c49cb [formerly f8b6324531]
Former-commit-id: 9a1f5ec8d0
2014-09-11 11:20:40 -04:00
Stephen Gilbert
2679b9ef8d Merge branch 'ncep_14.2.1-n' into ncep_14.3.1
Conflicts:
	cave/build/cave/customTargets.xml
	edexOsgi/build.edex/opt/db/ddl/ncep/loadVors.sql
	edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_NCEP-7.xml
	edexOsgi/com.raytheon.uf.tools.cli/impl/src/pgen/ActivityUtil.py
	ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/src/gov/noaa/nws/ncep/common/dataplugin/geomag/calculation/CalcEach1min.java
	ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/src/gov/noaa/nws/ncep/common/dataplugin/geomag/calculation/CalcEach3hr.java
	ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/src/gov/noaa/nws/ncep/common/dataplugin/geomag/calculation/CalcKp.java
	ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/src/gov/noaa/nws/ncep/common/dataplugin/geomag/calculation/CalcUtil.java
	ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/src/gov/noaa/nws/ncep/common/dataplugin/geomag/request/DatabaseUtil.java
	ncep/gov.noaa.nws.ncep.edex.common/src/gov/noaa/nws/ncep/edex/common/sounding/NcSoundingLayer.java
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/remoteScripts/baseScript-1
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/remoteScripts/test_script
	ncep/gov.noaa.nws.ncep.edex.plugin.aww/src/gov/noaa/nws/ncep/edex/plugin/aww/util/AwwParser.java
	ncep/gov.noaa.nws.ncep.edex.plugin.geomag/res/spring/geomag-request.xml
	ncep/gov.noaa.nws.ncep.edex.plugin.geomag/src/gov/noaa/nws/ncep/edex/plugin/geomag/TrigKCalculation.java
	ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/res/spring/ncgrib-file-endpoint.xml
	ncep/gov.noaa.nws.ncep.ui.nctextui/src/gov/noaa/nws/ncep/ui/nctextui/dbutil/NctextDbQuery.java
	ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/NsharpConstants.java
	ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/display/rsc/NsharpDataPaneResource.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/natives/NsharpNative.java
	ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/natives/NsharpNativeConstants.java
	ncep/gov.noaa.nws.ncep.ui.pgen/localization/ncep/pgen/xslt/prod/f000.xslt
	ncep/gov.noaa.nws.ncep.ui.pgen/localization/ncep/pgen/xslt/prod/f000_hires.xslt
	ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/attrdialog/ContoursAttrDlg.java
	ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/contours/Contours.java
	ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/controls/RetrieveActivityDialog.java
	ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/controls/StoreActivityDialog.java
	ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/display/DisplayElementFactory.java
	ncep/gov.noaa.nws.ncep.viz.common/src/gov/noaa/nws/ncep/viz/common/ui/HILORelativeMinAndMaxLocator.java
	ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SURFACE/SHIP6HR/SHIP6HR.xml
	ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/src/gov/noaa/nws/ncep/viz/rsc/ncgrid/contours/ContourSupport.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/src/gov/noaa/nws/ncep/viz/rsc/ncgrid/rsc/NcgridResource.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ncscat/src/gov/noaa/nws/ncep/viz/rsc/ncscat/rsc/NcscatResource.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcCGM.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcCharacterHeight.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcCircleElement.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcCommand.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcFillColour.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcInteriorStyle.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcLineColour.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcLineWidth.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcPolygonElement.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcPolyline.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcText.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcTextAlignment.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcTextColour.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcTextFontIndex.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/rsc/ImageBuilder.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/rsc/NtransResource.java
	ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/plotModels/NcPlotModelHdf5DataRequestor.java
	ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/rsc/EditPlotModelComposite.java
	ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/rsc/NcPlotResource2.java
	ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/rsc/Tracer.java
	ncep/gov.noaa.nws.ncep.viz.ui.remotescript/build.properties

Change-Id: I8559c4f5f35be8df6fdc4d1467c5f9ccff08ffb6

Former-commit-id: 2406f0786f [formerly 561b751e58] [formerly 2406f0786f [formerly 561b751e58] [formerly 662436c2d5 [formerly 3775b0762b9d8529f5aa6630480d82e7ea62c1d8]]]
Former-commit-id: 662436c2d5
Former-commit-id: 3251e256c6 [formerly a631e61fe5]
Former-commit-id: bbabe5d087
2014-09-11 11:14:33 -04: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
Max Schenkelberg
a2e7d1324f Omaha #3612 Refactored AbstractCAVEComponent to extend CAVEApplication
Change-Id: Iccaa6d95ec47fa41080929e456ff450eb61f41eb

Former-commit-id: 422ceffbdd [formerly 3ea9b1b4be] [formerly 422ceffbdd [formerly 3ea9b1b4be] [formerly 994605c1ce [formerly 154c4ac7131ae8f533d4080055d9afe257bf0506]]]
Former-commit-id: 994605c1ce
Former-commit-id: 165583b144 [formerly 3b1a3f84fd]
Former-commit-id: 144e042b42
2014-09-10 15:43:19 -05:00
Ben Steffensmeier
0fd5d397d3 Issue #3604 Fix NPE in Imaging Dialog.
Former-commit-id: 3c4285fea1 [formerly 15f35e6dcc] [formerly 3c4285fea1 [formerly 15f35e6dcc] [formerly ed7b816989 [formerly e2043fd8034dde47963a32108b1475ee7db1ea18]]]
Former-commit-id: ed7b816989
Former-commit-id: c0072ab394 [formerly dca7627c1e]
Former-commit-id: 2fdb8409e5
2014-09-10 14:43:23 -05:00
Richard Peter
e9740b73fe Merge "Omaha #3356 updates for improved level lookup" into omaha_14.4.1
Former-commit-id: bec987b601 [formerly 49949b99c5] [formerly bec987b601 [formerly 49949b99c5] [formerly 0608175d2d [formerly 74f89af8dda533b6b905c86be1afac3e2633923b]]]
Former-commit-id: 0608175d2d
Former-commit-id: 414b255b80 [formerly aed4031560]
Former-commit-id: e0221d1b10
2014-09-10 14:32:32 -05:00
David Friedman
a80f112c90 ASM #16730 - WarnGen Watch wording error when issuing product only over Marine Locations
Change-Id: I361a1635cf11f3c66801f33c74034028b3e0271d

Former-commit-id: 94d78ed010 [formerly 8d7ba120a2] [formerly 94d78ed010 [formerly 8d7ba120a2] [formerly bed361fe35 [formerly 17d27fca04fb733d74e5bac99bfed3112bd81b6c]]]
Former-commit-id: bed361fe35
Former-commit-id: 78217ab3e9 [formerly 93e07181c0]
Former-commit-id: 8a1e71f784
2014-09-10 19:28:57 +00:00
Sean.Webb
b5b7f5622b ASM #16720 - Updated to ldm 6.12.6
Change-Id: Ib4c4689eb32f298b8be8782d878c243689608f6a

Former-commit-id: bc6f7cfa3f [formerly db156a51de] [formerly bc6f7cfa3f [formerly db156a51de] [formerly 71d128a180 [formerly ded6663441d8b916ad5b45f2668feac431e84bce]]]
Former-commit-id: 71d128a180
Former-commit-id: ce7bae10ea [formerly 2683f36e09]
Former-commit-id: d03c5a03fc
2014-09-10 14:48:19 -04:00
Ron Anderson
6cb8a0602a Issue #3592 Fixed several localization issue in GFE
Change-Id: I2e65649d490372b5c1738f07c79b5ed15885f8c7

Former-commit-id: 57a3542038 [formerly 52e5636261] [formerly 57a3542038 [formerly 52e5636261] [formerly b91141ef7b [formerly a5ef55df33009948fec139e7729dd53ae4251667]]]
Former-commit-id: b91141ef7b
Former-commit-id: 99e223ba91 [formerly c23122797d]
Former-commit-id: be55fa4984
2014-09-09 16:10:53 -05:00
Mark Peters
3c730ef05f Omaha #3548 PluginDataObjectFilter fails to start in spring
Change-Id: Ia69c93c5bab1c730c3c4bad6781823f989bc1641

Former-commit-id: 203e21b807 [formerly 685a9b1960] [formerly 203e21b807 [formerly 685a9b1960] [formerly 735cafee83 [formerly 4d059172e0d822a2fb740d602265da6a91e15ccc]]]
Former-commit-id: 735cafee83
Former-commit-id: 5ca19d6ab8 [formerly 6684a32468]
Former-commit-id: 9ce57d5780
2014-09-09 16:09:04 -05:00
Nate Jensen
3cf27fb414 Omaha #3356 updates for improved level lookup
Change-Id: I32ca44114fb18770bff22c6d0c9173e8fa49a362

Former-commit-id: 1c77f66608 [formerly ae9cffaaea] [formerly 1c77f66608 [formerly ae9cffaaea] [formerly 62b84b2fb3 [formerly 0ca90b58d7ca85d5bfc8fc525415115ac8451c5b]]]
Former-commit-id: 62b84b2fb3
Former-commit-id: d397d4147c [formerly f5ae895143]
Former-commit-id: eec3df9cd5
2014-09-09 15:38:53 -05:00
Matthew Howard
564c67673e Merge "ASM #657 - Errors loading Distance Speed tool and Time of Arrival Tool" into asm_14.3.1
Former-commit-id: 05aea71f77 [formerly f14ea5f877] [formerly 05aea71f77 [formerly f14ea5f877] [formerly 708e8a8886 [formerly c4a0a681a3f0ea21237684cdadb2aab8ac8ca078]]]
Former-commit-id: 708e8a8886
Former-commit-id: cfba2b439c [formerly 0bd1e23078]
Former-commit-id: c5f4587e6c
2014-09-09 14:01:39 -05:00
Brian.Dyke
0f9fe8301a 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: fe85eb9f70 [formerly 3d9a3de6e4] [formerly fe85eb9f70 [formerly 3d9a3de6e4] [formerly 01dfe503f5 [formerly a3365943e7b7972a5c86f8cb1ad39667ab9e0695]]]
Former-commit-id: 01dfe503f5
Former-commit-id: 29364e2b9f [formerly c42733eb39]
Former-commit-id: a31d3d702e
2014-09-09 11:44:30 -04:00
Ben Steffensmeier
3830692aa4 Issue #2875 Add current vectors to field display types.
Former-commit-id: 66676a2014 [formerly 311837012d] [formerly 66676a2014 [formerly 311837012d] [formerly df96ea543a [formerly fbda83fc24a69b6ea8ef335874ecc4146dc392da]]]
Former-commit-id: df96ea543a
Former-commit-id: 6d32c3758e [formerly ea4c8d7fe5]
Former-commit-id: 5714689909
2014-09-09 10:35:29 -05:00
Nate Jensen
a623f53f1d Merge "Omaha #3356 more removal of unnecessary register buddies" into omaha_14.4.1
Former-commit-id: 644c0acbfe [formerly 986a03c7c5] [formerly 644c0acbfe [formerly 986a03c7c5] [formerly 7920053e2f [formerly 90e8451dd089de67278368ca665da0cfc5bb6740]]]
Former-commit-id: 7920053e2f
Former-commit-id: 393c49b691 [formerly bd9b4a9355]
Former-commit-id: 3d70613ca0
2014-09-09 09:23:28 -05:00
Brian Clements
d6baeddbb1 Omaha #3570 http client API changes
Change-Id: Icb6dc44e7841961da3df383e879acf4ef8f1a14f

Former-commit-id: 06e4c1e644 [formerly 8489ce1214] [formerly 06e4c1e644 [formerly 8489ce1214] [formerly 21ded3ea69 [formerly d4edd51d41a306010a7fec2a7ed2c0cd6186506a]]]
Former-commit-id: 21ded3ea69
Former-commit-id: 84634e9987 [formerly 1186014784]
Former-commit-id: e9efd4e501
2014-09-09 08:47:32 -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
642f11aec0 Omaha #3356 more removal of unnecessary register buddies
Change-Id: Ic91c2d5ab93bb220a69be23c54640edae26302a3

Former-commit-id: 606642b99f [formerly 26e2ff44a4] [formerly 606642b99f [formerly 26e2ff44a4] [formerly b46f23d01b [formerly 39bfb8fd0548c74ed9a4e95b914e90ab2f6ad526]]]
Former-commit-id: b46f23d01b
Former-commit-id: 84b0e0117f [formerly 9dafcc915c]
Former-commit-id: 76a397f500
2014-09-08 17:18:22 -05:00
Richard Peter
5f9947a20c Merge "Omaha #3405 Convert airep and pirep to DAF. Extract common code. Update acars to use common" into omaha_14.4.1
Former-commit-id: d1b3a98c92 [formerly 40a1936b20] [formerly d1b3a98c92 [formerly 40a1936b20] [formerly b68ffa6f09 [formerly 9b96e7075b95fb68cda21d03571e56bf4ec53a2e]]]
Former-commit-id: b68ffa6f09
Former-commit-id: f6ec37f765 [formerly eafce0bd5a]
Former-commit-id: c5da67694d
2014-09-08 16:33:40 -05:00
Nate Jensen
1705ca5735 Merge "Omaha #2926 switched text subscription to thrift client" into omaha_14.4.1
Former-commit-id: 4398f2d7d8 [formerly da3e7dbf72] [formerly 4398f2d7d8 [formerly da3e7dbf72] [formerly 88e11a4909 [formerly 51c60cf39cc950771597ff652c0e683c73812d91]]]
Former-commit-id: 88e11a4909
Former-commit-id: e212fd841f [formerly 9083d4956b]
Former-commit-id: 800ffc4ef9
2014-09-08 13:58:02 -05:00
Brian.Dyke
b42aba7839 Merge branch 'field_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Conflicts:
	cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml

Former-commit-id: 5415a4939a [formerly 858b91d677] [formerly 5415a4939a [formerly 858b91d677] [formerly af477df90e [formerly 7b49ea6d9c45c0624017bbe7ffb1297a402ee875]]]
Former-commit-id: af477df90e
Former-commit-id: dde3efc567 [formerly 6c4b121752]
Former-commit-id: 66c4758f2d
2014-09-08 14:54:16 -04:00
Chip Gobs
cbbe589afe Merge "VLab Issue #4612 Fix for Redmine O&M DR 283 concerning the faulty ability of a user to select filtered out stations when performing quality code operations in MPE in GroupEdit Mode." into ohd_14.3.1
Former-commit-id: 83e0a41593 [formerly bbc346e29e] [formerly 83e0a41593 [formerly bbc346e29e] [formerly ec3ff24577 [formerly 3ad2b50520a7a8fdfaa1a99a1f34570e43d0164e]]]
Former-commit-id: ec3ff24577
Former-commit-id: 1af9261db2 [formerly 272690ed5a]
Former-commit-id: d0810673a4
2014-09-08 14:29:28 -04:00
Chip Gobs
c4cbdb87dd Merge "VLab Issue #4611 Fixes O&M Redmine DR 14448 - which concerns displaying changes to a color set just after the changes are saved, instead of redisplaying after the ColorScaleManager is closed." into ohd_14.3.1
Former-commit-id: 117a5daab1 [formerly 02038fd474] [formerly 117a5daab1 [formerly 02038fd474] [formerly 155c06ddae [formerly b526634078fbe20a471ae40f281299eb7f426208]]]
Former-commit-id: 155c06ddae
Former-commit-id: 0b6a91596c [formerly 180f6d67ba]
Former-commit-id: 7c15a16999
2014-09-08 14:29:08 -04:00
Chip Gobs
e37cf3ecf7 Merge "VLab Issue #4602 Fixes MPE Gage Table Data Reading problem introduced in a earlier 14.3.1 build, a.k.a Redmine O&M DR 16699" into ohd_14.3.1
Former-commit-id: bc2962c9ce [formerly 780f484a56] [formerly bc2962c9ce [formerly 780f484a56] [formerly cf0816edce [formerly 57614e9869d5a36c80b8d988e8fea4136045a982]]]
Former-commit-id: cf0816edce
Former-commit-id: b41aef6d84 [formerly edef86ba43]
Former-commit-id: d00048b40f
2014-09-08 14:28:33 -04:00
Brian Clements
cb37ddfd9d Omaha #3518 each JVM gets a unique user prefs folder
Change-Id: I3ea2cf98836bb3a5447b307eda4a5ab235b18619

Former-commit-id: e95a139900 [formerly 2c1cd559b6] [formerly e95a139900 [formerly 2c1cd559b6] [formerly a0d663530b [formerly 856b223352b99e3f96df6dab84aea313885b3c37]]]
Former-commit-id: a0d663530b
Former-commit-id: 7938c547e8 [formerly b3d6dbad76]
Former-commit-id: 7397b4c453
2014-09-08 13:16:13 -05:00
Chip Gobs
07ce013d2c VLab Issue #4612
Fix for Redmine O&M DR 283 concerning the faulty ability of a user to select filtered out stations when
performing quality code operations in MPE in GroupEdit Mode.

Change-Id: Ib8da13cfa2085aeb6efba96e7a1789912534bddd

Former-commit-id: a06a4667a3 [formerly f7624b0609] [formerly a06a4667a3 [formerly f7624b0609] [formerly 874db74c54 [formerly 7df28e4d5c1d8a03db5500939b0af2905d11a4aa]]]
Former-commit-id: 874db74c54
Former-commit-id: 7bda177305 [formerly ee70ab2956]
Former-commit-id: b2319cd60a
2014-09-08 12:37:20 -04:00
Nathan Bowler
ff66970808 Omaha #3405 Convert airep and pirep to DAF. Extract common code. Update acars to use common
Change-Id: I09fd0119900dabbde901773469d90b31eda57d63

Former-commit-id: ebe27b736f [formerly ee5d7fc5e5] [formerly ebe27b736f [formerly ee5d7fc5e5] [formerly 099f40fb87 [formerly 4c32ce907e8bad06015688ca5596a23bfb655463]]]
Former-commit-id: 099f40fb87
Former-commit-id: bcfdc408d4 [formerly ac6f4dea5a]
Former-commit-id: 7af3b8b174
2014-09-08 12:36:48 -04:00
Chip Gobs
59d8ddc6c4 VLab Issue #4611
Fixes O&M Redmine DR 14448 - which concerns displaying changes to a color set just after the changes are saved,
instead of redisplaying after the ColorScaleManager is closed.

Change-Id: I0156612302853141392c263eab8b54a16c3be7a3

Former-commit-id: 3c350e52d2 [formerly 5573a077bf] [formerly 3c350e52d2 [formerly 5573a077bf] [formerly 31d32a2e82 [formerly 6fe0cf5e013896af2e3380a9f93168e8fa66068b]]]
Former-commit-id: 31d32a2e82
Former-commit-id: a06dee5dd3 [formerly d6ede1b6a6]
Former-commit-id: b4fab70dc1
2014-09-08 12:26:04 -04:00
Chip Gobs
b2f957c4d4 VLab Issue #4611
Fixes O&M Redmine DR 14448 - which concerns displaying changes to a color set just after the changes are saved,
instead of after the ColorScaleManager is closed.

Change-Id: I0156612302853141392c263eab8b54a16c3be7a3

Former-commit-id: 69450976c8 [formerly 8c6e70ccab] [formerly 69450976c8 [formerly 8c6e70ccab] [formerly 25e4ed8d51 [formerly 44f6bf08a72b5450d6d0db40ff49dd5123cf811c]]]
Former-commit-id: 25e4ed8d51
Former-commit-id: 689ccd9fcf [formerly 215f1dfaa1]
Former-commit-id: 9bf30e3dbd
2014-09-08 12:06:45 -04:00