xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
6185 commits 31 branches 40 tags 3.8 GiB
Commit graph

6185 commits

This branch
This branch
All branches
Author SHA1 Message Date
Brian.Dyke
d411aca5be Merge branch 'ops_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1 
Former-commit-id: b94198ffb3 [formerly c0dc990974] [formerly b94198ffb3 [formerly c0dc990974] [formerly 1018c65552 [formerly 41a854146a3f4ab156b63e2ea24e60681fc586f2]]]
Former-commit-id: 1018c65552
Former-commit-id: 270dd25520 [formerly 5c8f79ee30]
Former-commit-id: 40094965ea
 2014-09-19 16:59:12 -04:00
Brian.Dyke
763439c814 Merge branch 'asm_14.3.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.3.1 
Former-commit-id: 75f3bb31d5 [formerly 4db67c581c] [formerly 75f3bb31d5 [formerly 4db67c581c] [formerly 8d665b93b5 [formerly 8d5d8cdfd272f8000a6a21a4128998889eb2ab30]]]
Former-commit-id: 8d665b93b5
Former-commit-id: 12bf31b5ba [formerly b83e12da28]
Former-commit-id: c4d7c97897
 2014-09-19 16:56:50 -04:00
Baoyu Yin
f5608f83ce VLab Issue #4796 - AWIPS2_DR_17420 WarnGen IBW templates and 14.2.1 template corrections; fixes #4796 
Change-Id: Ieb4a6d68b48351deacbddda65f1ff53485c3402d

Former-commit-id: 957c12653b [formerly 8568cd8419] [formerly 957c12653b [formerly 8568cd8419] [formerly 28b7e8d6e2 [formerly f077d3cd4084faf8ad7c8865e84df53e59a5db72]]]
Former-commit-id: 28b7e8d6e2
Former-commit-id: 5c59811bec [formerly 01c22431e6]
Former-commit-id: 1d5a7393da
 2014-09-19 15:02:23 -04:00
Brian.Dyke
d1c45356d3 Merge branch 'ncep_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1 
Former-commit-id: 9fc3eb20c1 [formerly 6ad8d500ef] [formerly 9fc3eb20c1 [formerly 6ad8d500ef] [formerly 9c33ae6d2c [formerly e895f7927a95c2416c05953e131d9e0c6095beb3]]]
Former-commit-id: 9c33ae6d2c
Former-commit-id: a97370769f [formerly 3b48d6368d]
Former-commit-id: 2a456a1b9b
 2014-09-19 14:42:29 -04:00
Brian.Dyke
64435ea860 Merge branch 'ohd_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1 
Former-commit-id: e70a9db68c [formerly c6b0adfc53] [formerly e70a9db68c [formerly c6b0adfc53] [formerly 8b0603cdb8 [formerly de22db308f36c42d5c7e0989dbd7decfaaf3adbb]]]
Former-commit-id: 8b0603cdb8
Former-commit-id: 87dfb0e978 [formerly d5f57cd98e]
Former-commit-id: 37ffb37db6
 2014-09-18 12:43:01 -04:00
Chip Gobs
35439f3173 VLab Issue #4611 
Adding missing changed file.

Change-Id: Ifcc56c121bb13806a5a5e7fc4e6de6e36900867e

Former-commit-id: 0e4b8d2e9b [formerly 0d046a56e8] [formerly 0e4b8d2e9b [formerly 0d046a56e8] [formerly 31efce6b8f [formerly e68f56628f035ca2a20848a0e76f6efa8bbe1e8a]]]
Former-commit-id: 31efce6b8f
Former-commit-id: aa838b2230 [formerly a287a95ef9]
Former-commit-id: 552430bda0
 2014-09-18 12:12:42 -04:00
Matthew Howard
42ba5d61df Merge "ASM #15465 - No variable for failed site's MND Header location available for WarnGen to use" into asm_14.3.1 
Former-commit-id: f3764d3bd3 [formerly 27c31ea90f] [formerly f3764d3bd3 [formerly 27c31ea90f] [formerly 0d0aae9234 [formerly 0b0c2e1ea8188cd88c92fde4d4b999670aad17dc]]]
Former-commit-id: 0d0aae9234
Former-commit-id: 0f086d9e3d [formerly b49cd025b9]
Former-commit-id: 16b1766cc0
 2014-09-18 10:36:17 -05:00
Qinglu.Lin
1e3f3e2b84 ASM #15465 - No variable for failed site's MND Header location available for WarnGen to use 
Change-Id: I8bc59786379680f635e85917eebf4c9d6b4ea683

