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

194 commits

Author SHA1 Message Date
mjames-upc
59f1805fb8 further menu reorg 2016-01-25 16:55:38 -06:00
mjames-upc
7b854f2214 addback ldad plugins 2016-01-13 12:01:31 -07:00
mjames-upc
4a588b3703 remove ldadmesonet from metar and synop plots 2016-01-08 10:18:02 -07:00
mjames-upc
e68a98374f removing LDAD components 2016-01-07 10:53:31 -07:00
mjames-upc
0b01029e68 cleaning up unidata_15.1.1 enough to launch in eclipse 2015-12-29 20:15:31 -07:00
mjames-upc
196f6ee471 maritime menu reorg 
Former-commit-id: c4dcd4c136
 2015-12-23 21:39:09 -07:00
AWIPS User
dc8f7f341b major D2D menu updates for 14.4.2 
Former-commit-id: eb898b9ccd
 2015-10-23 18:56:09 -06:00
AWIPS User
fba03948cb remove nctaf static def from PointDataCubeAdapter 
Former-commit-id: 4582dfde5e
 2015-10-20 14:02:13 -06:00
AWIPS User
fef8091b36 move MOS menu items from ui.local to ui.obs and put in Surface menu 
Former-commit-id: b8de23b48b
 2015-10-15 09:54:55 -06:00
AWIPS User
262f365abd sfc/warn/hydro menu reorganization 
Former-commit-id: 1a598543ad
 2015-09-19 11:37:29 -06:00
AWIPS User
d659c3e5b3 sfc/warning menu reorganization 
Former-commit-id: eccee579be
 2015-09-18 23:47:30 -06:00
AWIPS User
af740c8da3 menu changes and grid names 
Former-commit-id: 81a569898b [formerly 7b419a2fd1] [formerly b089ea25f508301e99397abae541aa51d123b414 [formerly aac1cde7c4]]
Former-commit-id: c459b2db09cb44a4b26b81fbbc44eb4643968192 [formerly 6daec9740c]
Former-commit-id: 375ca58d7d
 2015-07-22 17:24:11 -06:00
AWIPS User
7101784a38 D2D menus 
Former-commit-id: b992f650c3 [formerly 0e116e6e5a] [formerly 1c74b47a384ca893f233d0e5aa1c22ab4d23dd24 [formerly 2a6d837672]]
Former-commit-id: cbc7b955d1b9dd187b1b63139e38924d8eb92a49 [formerly 9ba75100cb]
Former-commit-id: 3337eead54
 2015-04-22 17:05:35 -06:00
Joshua Watson
7fd62ccf83 VLab Issue #6761 - Removed non-functional IFPS menu items and renamed Eta to NAM for menu and display purposes in baseTDLSurface.xml. Changed stdWindDir to windDir in stdDesign.svg; fixes #6761 
Change-Id: Ie07f461ae6c85054b233f9cfc68d229c80c9789f

Former-commit-id: e0bcd4f251526348d91930953c6c447e423f03ce
 2015-03-05 11:55:07 -05:00
Fay.Liang
c6bd5d7675 ASM #15311 - Merge and Build Support - Merge ASM delivery into 14.4.1-1m. 
Merge branch 'asm_14.4.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.4.1

Conflicts:
	cave/com.raytheon.viz.gfe/localization/gfe/userPython/utilities/SmartScript.py
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/ChooseDataPeriodDialog.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
	edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTable.java
	rpms/awips2.core/Installer.postgres/component.spec
	rpms/awips2.core/Installer.python/component.spec
	rpms/awips2.core/Installer.tools/component.spec
	rpms/python.site-packages/Installer.h5py/component.spec
	rpms/python.site-packages/Installer.matplotlib/component.spec
	rpms/python.site-packages/Installer.nose/component.spec
	rpms/python.site-packages/Installer.pupynere/component.spec
	rpms/python.site-packages/Installer.qpid/component.spec
	rpms/python.site-packages/Installer.scientific/component.spec
	rpms/python.site-packages/Installer.scipy/component.spec
	rpms/python.site-packages/Installer.shapely/component.spec
	rpms/python.site-packages/Installer.tables/component.spec

Former-commit-id: 1f331890b8fc38b4f8ed3a3debc66b8fedba4fdd
 2015-01-12 13:03:31 -05:00
Fay.Liang
bccf70f0bd ASM #15311 - Merge and Build Support - Merge ASM delivery into 14.4.1-1m. 
Merge branch 'asm_14.4.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.4.1

Conflicts:
	cave/com.raytheon.viz.gfe/localization/gfe/userPython/utilities/SmartScript.py
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/ChooseDataPeriodDialog.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
	edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTable.java
	rpms/awips2.core/Installer.postgres/component.spec
	rpms/awips2.core/Installer.python/component.spec
	rpms/awips2.core/Installer.tools/component.spec
	rpms/python.site-packages/Installer.h5py/component.spec
	rpms/python.site-packages/Installer.matplotlib/component.spec
	rpms/python.site-packages/Installer.nose/component.spec
	rpms/python.site-packages/Installer.pupynere/component.spec
	rpms/python.site-packages/Installer.qpid/component.spec
	rpms/python.site-packages/Installer.scientific/component.spec
	rpms/python.site-packages/Installer.scipy/component.spec
	rpms/python.site-packages/Installer.shapely/component.spec
	rpms/python.site-packages/Installer.tables/component.spec

Former-commit-id: 19a29da5de [formerly 6b77894bd0] [formerly c6bd5d7675] [formerly 19a29da5de [formerly 6b77894bd0] [formerly c6bd5d7675] [formerly eed6737801 [formerly c6bd5d7675 [formerly 1f331890b8fc38b4f8ed3a3debc66b8fedba4fdd]]]]
Former-commit-id: eed6737801
Former-commit-id: 23ba9f4154 [formerly f3ecae8573] [formerly 69382d354f0cba941ad1b60d73cca2d121eb949e [formerly 5cc8e5b4af]]
Former-commit-id: cd3c370873d18a2ca3801fd2f83aa4f8b35fe06e [formerly 06ac6b396e]
Former-commit-id: 1e9024ede9
 2015-01-12 13:03:31 -05:00
Kiran.Shrestha
7f731a767f ASM #14130 Satellite: Derived Products Plots problems for SSM/I Point Data 
Change-Id: Id3c2189c017bf6341bc09236dbd39aaff937e2c8

Former-commit-id: 56ff684e6425b43883603f46ef16127e8356450a
 2014-12-17 21:03:18 +00:00
Kiran.Shrestha
4b3f553846 ASM #14130 Satellite: Derived Products Plots problems for SSM/I Point Data 
Change-Id: Id3c2189c017bf6341bc09236dbd39aaff937e2c8

Former-commit-id: 9635e53739 [formerly 5f7e529f37] [formerly 7f731a767f] [formerly 9635e53739 [formerly 5f7e529f37] [formerly 7f731a767f] [formerly 10de233231 [formerly 7f731a767f [formerly 56ff684e6425b43883603f46ef16127e8356450a]]]]
Former-commit-id: 10de233231
Former-commit-id: c0f978e0d7 [formerly dbf9c9fc4c] [formerly 628804d50a4274f6371e5a8d27e744def4c97711 [formerly 9061406068]]
Former-commit-id: 8fab2c80fed4b17aa71b12d4e7a26fdaa573ebf1 [formerly 6586802ea5]
Former-commit-id: f1d6cff7a5
 2014-12-17 21:03:18 +00:00
Mark Peters
88b07ddb46 Omaha #3772 Separate Obs menu out of com.raytheon.uf.viz.d2d.ui plugin 
Change-Id: I5e407aeff99d7dc9a393d713096971a7ed4c01a6

Former-commit-id: d946679c5a9b383f689ac3acc66d4aae4ecc4bde
 2014-10-31 13:32:42 -05:00
Mark Peters
3edaa12d73 Omaha #3772 Separate Obs menu out of com.raytheon.uf.viz.d2d.ui plugin 
Change-Id: I5e407aeff99d7dc9a393d713096971a7ed4c01a6

Former-commit-id: 903cef25a2 [formerly a460792af8] [formerly 88b07ddb46] [formerly 903cef25a2 [formerly a460792af8] [formerly 88b07ddb46] [formerly bc9c564192 [formerly 88b07ddb46 [formerly d946679c5a9b383f689ac3acc66d4aae4ecc4bde]]]]
Former-commit-id: bc9c564192
Former-commit-id: 7c4a21b823 [formerly bf2ec95e77] [formerly 9f74ce45df839f0d03491da44065d4c4b7e889f8 [formerly 64e9590b5b]]
Former-commit-id: 12780e8ab5fe335736ea2caa6b642f0a4e931b2f [formerly b253e61810]
Former-commit-id: 87e18fa4d3
 2014-10-31 13:32:42 -05:00