Former-commit-id: 1aac17e599 [formerly 10da99d3f7] [formerly 1aac17e599 [formerly 10da99d3f7] [formerly c2047b94b1 [formerly f79ed1b1867b5516a390a8f70b2141052be3eb38]]]
Former-commit-id: c2047b94b1
Former-commit-id: 9c70d41d38 [formerly ab0eb6a507]
Former-commit-id: 448d4ceb2d
 2014-09-18 11:21:18 -04:00
Matthew Howard
f7acce4d0e Merge "ASM #537 - fix for AvnFPS: Syntax failed to flag format error" into asm_14.3.1 
Former-commit-id: cfda29cc8a [formerly 7b369e5ccc] [formerly cfda29cc8a [formerly 7b369e5ccc] [formerly bb0e06d09d [formerly 45a5185657de4c3e3c330a5a8604078fe1ccde2a]]]
Former-commit-id: bb0e06d09d
Former-commit-id: 872e6f934a [formerly c4f9671fc8]
Former-commit-id: 356b345064
 2014-09-17 15:40:40 -05:00
Brian.Dyke
c95be437eb Merge branch 'ops_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1 
Former-commit-id: 1c0d6624a3 [formerly e1c88f287a] [formerly 1c0d6624a3 [formerly e1c88f287a] [formerly 57a361073d [formerly 5703d4fbb0fa5e422e3fbd62529928091a2bdb1f]]]
Former-commit-id: 57a361073d
Former-commit-id: 47feda6450 [formerly 4476b9d19e]
Former-commit-id: 7e53a1d558
 2014-09-17 15:50:13 -04:00
Brian.Dyke
76c056ce3f Merge branch 'field_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1 
Former-commit-id: 125760432b [formerly a155bbd8c1] [formerly 125760432b [formerly a155bbd8c1] [formerly 0f6b0f3d9d [formerly 0813f96fbb673fdbbdb2c0f049ec722a80b212f9]]]
Former-commit-id: 0f6b0f3d9d
Former-commit-id: 9db11b3211 [formerly e43ea5e966]
Former-commit-id: 84a511359b
 2014-09-17 15:45:27 -04:00
Brian.Dyke
6f708b2b87 VLab Issue #4015 - MPE - This is the MPEFieldgen LSATPRE Field generation fix. Built library.ohd.pproc.so 
Former-commit-id: 9d2eaef5e7 [formerly 546b43dff6] [formerly 9d2eaef5e7 [formerly 546b43dff6] [formerly 05145d2f0d [formerly 0448deecda7c53ac65bc66bc9751ec0e7f83eee1]]]
Former-commit-id: 05145d2f0d
Former-commit-id: 75284bdd1b [formerly 60a61086d5]
Former-commit-id: 5516c71d4e
 2014-09-17 15:39:57 -04:00
Zhidong.Hao
a79eb6705d ASM #537 - fix for AvnFPS: Syntax failed to flag format error 
Change-Id: I39615891fb92f876e06d13eb3232ee937ec9080a

Former-commit-id: 8fadf3bf2c [formerly 237b09c2ad] [formerly 8fadf3bf2c [formerly 237b09c2ad] [formerly 396519b17a [formerly 52d355b81fd7f7376d26f43ca6abe4d2ee744adf]]]
Former-commit-id: 396519b17a
Former-commit-id: 66df3687d6 [formerly 078ef6a992]
Former-commit-id: 17404d5145
 2014-09-17 15:02:13 -04:00
Brian.Dyke
484ebfd9c9 Merge branch 'ohd_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1 
Former-commit-id: c44811098f [formerly cb7a266271] [formerly c44811098f [formerly cb7a266271] [formerly 97fc11f099 [formerly dcfe2369455e6b7f27039418b090c9c577400a63]]]
Former-commit-id: 97fc11f099
Former-commit-id: 050fb83ec8 [formerly e8e2549284]
Former-commit-id: 8f0d1e9dc5
 2014-09-17 14:39:56 -04:00
Brian.Dyke
cdd2d4553b Merge branch 'master_14.3.1' into asm_14.3.1 
Former-commit-id: c2033ff569 [formerly 4bd417b313] [formerly c2033ff569 [formerly 4bd417b313] [formerly 97dfb04eb6 [formerly 1f186fb314e78d93adefe03faaa71f348ee207c7]]]
Former-commit-id: 97dfb04eb6
Former-commit-id: 17ccf38f99 [formerly 2bea5c90a4]
Former-commit-id: 91fe59509a
 2014-09-17 13:32:25 -04:00