Brian Clements
423421175f Omaha #2707 LSR rework 
removed dataURI column from DB
removed eventType from hdf5
eventType in DB now string
unknown event types now render direct

Change-Id: I24f5041f761758371dcef1fd1157be0bcf329e73

Former-commit-id: 9950454fbe4158bcfcb9d3ce25abafad4d012556
 2014-09-17 10:57:07 -05:00
Brian Clements
242b6b6c9a Omaha #2707 LSR rework 
removed dataURI column from DB
removed eventType from hdf5
eventType in DB now string
unknown event types now render direct

Change-Id: I24f5041f761758371dcef1fd1157be0bcf329e73

Former-commit-id: 9f4315eb5c [formerly 84f85d1436] [formerly 423421175f] [formerly 9f4315eb5c [formerly 84f85d1436] [formerly 423421175f] [formerly 6fd51c01fe [formerly 423421175f [formerly 9950454fbe4158bcfcb9d3ce25abafad4d012556]]]]
Former-commit-id: 6fd51c01fe
Former-commit-id: 3ab2f5bfc3 [formerly 34d9bee33d] [formerly 8b4a5b288e44debf022bee24bf84490c234b485e [formerly c4abe5b471]]
Former-commit-id: b66bd7a958432ca80c654eb7a6b9f61fa3a85e54 [formerly 0944f06460]
Former-commit-id: eeda187c02
 2014-09-17 10:57:07 -05:00
Nate Jensen
ae9cffaaea Omaha #3356 updates for improved level lookup 
Change-Id: I32ca44114fb18770bff22c6d0c9173e8fa49a362

Former-commit-id: 0ca90b58d7ca85d5bfc8fc525415115ac8451c5b
 2014-09-09 15:38:53 -05:00
Nate Jensen
5bf7a632ad Omaha #3356 updates for improved level lookup 
Change-Id: I32ca44114fb18770bff22c6d0c9173e8fa49a362

Former-commit-id: 1e06c862bf [formerly 1c77f66608] [formerly ae9cffaaea] [formerly 1e06c862bf [formerly 1c77f66608] [formerly ae9cffaaea] [formerly 62b84b2fb3 [formerly ae9cffaaea [formerly 0ca90b58d7ca85d5bfc8fc525415115ac8451c5b]]]]
Former-commit-id: 62b84b2fb3
Former-commit-id: 925288784b [formerly d397d4147c] [formerly 87f7aeab8ea0381f4b60524400099467d56eef15 [formerly f5ae895143]]
Former-commit-id: 14cf3a3aaa85b3c7504b40d5dab981a05190edd4 [formerly eec3df9cd5]
Former-commit-id: 3cf27fb414
 2014-09-09 15:38:53 -05:00
Mark Peters
ca0df210d9 Omaha #3504 Replace Raytheon references to IODataPreparer 
Change-Id: I376f430154996944bd49c2e72d89e57537b68084

Former-commit-id: 08621067f8046b4260e87583d16950fee1e741de
 2014-08-12 12:15:35 -05:00
Mark Peters
ad25464a52 Omaha #3504 Replace Raytheon references to IODataPreparer 
Change-Id: I376f430154996944bd49c2e72d89e57537b68084

Former-commit-id: 4ab3b14b30 [formerly 70a7f2215f] [formerly ca0df210d9] [formerly 4ab3b14b30 [formerly 70a7f2215f] [formerly ca0df210d9] [formerly 5b3893c56f [formerly ca0df210d9 [formerly 08621067f8046b4260e87583d16950fee1e741de]]]]
Former-commit-id: 5b3893c56f
Former-commit-id: 7a20ac041a [formerly 4140e1cc8c] [formerly f8ddd5f2b8efb749fc2d5859b0f53ae36bcb2e3d [formerly 1ae1220e4a]]
Former-commit-id: 00c5eaac58b471bfab35dde3477af837703421af [formerly 02814f3400]
Former-commit-id: ac75dda420
 2014-08-12 12:15:35 -05:00
Brian Clements
f8a1e79288 Omaha #3477 changed plot info locations to floats 
Change-Id: I592ba9d4b514aaed8902f3e8fba33b58200e1c61

Former-commit-id: 00504d6aa7fefd7b6d28701aae777c0fb7d5ace5
 2014-08-11 13:43:22 -05:00
Brian Clements
78f80b3057 Omaha #3477 changed plot info locations to floats 
Change-Id: I592ba9d4b514aaed8902f3e8fba33b58200e1c61

Former-commit-id: 73b2585d80 [formerly 3b97fd15a7] [formerly f8a1e79288] [formerly 73b2585d80 [formerly 3b97fd15a7] [formerly f8a1e79288] [formerly 8738e9cece [formerly f8a1e79288 [formerly 00504d6aa7fefd7b6d28701aae777c0fb7d5ace5]]]]
Former-commit-id: 8738e9cece
Former-commit-id: 393659ece8 [formerly 90a17fa5a6] [formerly cc959db02bdac9bc65cd7a6ddad09207c1ce1224 [formerly a180c212c9]]
Former-commit-id: c98315075490f91f8cf521ed63c62b0940c10bfc [formerly fd5c0ea481]
Former-commit-id: 8b8ad6e45e
 2014-08-11 13:43:22 -05:00
Brian Clements
9374355af3 Omaha #3478 removed PointDataDescription.Type.Double from code and config 
Change-Id: I85eabcbe7afc0543c98d23e2c194b9e30a14db13

Former-commit-id: b548a88c6850a558c021a55657edaa6466d57e51
 2014-08-07 10:40:14 -05:00
Brian Clements
16c66cdd48 Omaha #3478 removed PointDataDescription.Type.Double from code and config 
Change-Id: I85eabcbe7afc0543c98d23e2c194b9e30a14db13

Former-commit-id: 3e75cc1897 [formerly 1538c88955] [formerly 9374355af3] [formerly 3e75cc1897 [formerly 1538c88955] [formerly 9374355af3] [formerly a46c71bbfb [formerly 9374355af3 [formerly b548a88c6850a558c021a55657edaa6466d57e51]]]]
Former-commit-id: a46c71bbfb
Former-commit-id: 2103d53c3b [formerly 30efe7a212] [formerly 1252596e6e6dc08d41c376dd4fb3f1b8fea2270b [formerly b52a9a1e23]]
Former-commit-id: ff3d3efca55c36d14728e5229992d1a7d7388042 [formerly 2333e17e5b]
Former-commit-id: 2425a855a3
 2014-08-07 10:40:14 -05:00
Brian Clements
aa991c9223 Omaha #3410 changed lon/lat fields to floats in sfc and air obs location 
Change-Id: I4c8d47b9f9e598e69309f1aa99bc30c022cae7af

Former-commit-id: cdb0a72fcb2345564f2b944fdecd7869fd498767
 2014-07-24 13:45:58 -05:00
Brian Clements
2a7043033c Omaha #3410 changed lon/lat fields to floats in sfc and air obs location 
Change-Id: I4c8d47b9f9e598e69309f1aa99bc30c022cae7af

Former-commit-id: 26ade7cae8 [formerly a7d17bd490] [formerly aa991c9223] [formerly 26ade7cae8 [formerly a7d17bd490] [formerly aa991c9223] [formerly 74a6c3dd20 [formerly aa991c9223 [formerly cdb0a72fcb2345564f2b944fdecd7869fd498767]]]]
Former-commit-id: 74a6c3dd20
Former-commit-id: d395fc27fc [formerly 5977b049c1] [formerly 53a85ec6b9da7b5e37777469d995ba034e153ce6 [formerly 10ea02b936]]
Former-commit-id: 165edd61e4cf5f8b3c8f4d5abc9d215a41539cc6 [formerly 053cf978a7]
Former-commit-id: 8a256eb228
 2014-07-24 13:45:58 -05:00
Ben Steffensmeier
f66725a515 Omaha #2061 Remove dataURI from acars. 
Former-commit-id: e8b5ea58ca12878922be01c815a354703f5f4387
 2014-06-12 13:59:45 -05:00