Matthew Howard
d6accf7ec2 Merge "ASM #529 Invalid QC message for Areal Flood Advisory" into asm_14.3.1 
Former-commit-id: 167c388492 [formerly 9b7823084f] [formerly 167c388492 [formerly 9b7823084f] [formerly 4786f2e19e [formerly f08b93fb1bd32ec83a2e590d29d5e4d0fe18c0a9]]]
Former-commit-id: 4786f2e19e
Former-commit-id: 4a00dfa9d5 [formerly d76091c857]
Former-commit-id: 1a66861071
 2014-09-16 08:32:37 -05:00
Michael Gamazaychikov
409f045d0f ASM #529 Invalid QC message for Areal Flood Advisory 
Change-Id: I392d32b4d7ccc94c88404a85f22f2f306d34ee33

Former-commit-id: 3291b69cca [formerly fdaf681e8c] [formerly 3291b69cca [formerly fdaf681e8c] [formerly 0b245d40ae [formerly d3247df563831f017f69faf1edbde5aea3c2a507]]]
Former-commit-id: 0b245d40ae
Former-commit-id: 42b906d859 [formerly 11604e5131]
Former-commit-id: ed6ee08d14
 2014-09-16 09:12:06 -04:00
Ana Rivera
3c4daf72ef Merge "VLab Issue #4723 - Ingest LambertConformal projection with two standard parallels using RegionalSat; fixes #4723" into field_14.3.1 
Former-commit-id: ae6d0f5d64 [formerly 2e66ced748] [formerly ae6d0f5d64 [formerly 2e66ced748] [formerly 536140f021 [formerly c7c530f99f8585817544db2d7be5b13d47c3e62e]]]
Former-commit-id: 536140f021
Former-commit-id: 7b84e88b83 [formerly e259a36575]
Former-commit-id: 9b4afeceb5
 2014-09-16 08:05:51 -04:00
Steve Harris
ac2e3f00d3 Merge branch 'master_14.3.1' (14.3.1-17) into omaha_14.3.1 
Former-commit-id: eb0a05ab81 [formerly d5c0049ba2] [formerly eb0a05ab81 [formerly d5c0049ba2] [formerly 57f0a992d9 [formerly 74d4b836dd8b2eb9a70cf772127d9b7eee23c1bf]]]
Former-commit-id: 57f0a992d9
Former-commit-id: 12f78cfbb7 [formerly e8b733fc93]
Former-commit-id: 9d32386e33
 2014-09-15 21:13:56 -05:00
Jordan Gerth
4e975af467 VLab Issue #4487 - Dim. DR 17313, Additional true color capabilities; fixes #4487 
Change-Id: I701f302aa5958e89522208fd7915f5077cf97616

Former-commit-id: 898b371293 [formerly 86b34a2f70] [formerly 898b371293 [formerly 86b34a2f70] [formerly 8f5903920c [formerly 1300009502bafd34fee13c8d21d65208b1069bda]]]
Former-commit-id: 8f5903920c
Former-commit-id: 2547f60b3a [formerly ac5b372773]
Former-commit-id: d9c08b7cac
 2014-09-15 19:14:13 -05:00
Slav Korolev
4c3ef86cc7 Issue #2757 - Removed unnecessary dialogs. 
Former-commit-id: 3ee0058def [formerly d682a69b8d] [formerly 3ee0058def [formerly d682a69b8d] [formerly 65d1cca6fd [formerly 1a906e4f7a5e7cc9e4cd8b4a717f0f2bb02cbb61]]]
Former-commit-id: 65d1cca6fd
Former-commit-id: dcda070d33 [formerly 5e84bc687e]
Former-commit-id: d122ed79db
 2014-09-15 17:46:10 -04:00
Jordan Gerth
a023705448 VLab Issue #4723 - Ingest LambertConformal projection with two standard parallels using RegionalSat; fixes #4723 
Change-Id: I20b309f4e994259a54e6bdb2276bc09a6b60a885

Former-commit-id: 478c9db8d3 [formerly d6eb692733] [formerly 478c9db8d3 [formerly d6eb692733] [formerly 0b425f94eb [formerly baf75c177b595dcfb545436586c31d28080b8281]]]
Former-commit-id: 0b425f94eb
Former-commit-id: 900cec4f8a [formerly ebab90b24d]
Former-commit-id: 4e6aedae09
 2014-09-15 16:30:22 -05:00
Matthew Howard
6bd366d178 Merge "ASM #641 - Filtered cases where Areas do not match Zones." into asm_14.3.1 
Former-commit-id: 4c650fec35 [formerly aa273ffb70] [formerly 4c650fec35 [formerly aa273ffb70] [formerly 6e0d48d840 [formerly f33abc302597a3120c9220278e28d865d5f185b6]]]
Former-commit-id: 6e0d48d840
Former-commit-id: 7f464afac7 [formerly 5a54cf0d33]
Former-commit-id: 3508956a81
 2014-09-15 15:03:36 -05:00
Daniel.Huffman
3621d185ed ASM #641 - Filtered cases where Areas do not match Zones. 
Change-Id: I1207442f77aece9d79b010669755ee7fc6f82362

Former-commit-id: da198f916a [formerly bacc914bd0] [formerly da198f916a [formerly bacc914bd0] [formerly 0f30c0f897 [formerly bf6acaafc42ba98e4257d3eb089b7a1e7adf7bd4]]]
Former-commit-id: 0f30c0f897
Former-commit-id: 5e9b53f601 [formerly 716bc02504]
Former-commit-id: 49797e0c78
 2014-09-15 19:18:33 +00:00
Xuezhi.Wei
9ed5d0d705 ASM #648 fix for the top of the hour issue for hourlypp 
Change-Id: I794837427ee6f8dbc615cbd010aeb662ccad9896

Former-commit-id: 0933440c37 [formerly 42719b2d5b] [formerly 0933440c37 [formerly 42719b2d5b] [formerly bca2affc40 [formerly 2d36b1b9ed31404ca9c9a4ecfdbf5f1e40c05b54]]]
Former-commit-id: bca2affc40
Former-commit-id: 5095489f7c [formerly e5daf9e060]
Former-commit-id: d33f4a4140
 2014-09-15 18:14:54 +00:00
Matthew Howard
8c260d7bef Merge "ASM #16693 - Fix spelling checker suggests swear words" into asm_14.3.1 
Former-commit-id: b6d2bf1d13 [formerly 811b79d748] [formerly b6d2bf1d13 [formerly 811b79d748] [formerly 155df2bedc [formerly 04c6dfae9b8edb836a1bad54e1b8b327c66325bb]]]
Former-commit-id: 155df2bedc
Former-commit-id: 126ceda52f [formerly 2a76dcdbf8]
Former-commit-id: f808ce4ddb
 2014-09-15 12:28:25 -05:00
Stephen Gilbert
99796454d2 Merge remote branch 'origin/master_14.3.1' into ncep_14.3.1 
Former-commit-id: e7d21b0293 [formerly 5bf2ed644a] [formerly e7d21b0293 [formerly 5bf2ed644a] [formerly 440bddda4b [formerly 2cf0da849d50a31d2ca54efeaf6e0258f33ff1d3]]]
Former-commit-id: 440bddda4b
Former-commit-id: 1ceed41334 [formerly eee81971cc]
Former-commit-id: 3106a4006c
 2014-09-15 13:20:34 -04: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
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
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
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
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
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
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
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
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
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
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
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
Chip Gobs
3e23c79eea 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

Change-Id: I12b879fb873f66d43d7f735165fa4f303c026174

Former-commit-id: da10a7b4ac [formerly fc8a7d48ca] [formerly da10a7b4ac [formerly fc8a7d48ca] [formerly 4911ac1917 [formerly 4d87ebeef93e561a303566853fd2616316c568ca]]]
Former-commit-id: 4911ac1917
Former-commit-id: 6d5926df35 [formerly 7c6f9b3ad9]
Former-commit-id: f50b09855f
 2014-09-08 11:44:48 -04:00
Matthew Howard
57b919aff9 Merge "ASM #539 Multiple flag functionality for textdb is not working properly" into asm_14.3.1 
Former-commit-id: 8e65a175fc [formerly 8ebfa3edce] [formerly 8e65a175fc [formerly 8ebfa3edce] [formerly fdfe97c659 [formerly 764e268bcccec4a805509a11fbd9c9f4e1860842]]]
Former-commit-id: fdfe97c659
Former-commit-id: d67d2d9f04 [formerly f70ccec42e]
Former-commit-id: 01febd3276
 2014-09-08 08:23:57 -05:00
Baoyu Yin
f7d802799f VLab Issue #4624 - AWIPS2_DR_17545 Volume Browser MMP units are wrong ; fixes #4624 
Change-Id: I407cf142f9adfc7601b14e12e33223cf344b596c

Former-commit-id: 11f1e39b07 [formerly 2c4a9fbe7c] [formerly 11f1e39b07 [formerly 2c4a9fbe7c] [formerly 7f317934ac [formerly 0eb76fb764113196683d8ae771d7cf37ccc86495]]]
Former-commit-id: 7f317934ac
Former-commit-id: 5aa9d0601a [formerly bca9556bd2]
Former-commit-id: dc075b1dfe
 2014-09-05 13:35:07 -04:00