Ben Steffensmeier
d9d9adcd51 Omaha #2061 Remove dataURI from acars. 
Former-commit-id: baec34d0ab [formerly 0a6e99e9d1] [formerly f66725a515] [formerly baec34d0ab [formerly 0a6e99e9d1] [formerly f66725a515] [formerly 35ad2f2b8d [formerly f66725a515 [formerly e8b5ea58ca12878922be01c815a354703f5f4387]]]]
Former-commit-id: 35ad2f2b8d
Former-commit-id: 424dc5f1ed [formerly 4e3a8e97fe] [formerly 97fb2d18a8c220127d0a99f5a48ce942f2d7954a [formerly e227d408db]]
Former-commit-id: a6c782493c2b11776e2efc2dcd6010d50addcf85 [formerly 81b4860e27]
Former-commit-id: deaecfc649
 2014-06-12 13:59:45 -05:00
Nate Jensen
205e491d71 Omaha #3266 remove unused attributes and elements from baseline menu xml 
files

Change-Id: I1a1f75f2b2a314679487ddf719f4f0055bdf8d01

Former-commit-id: 797504a970ec39c4fd56c9e0d51b292acfceea1b
 2014-06-10 18:30:14 -05:00
Nate Jensen
2e96094926 Omaha #3266 remove unused attributes and elements from baseline menu xml 
files

Change-Id: I1a1f75f2b2a314679487ddf719f4f0055bdf8d01

Former-commit-id: 7783919a76 [formerly 23f3a15f31] [formerly 205e491d71] [formerly 7783919a76 [formerly 23f3a15f31] [formerly 205e491d71] [formerly 955e115c00 [formerly 205e491d71 [formerly 797504a970ec39c4fd56c9e0d51b292acfceea1b]]]]
Former-commit-id: 955e115c00
Former-commit-id: 090e92c5a9 [formerly f9d4da37b1] [formerly e7972d10e8e9f8d2d57b2115e4f5431b97c32a6a [formerly f634182937]]
Former-commit-id: 656899700d1a93fd86eeabfea200d00c94ba1839 [formerly 70589056d1]
Former-commit-id: fa9e075a44
 2014-06-10 18:30:14 -05:00
Ben Steffensmeier
1e37d669d8 Omaha #2061 Delete PlotResource, rename PlotResource2. 
Former-commit-id: b569c7c3e175ed1519576aea63048c3f675d3875
 2014-06-10 15:59:15 -05:00
Ben Steffensmeier
e0d3a7d6d9 Omaha #2061 Delete PlotResource, rename PlotResource2. 
Former-commit-id: 1191aa9adf [formerly bcc7243358] [formerly 1e37d669d8] [formerly 1191aa9adf [formerly bcc7243358] [formerly 1e37d669d8] [formerly a98872cb89 [formerly 1e37d669d8 [formerly b569c7c3e175ed1519576aea63048c3f675d3875]]]]
Former-commit-id: a98872cb89
Former-commit-id: ec7c42dd48 [formerly bbcec7c004] [formerly 12e70d14ff5c3857021a22734b1090ee010e2a95 [formerly d40c6fd625]]
Former-commit-id: a44da7daa093da279e8400476e0f40922dd35b74 [formerly 6a5b6dcf8e]
Former-commit-id: 178b7509db
 2014-06-10 15:59:15 -05:00
Steve Harris
99bc6f990c Merge branch master_14.2.2-10 into master_14.3.1-6 CM-MERGE:OB14.2.2-7,-8,-9,-10 into 14.3.1 
Conflicts:
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG518E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG549E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG579E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_122E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_152E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_183E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_20.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_213E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_244E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_274E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_30.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_305E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_335E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_366E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_396E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_40.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_427E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_457E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_488E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_50.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_610E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_61E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_640E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_671E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_701E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_732E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_762E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_91E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge0ftIncr_PHISH.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge1ftIncr_PHISH.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge2ftIncr_PHISH.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge3ftIncr_PHISH.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_122E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_152E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_183E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_20.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_213E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_244E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_274E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_30.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_305E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_335E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_366E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_396E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_40.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_427E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_457E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_488E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_50.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_610E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_61E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_640E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_671E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_701E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_732E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_762E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_91E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/Wind.xml
	cave/com.raytheon.uf.viz.derivparam/src/com/raytheon/uf/viz/derivparam/library/DerivedParameterGenerator.java
	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.grid/localization/volumebrowser/FieldDisplayTypes.xml
	cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/D2DGridResource.java
	cave/com.raytheon.viz.volumebrowser/localization/menus/xml/planesMenusPlanView.xml
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/Area.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/Wx.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
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/text/AbstractLockingBehavior.java
	cave/com.raytheon.viz.warnings/src/com/raytheon/viz/warnings/rsc/WarningsResource.java
	edexOsgi/build.edex/esb/conf/spring/64-bit/architecture.properties
	edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
	edexOsgi/com.raytheon.edex.plugin.warning/src/com/raytheon/edex/plugin/warning/gis/GeospatialDataGenerator.java
	edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPUtils.java
	edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/db/objects/GridLocation.java
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG518E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG549E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG579E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_122E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_152E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_183E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_20.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_213E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_244E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_274E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_30.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_305E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_335E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_366E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_396E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_40.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_427E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_457E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_488E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_50.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_610E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_61E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_640E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_671E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_701E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_732E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_762E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_91E2.xml
	edexOsgi/com.raytheon.uf.edex.plugin.datadelivery.retrieval/res/spring/retrieval-common.xml

Change-Id: Id84acd273efd3da66b423533cac93bf445fabb66

Former-commit-id: 117fa26f537131552bbe51b2c5fe12405a26db32
 2014-05-27 14:48:24 -04:00
Steve Harris
cf2950abdb Merge branch master_14.2.2-10 into master_14.3.1-6 CM-MERGE:OB14.2.2-7,-8,-9,-10 into 14.3.1 
Conflicts:
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG518E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG549E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG579E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_122E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_152E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_183E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_20.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_213E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_244E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_274E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_30.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_305E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_335E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_366E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_396E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_40.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_427E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_457E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_488E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_50.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_610E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_61E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_640E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_671E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_701E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_732E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_762E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_91E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge0ftIncr_PHISH.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge1ftIncr_PHISH.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge2ftIncr_PHISH.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge3ftIncr_PHISH.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_122E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_152E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_183E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_20.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_213E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_244E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_274E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_30.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_305E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_335E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_366E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_396E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_40.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_427E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_457E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_488E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_50.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_610E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_61E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_640E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_671E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_701E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_732E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_762E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_91E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/Wind.xml
	cave/com.raytheon.uf.viz.derivparam/src/com/raytheon/uf/viz/derivparam/library/DerivedParameterGenerator.java
	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.grid/localization/volumebrowser/FieldDisplayTypes.xml
	cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/D2DGridResource.java
	cave/com.raytheon.viz.volumebrowser/localization/menus/xml/planesMenusPlanView.xml
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/Area.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/Wx.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
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/text/AbstractLockingBehavior.java
	cave/com.raytheon.viz.warnings/src/com/raytheon/viz/warnings/rsc/WarningsResource.java
	edexOsgi/build.edex/esb/conf/spring/64-bit/architecture.properties
	edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
	edexOsgi/com.raytheon.edex.plugin.warning/src/com/raytheon/edex/plugin/warning/gis/GeospatialDataGenerator.java
	edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPUtils.java
	edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/db/objects/GridLocation.java
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG518E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG549E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG579E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_122E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_152E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_183E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_20.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_213E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_244E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_274E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_30.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_305E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_335E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_366E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_396E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_40.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_427E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_457E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_488E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_50.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_610E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_61E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_640E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_671E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_701E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_732E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_762E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_91E2.xml
	edexOsgi/com.raytheon.uf.edex.plugin.datadelivery.retrieval/res/spring/retrieval-common.xml

Change-Id: Id84acd273efd3da66b423533cac93bf445fabb66

Former-commit-id: 08308cd279 [formerly 3de24b7b07] [formerly 99bc6f990c] [formerly 08308cd279 [formerly 3de24b7b07] [formerly 99bc6f990c] [formerly 3b16bbafb1 [formerly 99bc6f990c [formerly 117fa26f537131552bbe51b2c5fe12405a26db32]]]]
Former-commit-id: 3b16bbafb1
Former-commit-id: 9458ea3648 [formerly bfa4255eea] [formerly 85d55d73802af25d3be5119fe234f4bf09ff39dc [formerly 9b98b41cd4]]
Former-commit-id: a54e34e905540883ccd6d6eb5c78370ac905f651 [formerly 144354c369]
Former-commit-id: 172cca39d9
 2014-05-27 14:48:24 -04:00
Steve Harris
cf62cf4a6e Merge branch 'master_14.1.2' (-4) into master_14.2.1 (-23) 
Conflicts:
	cave/com.raytheon.uf.viz.d2d.core/src/com/raytheon/uf/viz/d2d/core/time/D2DTimeMatcher.java
	cave/com.raytheon.uf.viz.d2d.core/src/com/raytheon/uf/viz/d2d/core/time/TimeMatcher.java
	edexOsgi/com.raytheon.edex.plugin.shef/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.edex.plugin.warning/src/com/raytheon/edex/plugin/warning/gis/GeospatialDataGenerator.java
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/config/DialogConfiguration.java
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/config/WarngenConfiguration.java
	tests/.classpath
	tests/unit/com/raytheon/edex/plugin/shef/TestM2SOptions.java
	tests/unit/com/raytheon/edex/plugin/shef/TestMetarToShefTransformer.java

Former-commit-id: a830db2a282e6a29d119fc0d3357c2223c48d175
 2014-05-12 16:13:19 -05:00
Steve Harris
24df80c520 Merge branch 'master_14.1.2' (-4) into master_14.2.1 (-23) 
Conflicts:
	cave/com.raytheon.uf.viz.d2d.core/src/com/raytheon/uf/viz/d2d/core/time/D2DTimeMatcher.java
	cave/com.raytheon.uf.viz.d2d.core/src/com/raytheon/uf/viz/d2d/core/time/TimeMatcher.java
	edexOsgi/com.raytheon.edex.plugin.shef/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.edex.plugin.warning/src/com/raytheon/edex/plugin/warning/gis/GeospatialDataGenerator.java
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/config/DialogConfiguration.java
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/config/WarngenConfiguration.java
	tests/.classpath
	tests/unit/com/raytheon/edex/plugin/shef/TestM2SOptions.java
	tests/unit/com/raytheon/edex/plugin/shef/TestMetarToShefTransformer.java

Former-commit-id: 343444715e [formerly 848519177d] [formerly cf62cf4a6e] [formerly 343444715e [formerly 848519177d] [formerly cf62cf4a6e] [formerly fc2bf6b45c [formerly cf62cf4a6e [formerly a830db2a282e6a29d119fc0d3357c2223c48d175]]]]
Former-commit-id: fc2bf6b45c
Former-commit-id: ae2d525c8a [formerly 32f255cada] [formerly a8635bd2e1fdd0fe84e47c2435e9f0073d86e4e2 [formerly 233922471a]]
Former-commit-id: d12e1920a9ce76da64ae45fed23fe5b2ed9fa884 [formerly 74a325ce74]
Former-commit-id: 82045e2409
 2014-05-12 16:13:19 -05:00
Brian.Dyke
386ec058e1 CM-MERGE:OB13.5.5-5 into 14.1.2 
Former-commit-id: 3b0df2482b87ba9d37dd32d50e8e1fc3b3ae55e3
 2014-05-12 14:07:11 -04:00
Brian.Dyke
9bc1055c87 CM-MERGE:OB13.5.5-5 into 14.1.2 
Former-commit-id: 82ce970ad6 [formerly 3aa2f7974b] [formerly 386ec058e1] [formerly 82ce970ad6 [formerly 3aa2f7974b] [formerly 386ec058e1] [formerly 41ba5fc348 [formerly 386ec058e1 [formerly 3b0df2482b87ba9d37dd32d50e8e1fc3b3ae55e3]]]]
Former-commit-id: 41ba5fc348
Former-commit-id: 4004b627e2 [formerly dc5bc1d2a4] [formerly 3193dce8b50276edb5c6e0829236339aa91b9172 [formerly 2f704c898d]]
Former-commit-id: 4b5ff1e5a8372daadb66b3b58132714ed0a54eae [formerly 82663c0ab6]
Former-commit-id: 464cc1a479
 2014-05-12 14:07:11 -04:00
Everett Kladstrup
06d6961c0f Issue #2725 Move derived parameters logic to common 
* Make derived parameters not use VizException
* Move derived parameters packages from the viz hierarchy
  to the common hierarchy
* Move data cube classes that don't depend on derived parameters
  to thier own plugin
* Moved DataCubeContainer and supporting frontend classes from
  viz.core to viz.datacube


Former-commit-id: ad4a8cfbbc6de72810492c8f1de9701d381b6019
 2014-04-09 09:31:12 -05:00
Everett Kladstrup
f815fbcb60 Issue #2725 Move derived parameters logic to common 
* Make derived parameters not use VizException
* Move derived parameters packages from the viz hierarchy
  to the common hierarchy
* Move data cube classes that don't depend on derived parameters
  to thier own plugin
* Moved DataCubeContainer and supporting frontend classes from
  viz.core to viz.datacube


Former-commit-id: eab1358602 [formerly 8b19b3601a] [formerly 06d6961c0f] [formerly eab1358602 [formerly 8b19b3601a] [formerly 06d6961c0f] [formerly 0699041518 [formerly 06d6961c0f [formerly ad4a8cfbbc6de72810492c8f1de9701d381b6019]]]]
Former-commit-id: 0699041518
Former-commit-id: 29ce7781c9 [formerly 86bf2b5ea0] [formerly eb5b00071037510aefc04c8c20411cc18c44abb0 [formerly 260d0beddc]]
Former-commit-id: 41d01092799ccea952f65c9d6b66d93b56557541 [formerly d96b56c91a]
Former-commit-id: 7b2683532a
 2014-04-09 09:31:12 -05:00
Nate Jensen
fe33896e7e Issue #2868 plot delegate python now uses PythonCoordinatorJob API, 
Refactored plot data request, image creation, and sample
              threading

Change-Id: I3e1a3dc70b2346aa826ec4509ee7a3e59c61a918

Former-commit-id: e421731415d798487c96dd1e56b6f02347d9aa26
 2014-03-24 14:59:31 -05:00
Nate Jensen
6897e58b4e Issue #2868 plot delegate python now uses PythonCoordinatorJob API, 
Refactored plot data request, image creation, and sample
              threading

Change-Id: I3e1a3dc70b2346aa826ec4509ee7a3e59c61a918

Former-commit-id: 85b411bca3 [formerly 2418c9bdfe] [formerly fe33896e7e] [formerly 85b411bca3 [formerly 2418c9bdfe] [formerly fe33896e7e] [formerly c4beb293b9 [formerly fe33896e7e [formerly e421731415d798487c96dd1e56b6f02347d9aa26]]]]
Former-commit-id: c4beb293b9
Former-commit-id: df01318647 [formerly 0acb4621f9] [formerly 3d803664963a310bbf45fe46e8f20c9255a3b529 [formerly 774091461c]]
Former-commit-id: c0e78be8fc6eca4dfac050feb6b22af3fded1f5c [formerly 96339798b5]
Former-commit-id: 5b6683bd56
 2014-03-24 14:59:31 -05:00
Ron Anderson
1c727465ee Issue #2718 Update to GeoTools 10.5 
Undo reformatting of ncep code
            Move com.raytheon.edex.common.shapefiles.ShapeFile.java to com.raytheon.edex.plugin.radar.util

Change-Id: I2bdf4d7d08061ace24589dafca26f00bac00aa2a

Former-commit-id: efc65ad66fc4df90319f821f289e13dc9dbeb3a0
 2014-03-13 11:11:53 -05:00
Ron Anderson
9accd00e1f Issue #2718 Update to GeoTools 10.5 
Undo reformatting of ncep code
            Move com.raytheon.edex.common.shapefiles.ShapeFile.java to com.raytheon.edex.plugin.radar.util

Change-Id: I2bdf4d7d08061ace24589dafca26f00bac00aa2a

Former-commit-id: d752e068c7 [formerly ab69d3e318] [formerly 1c727465ee] [formerly d752e068c7 [formerly ab69d3e318] [formerly 1c727465ee] [formerly bcfaf40ebf [formerly 1c727465ee [formerly efc65ad66fc4df90319f821f289e13dc9dbeb3a0]]]]
Former-commit-id: bcfaf40ebf
Former-commit-id: cbd408ce4e [formerly 06b0b5b684] [formerly c46a1807b76708c6b5217ba3deb670bd9ca60b66 [formerly 4b2a388628]]
Former-commit-id: cfe7b7159bee965bab52438c7b1f622e5351016b [formerly 4ffc16ce53]
Former-commit-id: 98e22f6e59
 2014-03-13 11:11:53 -05:00