Commit graph

156 commits

Author SHA1 Message Date
Steve Harris
07c7b38a12 Merge tag 'OB_14.3.1-19m' into omaha_14.4.1
Conflicts:
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/ext/imaging/GLColormappedImageExtension.java
	cave/com.raytheon.viz.satellite/src/com/raytheon/viz/satellite/rsc/SatResource.java
	cave/com.raytheon.viz.volumebrowser/localization/menus/xml/planesMenusPlanView.xml
	edexOsgi/com.raytheon.edex.plugin.satellite/src/com/raytheon/edex/util/satellite/SatSpatialFactory.java
	edexOsgi/com.raytheon.uf.common.colormap/src/com/raytheon/uf/common/colormap/prefs/DataMappingPreferences.java
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/mmp.xml
	nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.pproc.so
	nativeLib/files.native/edex/lib/native/linux32/library.ohd.pproc.so
	ohd/gov.noaa.nws.ohd.edex.plugin.hydrodualpol/src/gov/noaa/nws/ohd/edex/plugin/hydrodualpol/DSAProductProcessor.java

Former-commit-id: db4aa1cebe [formerly 2e2072a963] [formerly 7692e3f21d] [formerly db4aa1cebe [formerly 2e2072a963] [formerly 7692e3f21d] [formerly b979960b7b [formerly 7692e3f21d [formerly 72f387d2802c12eedfe5643616fe5a54420aef66]]]]
Former-commit-id: b979960b7b
Former-commit-id: 4c7af33eee [formerly e5f8a8f74f] [formerly bb2bf4306deda494aadd9b7efdffeebf393b4e15 [formerly 50d6dccd09]]
Former-commit-id: 0542ccaca6c476485c13ff1fd290c8c34213e7a0 [formerly f831536854]
Former-commit-id: d3169a96b0
2014-09-23 11:41:10 -05:00
Steve Harris
b316e73f24 Merge branch 'omaha_14.3.1' into omaha_14.4.1
Conflicts:
	cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/ArchiveRetentionDlg.java
	cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/Cities.xml
	cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/FAA/Airports.xml
	cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/FAA/Fix.xml
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/reflect/BundleReflections.java
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/reflect/SubClassLocator.java
	cave/com.raytheon.uf.viz.monitor.fog/src/com/raytheon/uf/viz/monitor/fog/ui/dialogs/FogMonitoringAreaConfigDlg.java
	cave/com.raytheon.uf.viz.monitor.safeseas/src/com/raytheon/uf/viz/monitor/safeseas/ui/dialogs/SSMonitoringAreaConfigDlg.java
	cave/com.raytheon.uf.viz.monitor.snow/src/com/raytheon/uf/viz/monitor/snow/ui/dialogs/SnowMonitoringAreaConfigDlg.java
	cave/com.raytheon.uf.viz.ui.menus/src/com/raytheon/uf/viz/ui/menus/widgets/tearoff/MenuItemComposite.java
	cave/com.raytheon.uf.viz.ui.menus/src/com/raytheon/uf/viz/ui/menus/widgets/tearoff/TearOffMenuDialog.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/ext/imaging/GLDataMappingFactory.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/DataManager.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/ParmManager.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/textformatter/CombinationsFileUtil.java
	cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/rsc/graphic/RadarGraphicsPage.java
	cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/rsc/mosaic/RadarMosaicResource.java
	cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/ui/xy/RadarGSMResource.java
	cave/com.raytheon.viz.ui.personalities.awips/src/com/raytheon/viz/ui/personalities/awips/AbstractCAVEComponent.java
	cave/com.raytheon.viz.ui/META-INF/MANIFEST.MF
	cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/colormap/ColorMapTree.java
	cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/dialogs/ColormapComp.java
	cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/dialogs/ImagingDialog.java
	cave/com.raytheon.viz.volumebrowser/localization/menus/xml/fieldsMenus.xml
	cave/com.raytheon.viz.volumebrowser/localization/menus/xml/planesMenusPlanView.xml
	cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
	edexOsgi/com.raytheon.uf.common.datadelivery.registry/src/com/raytheon/uf/common/datadelivery/registry/web/IRegistryFederationManager.java
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TP.xml
	edexOsgi/com.raytheon.uf.common.localization/src/com/raytheon/uf/common/localization/IPathManager.java
	edexOsgi/com.raytheon.uf.common.localization/src/com/raytheon/uf/common/localization/PathManager.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.registry/src/com/raytheon/uf/edex/datadelivery/registry/dao/ReplicationEventDao.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.registry/src/com/raytheon/uf/edex/datadelivery/registry/federation/RegistryFederationManager.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/src/com/raytheon/uf/edex/datadelivery/retrieval/util/WfsConnectionUtil.java

Former-commit-id: e3a7796362 [formerly da530db540] [formerly 091555cf10] [formerly e3a7796362 [formerly da530db540] [formerly 091555cf10] [formerly 4c56844e29 [formerly 091555cf10 [formerly 69c52fb4a22997d0a0f9c620bd20f00b8c5fd4ce]]]]
Former-commit-id: 4c56844e29
Former-commit-id: a1bf8ecdb1 [formerly 84a98ec4ca] [formerly 275a024694cc566f868a949d844ab91490e424f6 [formerly 214b48dcb8]]
Former-commit-id: 9adb015794435a13e656ce09cd891bfd9e4d53db [formerly fdc523a026]
Former-commit-id: f4ea796cea
2014-09-19 10:28:57 -05:00
Brian.Dyke
9a174527da Merge branch 'ohd_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Former-commit-id: 736ac16cb3 [formerly e70a9db68c] [formerly c6b0adfc53] [formerly 736ac16cb3 [formerly e70a9db68c] [formerly c6b0adfc53] [formerly 8b0603cdb8 [formerly c6b0adfc53 [formerly de22db308f36c42d5c7e0989dbd7decfaaf3adbb]]]]
Former-commit-id: 8b0603cdb8
Former-commit-id: 4e12c6c6b3 [formerly 87dfb0e978] [formerly 18d1159fb8fd3aab1d35c6728893c94b301b8bea [formerly d5f57cd98e]]
Former-commit-id: 9947eb33ac6ce8ec463ab7144932a7ee55771f17 [formerly 37ffb37db6]
Former-commit-id: 64435ea860
2014-09-18 12:43:01 -04:00
Chip Gobs
2480df5ca0 VLab Issue #4611
Adding missing changed file.

Change-Id: Ifcc56c121bb13806a5a5e7fc4e6de6e36900867e

Former-commit-id: bf7643c622 [formerly 0e4b8d2e9b] [formerly 0d046a56e8] [formerly bf7643c622 [formerly 0e4b8d2e9b] [formerly 0d046a56e8] [formerly 31efce6b8f [formerly 0d046a56e8 [formerly e68f56628f035ca2a20848a0e76f6efa8bbe1e8a]]]]
Former-commit-id: 31efce6b8f
Former-commit-id: e8d6084ce5 [formerly aa838b2230] [formerly 99ce169cc43297fde98f40a84ba2719cf478bcb2 [formerly a287a95ef9]]
Former-commit-id: b3eda53f2ebd79e93fb9db400582951260438006 [formerly 552430bda0]
Former-commit-id: 35439f3173
2014-09-18 12:12:42 -04:00
Brian.Dyke
cbe3c68b5b Merge branch 'ohd_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Former-commit-id: 967056afbb [formerly c44811098f] [formerly cb7a266271] [formerly 967056afbb [formerly c44811098f] [formerly cb7a266271] [formerly 97fc11f099 [formerly cb7a266271 [formerly dcfe2369455e6b7f27039418b090c9c577400a63]]]]
Former-commit-id: 97fc11f099
Former-commit-id: 19b21d9ccb [formerly 050fb83ec8] [formerly 2c2f21dc3030befe53cea6aa3c87d5ab9e85d7ba [formerly e8e2549284]]
Former-commit-id: b6b55a6c702deb69a0749bf152c7a57eb3e072fa [formerly 8f0d1e9dc5]
Former-commit-id: 484ebfd9c9
2014-09-17 14:39:56 -04:00
Max Schenkelberg
2ded35ed7c Omaha #3612 Refactored AbstractCAVEComponent to extend CAVEApplication
Change-Id: Iccaa6d95ec47fa41080929e456ff450eb61f41eb

Former-commit-id: 740d777efc [formerly 422ceffbdd] [formerly 3ea9b1b4be] [formerly 740d777efc [formerly 422ceffbdd] [formerly 3ea9b1b4be] [formerly 994605c1ce [formerly 3ea9b1b4be [formerly 154c4ac7131ae8f533d4080055d9afe257bf0506]]]]
Former-commit-id: 994605c1ce
Former-commit-id: 2bbd8ed131 [formerly 165583b144] [formerly 71e8b822066ba90e56841358134c9af41d5d03a6 [formerly 3b1a3f84fd]]
Former-commit-id: 023de157c95d90736cac543d900ab4ead33064b8 [formerly 144e042b42]
Former-commit-id: a2e7d1324f
2014-09-10 15:43:19 -05:00
Brian.Dyke
74f3dd287f 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: d8271549ff [formerly fe85eb9f70] [formerly 3d9a3de6e4] [formerly d8271549ff [formerly fe85eb9f70] [formerly 3d9a3de6e4] [formerly 01dfe503f5 [formerly 3d9a3de6e4 [formerly a3365943e7b7972a5c86f8cb1ad39667ab9e0695]]]]
Former-commit-id: 01dfe503f5
Former-commit-id: 3319853886 [formerly 29364e2b9f] [formerly 3c59646613e08582e0a259ecdec538060ca047c5 [formerly c42733eb39]]
Former-commit-id: 582e8cd843a57e8f4ac7a6572a5b3e23cd3b4f25 [formerly a31d3d702e]
Former-commit-id: 0f9fe8301a
2014-09-09 11:44:30 -04:00
Chip Gobs
54ed1f28ff 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: 0ac737c5a8 [formerly 83e0a41593] [formerly bbc346e29e] [formerly 0ac737c5a8 [formerly 83e0a41593] [formerly bbc346e29e] [formerly ec3ff24577 [formerly bbc346e29e [formerly 3ad2b50520a7a8fdfaa1a99a1f34570e43d0164e]]]]
Former-commit-id: ec3ff24577
Former-commit-id: 8e3f815f9e [formerly 1af9261db2] [formerly 0af563abfcb66d0f25b5c4912c34b3b15b38e993 [formerly 272690ed5a]]
Former-commit-id: 3616db465e32d4a54e389b300997de3f291605fc [formerly d0810673a4]
Former-commit-id: cbbe589afe
2014-09-08 14:29:28 -04:00
Chip Gobs
2aed9e6bc3 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: 8167002c9e [formerly bc2962c9ce] [formerly 780f484a56] [formerly 8167002c9e [formerly bc2962c9ce] [formerly 780f484a56] [formerly cf0816edce [formerly 780f484a56 [formerly 57614e9869d5a36c80b8d988e8fea4136045a982]]]]
Former-commit-id: cf0816edce
Former-commit-id: 20830b955f [formerly b41aef6d84] [formerly 74c5d8229ca16b83380865b92ce9c26d65ff8cd5 [formerly edef86ba43]]
Former-commit-id: 7f0840dd22ac68db644ba123f85f26b4d033b7e7 [formerly d00048b40f]
Former-commit-id: e37cf3ecf7
2014-09-08 14:28:33 -04:00
Chip Gobs
a2e01e8d55 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: fdaf0ce78b [formerly a06a4667a3] [formerly f7624b0609] [formerly fdaf0ce78b [formerly a06a4667a3] [formerly f7624b0609] [formerly 874db74c54 [formerly f7624b0609 [formerly 7df28e4d5c1d8a03db5500939b0af2905d11a4aa]]]]
Former-commit-id: 874db74c54
Former-commit-id: 7473ccce7e [formerly 7bda177305] [formerly 3f0e60b3e429b32810e5dcd4788c49f97e3e135f [formerly ee70ab2956]]
Former-commit-id: da5971aa01b31ff281f070112ed6b094036af28c [formerly b2319cd60a]
Former-commit-id: 07ce013d2c
2014-09-08 12:37:20 -04:00
Chip Gobs
1b51729356 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: a465c9964c [formerly 69450976c8] [formerly 8c6e70ccab] [formerly a465c9964c [formerly 69450976c8] [formerly 8c6e70ccab] [formerly 25e4ed8d51 [formerly 8c6e70ccab [formerly 44f6bf08a72b5450d6d0db40ff49dd5123cf811c]]]]
Former-commit-id: 25e4ed8d51
Former-commit-id: 13eebb6672 [formerly 689ccd9fcf] [formerly bd626ff8f5b059de21f2fe336840954273fa7517 [formerly 215f1dfaa1]]
Former-commit-id: 1baee6db117085405e780657f84f0a7c0b363cf5 [formerly 9bf30e3dbd]
Former-commit-id: b2f957c4d4
2014-09-08 12:06:45 -04:00
Chip Gobs
337c8f9237 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: fe27c0080d [formerly da10a7b4ac] [formerly fc8a7d48ca] [formerly fe27c0080d [formerly da10a7b4ac] [formerly fc8a7d48ca] [formerly 4911ac1917 [formerly fc8a7d48ca [formerly 4d87ebeef93e561a303566853fd2616316c568ca]]]]
Former-commit-id: 4911ac1917
Former-commit-id: 12ea1be41c [formerly 6d5926df35] [formerly b2318c6fd9b60347162679493f3cfd544eac06b1 [formerly 7c6f9b3ad9]]
Former-commit-id: a3a050a84a49c03574ad23c34d3af4693dfedac0 [formerly f50b09855f]
Former-commit-id: 3e23c79eea
2014-09-08 11:44:48 -04:00
steve.naples
33e95d1e49 ASM #14578 - Added Hydrologic date field ti Choose Hour dialog for Daily QC
Change-Id: I954833e37c579ab1eaddf95347ba53d73909b138

Former-commit-id: bf9924b0e9 [formerly 4205d83452] [formerly 1856a05319] [formerly bf9924b0e9 [formerly 4205d83452] [formerly 1856a05319] [formerly ff52f1dc0a [formerly 1856a05319 [formerly 2e8fb864f410b9b08ccc6de6c0d75666931da3a2]]]]
Former-commit-id: ff52f1dc0a
Former-commit-id: 899ff32548 [formerly 1532c683a1] [formerly 2916716519dd7ee38032637d8a99f6fb81e1e7ba [formerly 211e9f7546]]
Former-commit-id: cc4eaa9f2dd1e8e914858e1e4828f637b78454d8 [formerly 3f11e82772]
Former-commit-id: 03f50a48f1
2014-08-28 16:08:17 +00:00
Loubna.Bousaidi
54c46422a5 ASM #511 changes to transmit_rfc_bias calls from MPE
Change-Id: I40c582b8d2c97e16593b8abbf8a8051e21c93004

Former-commit-id: 281f16d700 [formerly afae4700a6] [formerly 8c15d1f124] [formerly 281f16d700 [formerly afae4700a6] [formerly 8c15d1f124] [formerly d41e489ced [formerly 8c15d1f124 [formerly a43ad03838d53d3b9688b48851f41a1af6b043f6]]]]
Former-commit-id: d41e489ced
Former-commit-id: ea83b54df2 [formerly d9be7127bc] [formerly e79b024b72366d3a4c5251b13e7896757aff0e52 [formerly 5cc9b08890]]
Former-commit-id: b4514916beb24de3adb110ccdeb429cb22202a70 [formerly 65cfa4e033]
Former-commit-id: af004872fd
2014-08-15 10:54:10 -05:00
Nate Jensen
f7ae70ac02 Omaha #3356 cleanup of unnecessary register buddies and buddy policies
Change-Id: I1d6c279478f38876a8df67d2f9dd186a2efdeca0

Former-commit-id: d61c65787b [formerly 253198b5bc] [formerly b3083a663e] [formerly d61c65787b [formerly 253198b5bc] [formerly b3083a663e] [formerly 9b72a1399d [formerly b3083a663e [formerly 48536dd79d933508ac54b3b6e9bbd166fd218330]]]]
Former-commit-id: 9b72a1399d
Former-commit-id: e7b11aaf88 [formerly 58a4cb95c1] [formerly 1fed4e6852cd8eca79ebee598c5badd5a0a3fe14 [formerly d67083655a]]
Former-commit-id: 7e191ad12969bca5c4c6b83a1e9488c58f4c6928 [formerly 951feab33d]
Former-commit-id: 7336692b85
2014-08-14 10:22:37 -05:00
Mark Peters
d3e09d5479 Omaha #3492 Replace Raytheon plugin calls to deprecated IGraphicsTarget.createWireframeShape()
Change-Id: Ie521a2041586825b9fb995a675e5caa550fa5313

Former-commit-id: 8231790215 [formerly 1d0983cd4a] [formerly 58dd0873e3] [formerly 8231790215 [formerly 1d0983cd4a] [formerly 58dd0873e3] [formerly 8e7d6964c6 [formerly 58dd0873e3 [formerly 0df04ef8a5b4eee4398a411fc02baba22f719eaf]]]]
Former-commit-id: 8e7d6964c6
Former-commit-id: 3f94364537 [formerly 4ca6e07182] [formerly 4e8cd8a324c53756fe01c72f7060cad055021774 [formerly c823ff5bc3]]
Former-commit-id: f3030a1c71376d2c5f0dd1ea77fe4e1fc77c0e4a [formerly 824ebff454]
Former-commit-id: 019a89bcaf
2014-08-13 12:22:47 -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
Steve Harris
8bce1903ec Merge branch 'omaha_14.3.1' into omaha_14.4.1
Conflicts:
	cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/Cities.xml
	cave/com.raytheon.uf.viz.core.maps/src/com/raytheon/uf/viz/core/maps/scales/MapScalesManager.java
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/alarmalert/dialogs/AlarmDisplayWindow.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/alarmalert/dialogs/CurrentAlarmQueue.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParmManager.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/D2DGridDatabase.java
	edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/util/GribModelLookup.java
	edexOsgi/com.raytheon.edex.utilitysrv/src/com/raytheon/edex/services/LocalizationStreamHandler.java
	edexOsgi/com.raytheon.uf.edex.activetable/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTable.java
	edexOsgi/com.raytheon.uf.edex.activetable/utility/common_static/base/vtec/ActiveTable.py

Former-commit-id: d606269c5b [formerly a92dc418c6] [formerly 0fb743ec44] [formerly d606269c5b [formerly a92dc418c6] [formerly 0fb743ec44] [formerly bf9a0fa5de [formerly 0fb743ec44 [formerly f7d474895366eb23ae5eef242a4568f911435aa3]]]]
Former-commit-id: bf9a0fa5de
Former-commit-id: 386dfebe65 [formerly b848e05aa1] [formerly af44a55101128b715bc6595cfc378e8fcdc2eb3d [formerly 46fe792d83]]
Former-commit-id: 5636830e013729a270565af661d066aa2f000390 [formerly 5e2f7a9f74]
Former-commit-id: a0fdc76880
2014-08-04 22:20:29 -05:00
Mark Peters
8d1732d0cf Omaha #3471 Replace Raytheon plugin calls to deprecated IGraphicsTarget.createShadedShape()
Change-Id: Iea874ecfa2c7f16eacdc7f097039ba20f10fc2b9

Former-commit-id: 1342f67614 [formerly 9be02c8dfe] [formerly 22c077d77f] [formerly 1342f67614 [formerly 9be02c8dfe] [formerly 22c077d77f] [formerly 88b334cf14 [formerly 22c077d77f [formerly 4bcf01e33f1d2e038499fdece63e81b6288b7152]]]]
Former-commit-id: 88b334cf14
Former-commit-id: 8ccec2e2c8 [formerly 469f73cb43] [formerly 3dc8f434a87e7d966a11f8dc0dd83eee4a57069c [formerly 666c988f64]]
Former-commit-id: f178c14861fee90813e282109070e3d0703c6657 [formerly ca4003ca7f]
Former-commit-id: 7a4c25190e
2014-08-04 13:27:45 -05:00
Brian.Dyke
1d9494a502 Merge branch 'master_14.2.2' into master_14.3.1 CM-MERGE:14.2.2-17,-18,-19,-20,-21,-22,-23,-24 into 14.3.1
Conflicts:
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/RadarBiasTableDialog.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
	edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
	edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTable.java

Former-commit-id: 590e37a8f2 [formerly 301f3094be] [formerly 9abb02ea8a] [formerly 590e37a8f2 [formerly 301f3094be] [formerly 9abb02ea8a] [formerly 270d2b0ddb [formerly 9abb02ea8a [formerly b209604e1f0d6e790980d0bc8f1760e38f448076]]]]
Former-commit-id: 270d2b0ddb
Former-commit-id: b9da27608c [formerly bbe6ec4d50] [formerly 4f6e23e0fe3a5044b75abe6a89c965ab32b19947 [formerly 37aacfcb96]]
Former-commit-id: ea25ca2fdedff8bbe1c901d0538886147f633e65 [formerly b9daa26f7d]
Former-commit-id: 803ceadaec
2014-08-04 13:10:13 -04:00
Mark Peters
5cbe006dc9 Omaha #3429 Replace Raytheon plugin calls to deprecated IGraphicsTarget.drawLine()
Change-Id: I9de68a9a047a2d6c3744b29de292efb7cfb44bbf

Former-commit-id: 6376572795 [formerly 11abefd4de] [formerly 437e127ebc] [formerly 6376572795 [formerly 11abefd4de] [formerly 437e127ebc] [formerly bac12d844b [formerly 437e127ebc [formerly a222b29ff24bf81d1c8aefd54fa33f52461c9c25]]]]
Former-commit-id: bac12d844b
Former-commit-id: 88edbdafea [formerly 95886b5ded] [formerly 1492820d8873fe4e06b826ecddbb5536f26a2abc [formerly 6edd39cc9e]]
Former-commit-id: cdffd110dc0c39f2afadf75b08b0881b15b96f9a [formerly baecaaaca0]
Former-commit-id: 011ef40360
2014-07-29 11:20:53 -05:00
Nate Jensen
815dcd396a Merge "Omaha #3422 Update plug-in version number and java version for viz.hydrocommon and viz.mpe.ui" into omaha_14.4.1
Former-commit-id: 76d8ae8fd9 [formerly 9568761800] [formerly 9ec259d7df] [formerly 76d8ae8fd9 [formerly 9568761800] [formerly 9ec259d7df] [formerly d5b929d5c1 [formerly 9ec259d7df [formerly 13ad27128cd4a29bb559d6911f870b15f447fdf5]]]]
Former-commit-id: d5b929d5c1
Former-commit-id: 2ab40b2e4e [formerly bc2e75a7a9] [formerly b09fdf8f06a1aa6073fa3dfbac30e6c4cdd684c3 [formerly 9969273949]]
Former-commit-id: 281f5f152424ecc3fd768f334d5118322a2d9c66 [formerly ba49569911]
Former-commit-id: b01f9947cd
2014-07-24 14:53:47 -05:00
Mark Peters
8225fd1b55 Omaha #3422 Update plug-in version number and java version for viz.hydrocommon and viz.mpe.ui
Change-Id: I2f8799c32a11ed636f714c0bfe304c5248f48a98

Former-commit-id: ecbed2c37e [formerly 5eacdbc13b] [formerly 53042a9bf7] [formerly ecbed2c37e [formerly 5eacdbc13b] [formerly 53042a9bf7] [formerly 627ecd28e1 [formerly 53042a9bf7 [formerly 02b964ae1e7490cc9124dcd70d6806881396a692]]]]
Former-commit-id: 627ecd28e1
Former-commit-id: fbbe39f969 [formerly 7087f36098] [formerly c41eec037649a485669197ebfced08a18f9dd7ba [formerly 3293e61ae0]]
Former-commit-id: d3d29209722a3cc4e1af4d25f96bd3c50293e7ca [formerly d804243d0f]
Former-commit-id: e08b81c8d9
2014-07-24 14:38:59 -05:00
Mark Peters
795f1ec074 Omaha #3422 Move HydroPointResource and HydroPointResourceData to MPE plugin
Change-Id: I222f99b0b952d9cef91208eb27f6adca43e13669

Former-commit-id: 38a41fa367 [formerly 85bf675f6a] [formerly 92b1e9a9cf] [formerly 38a41fa367 [formerly 85bf675f6a] [formerly 92b1e9a9cf] [formerly 29bc0fae50 [formerly 92b1e9a9cf [formerly 7929e5b809d83a0f682e9f1c6953c9a090ed7310]]]]
Former-commit-id: 29bc0fae50
Former-commit-id: 08519bf28c [formerly 034616b4b7] [formerly 02b57751c6a3618e31d56b549555c46b6ccfe448 [formerly 6727654e2d]]
Former-commit-id: 3f0ac94691ac354d839fcf51b3c53f5b4fb21455 [formerly a87ed6f7af]
Former-commit-id: 0a1e272abb
2014-07-22 14:57:35 -05:00
steve.naples
afe17e2857 ASM #253 Update RadarBiasTableDialog fix issue of not saving undo.
Change-Id: I57ad9d4407665fd4c5f7e922cbf3daac373c9f88

Former-commit-id: 72ae26401d [formerly 2ebfd61f12] [formerly 339fcbc18a] [formerly 72ae26401d [formerly 2ebfd61f12] [formerly 339fcbc18a] [formerly 0bd7b6c65b [formerly 339fcbc18a [formerly 24b9a6e0801cc653062a71d86090df3836aa86a4]]]]
Former-commit-id: 0bd7b6c65b
Former-commit-id: 04208dc837 [formerly 6b58fb2509] [formerly 05c10c3b18e9704c50ddf97525d0165e3c4e0b2b [formerly aa8c11d134]]
Former-commit-id: f17ec83e9cf28c564f411b5e04c09e7a9226b11f [formerly 458dd1fe8f]
Former-commit-id: db04c1a2ec
2014-07-09 15:42:51 +00:00
steve.naples
0bf2f3eed5 ASM #253 Update RadarBiasTableDialog fix issue of not saving.
Change-Id: If88c12673afeb3ae8cecfb53d856bc90820a4673

Former-commit-id: 9dcf27e217 [formerly 29ca2338b8] [formerly 75969ceec2] [formerly 9dcf27e217 [formerly 29ca2338b8] [formerly 75969ceec2] [formerly 24b0d49a5b [formerly 75969ceec2 [formerly 9021eca6b32dd2b3859cd928c14a0e40a4907c13]]]]
Former-commit-id: 24b0d49a5b
Former-commit-id: bd3e8973d2 [formerly 94e246b619] [formerly 8b99713670e5a0d85aee792b8067ae607b78230c [formerly ea071e81f5]]
Former-commit-id: 92c9bb35d883903b31bca5165db414369b88663d [formerly 23ff3f3fe7]
Former-commit-id: 10e2eaa6ed
2014-07-08 16:32:08 +00:00
steve.naples
0f4f7230ef ASM #253 Update RadarBiasTableDialog to remove old code.
Change-Id: I003f8dbf520e1e8025afe46266d1ee4849003a6f

Former-commit-id: e82b0ae895 [formerly 3d75da3db0] [formerly 66c3241bc4] [formerly e82b0ae895 [formerly 3d75da3db0] [formerly 66c3241bc4] [formerly 4e959af1b4 [formerly 66c3241bc4 [formerly b9f868e0ced53987accf675bfe2ce1a1f4f34da1]]]]
Former-commit-id: 4e959af1b4
Former-commit-id: dbd231a099 [formerly f1c92f1e35] [formerly 18ba10573377ee74433b2ab0bbbbc0f2efa06dea [formerly 3cfabd29bc]]
Former-commit-id: e33d6b9199b205144f76ed9c11a26bf937dec501 [formerly 93c8f822cc]
Former-commit-id: 9f52699bd2
2014-07-02 15:30:48 +00:00
steve.naples
d7ff8a2638 ASM #253 Update RadarBiasTableDialog to allow undo changes.
Change-Id: Ibfb87730fda8185b27777fd83606bc1397aca1f9

Former-commit-id: e994aa9482 [formerly 2a49bbda2f] [formerly efe877d82b] [formerly e994aa9482 [formerly 2a49bbda2f] [formerly efe877d82b] [formerly 90ed511478 [formerly efe877d82b [formerly fcd20d35abf3617701cc797baf9ba2b3984379c8]]]]
Former-commit-id: 90ed511478
Former-commit-id: b8d5f833ec [formerly 2e77b74c44] [formerly f502e650f306b12ad50f762f688616a9b1039de1 [formerly 362e1ce880]]
Former-commit-id: d75382cb3e72ed1c52902aa0d9f71c8e7e9c77f6 [formerly 5dcda5cabc]
Former-commit-id: 3638879057
2014-06-24 15:52:23 +00:00
Steve Harris
cbd6f7c310 Merge branch 'omaha_14.3.1' (14.3.1-8) into omaha_14.4.1
Conflicts:
	cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/whfslib/colorthreshold/GetColorValues.java
	edexOsgi/build.edex/edex/common.properties
	edexOsgi/build.edex/esb/conf/modes.xml
	nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.pproc.so
	nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.whfs.so
	nativeLib/files.native/edex/lib/native/linux32/library.ohd.pproc.so
	nativeLib/files.native/edex/lib/native/linux32/library.ohd.whfs.so

Former-commit-id: 2b95865dec [formerly 647cd97e29] [formerly 7fec0d039c] [formerly 2b95865dec [formerly 647cd97e29] [formerly 7fec0d039c] [formerly 455eb8b39d [formerly 7fec0d039c [formerly 45250149681f057cf168f4d3cb27276279f62c05]]]]
Former-commit-id: 455eb8b39d
Former-commit-id: b1f34a5dd0 [formerly 373c816e6a] [formerly c52c0623361b5124ad656838a838096ff392d903 [formerly ec743199f1]]
Former-commit-id: 7d167287b3c5d094c77e241af01ad8945f4a9c0b [formerly cbceb4ea62]
Former-commit-id: 7eabeb7ad6
2014-06-02 11:21:46 -05:00
Brian.Dyke
408ecfa5c0 Merge branch 'ohd_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
VLab Issue #3454 - HPE dual-polarization upgrade

Conflicts:
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/RadarBiasTableDialog.java
	edexOsgi/com.raytheon.uf.common.ohd/utility/common_static/base/hydro/Apps_defaults

Former-commit-id: 5524d6b38d [formerly a0a879be7d] [formerly a8737e18f0] [formerly 5524d6b38d [formerly a0a879be7d] [formerly a8737e18f0] [formerly 3f1e12effc [formerly a8737e18f0 [formerly 9d7a819489480e119b65cb5643520818adeb1ebf]]]]
Former-commit-id: 3f1e12effc
Former-commit-id: c76d6df69d [formerly 3961c75ecd] [formerly 8ed2dc55683cd373c693766e728d2dbc5c2f9e63 [formerly 66aacd6578]]
Former-commit-id: 48941da01de7ecd361d967e7d76a018c85a27337 [formerly a23d371522]
Former-commit-id: 9351315fd6
2014-05-30 10:46:25 -04:00
Nate Jensen
2bdb8b5c7d Omaha #3133 Removed dead hydro code and related dependencies
Change-Id: I15daffddd4219541cac44b2d5930a69e1e864e6a

Former-commit-id: 424c3c1334 [formerly a984e7ac9a] [formerly 514c9d3a0c] [formerly 424c3c1334 [formerly a984e7ac9a] [formerly 514c9d3a0c] [formerly 67ac5fa242 [formerly 514c9d3a0c [formerly 13d3dc45edab66106e9aa5a1149ca05e94d144c3]]]]
Former-commit-id: 67ac5fa242
Former-commit-id: d158b501d1 [formerly a25a8b69eb] [formerly 099854edf99632506bb755ffc5aca3c18d75e846 [formerly c2f78a6888]]
Former-commit-id: f47e70dc4dbf336cc1d0b9233dc58c9148bc4c9a [formerly 11899e65e2]
Former-commit-id: caf433d525
2014-05-27 18:23:38 -05:00
brian.dyke
5c9495ee04 Merge branch 'master_14.3.1-4' into asm_14.3.1
Conflicts:
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResource.java
	edexOsgi/com.raytheon.uf.edex.grid.staticdata/src/com/raytheon/uf/edex/grid/staticdata/StaticDataGenerator.java
	edexOsgi/com.raytheon.uf.edex.plugin.grid/utility/common_static/base/purge/gridPurgeRules.xml

Former-commit-id: 4d161aaf90 [formerly 9626317825] [formerly 011d121e4b] [formerly 4d161aaf90 [formerly 9626317825] [formerly 011d121e4b] [formerly 58683ad040 [formerly 011d121e4b [formerly 52358cb3e2ba2c7ff4ff9c9a5de03af50c3a1199]]]]
Former-commit-id: 58683ad040
Former-commit-id: a2add51880 [formerly 2e105c1d5d] [formerly cba44a8343721392c8a010e859fb1efaca4b604b [formerly bc4649765a]]
Former-commit-id: 161c7365002f1434a02f072bc8ba71aba3cbf346 [formerly b42011fc76]
Former-commit-id: b2e3c50ec0
2014-05-19 09:45:37 -04:00
Chip Gobs
172481a6aa VLab Issue #3454 (OHD Dual-Pol enhancements for MPE and HPE/HPN (DCS #167,DCS #168) and PostAnalysis (DR #9784) )
Change-Id: Id96c25de545144d769309fef608c431d67d1bada

Former-commit-id: a95de2211a [formerly 4e4d00792d] [formerly 65d2135ac2] [formerly a95de2211a [formerly 4e4d00792d] [formerly 65d2135ac2] [formerly e42bef2a33 [formerly 65d2135ac2 [formerly 1f43b57d7dffe0d1c4002ff9f1dd789a47b97734]]]]
Former-commit-id: e42bef2a33
Former-commit-id: 5045e9fa66 [formerly c075175e8e] [formerly 3dc38f5850d9a6af32e30312873669ceb1e3ea3b [formerly 593b36d722]]
Former-commit-id: 77c9177d0a8eb55155050f750d97f90b20791bb0 [formerly 1b7f762617]
Former-commit-id: 47068a7939
2014-05-06 10:48:35 -04:00
steve.naples
35892201f7 ASM #253 Update MPE Bias Table to allow reverting modified bias, back to original value.
Change-Id: I1f84133404e14f7debb66e66735aa0d96a92b316

Former-commit-id: b98b7f41b1 [formerly a7092ac01d] [formerly b58b7d3d5a] [formerly b98b7f41b1 [formerly a7092ac01d] [formerly b58b7d3d5a] [formerly 8a00348730 [formerly b58b7d3d5a [formerly 2f608451c941efcc5372f0d0870ac72409f518e3]]]]
Former-commit-id: 8a00348730
Former-commit-id: 2e4c970c7e [formerly 452cbdcc4e] [formerly de0df693196948010bbaef0c68d804b1c4c124ab [formerly d079dbcb7c]]
Former-commit-id: 7f5d427e0c981b86285f86654e23425e7a531526 [formerly 39437970c7]
Former-commit-id: 18c51dac23
2014-05-02 16:15:04 +00:00
Juliya Dynina
a6c74661f5 Merge "ASM #511 changes to transmit_rfc_bias calls from MPE" into asm_14.3.1
Former-commit-id: a24fdff32a [formerly 00bbbf32c1] [formerly d37490acb1] [formerly a24fdff32a [formerly 00bbbf32c1] [formerly d37490acb1] [formerly 78bb549533 [formerly d37490acb1 [formerly a129795302a562e68638bb5e5764f54a8dcc331e]]]]
Former-commit-id: 78bb549533
Former-commit-id: c6a70b3861 [formerly b28bb8e3ac] [formerly 071d4ac50b89f4e83a804c1af344b81cb9e7d0b6 [formerly d5290b8bbf]]
Former-commit-id: 9ffe106387d69b1e2f9cecf166f5c44aac674106 [formerly a4073b805e]
Former-commit-id: 18c84c47bc
2014-04-30 07:41:27 -05:00
Loubna.Bousaidi
a141c9fa13 ASM #511 changes to transmit_rfc_bias calls from MPE
Change-Id: I40c582b8d2c97e16593b8abbf8a8051e21c93004

Former-commit-id: c064fb3ae4 [formerly 1b5bccc451] [formerly 760ee964d6] [formerly c064fb3ae4 [formerly 1b5bccc451] [formerly 760ee964d6] [formerly 6d526cb1ff [formerly 760ee964d6 [formerly a6033a982c80e822d9f4cb62a70b9722d79432c6]]]]
Former-commit-id: 6d526cb1ff
Former-commit-id: 967156413e [formerly 93a6523f46] [formerly 51be7984ec7ff512df21cbd1bc4ce90ccce8b1b9 [formerly e28ec3469d]]
Former-commit-id: 88fa747f996318dc9368525454f7865cc4cee512 [formerly 84640a8936]
Former-commit-id: ecbad2efac
2014-04-29 21:09:34 +00:00
Richard Peter
e748b7c1e5 Merge branch 'master_14.3.1' (14.3.1-2) into omaha_14.3.1
Conflicts:
	cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/CaseCreationDlg.java
	cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/GenerateCaseDlg.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
	edexOsgi/com.raytheon.edex.utilitysrv/res/spring/utility-request.xml
	edexOsgi/com.raytheon.uf.common.colormap/src/com/raytheon/uf/common/colormap/image/Colormapper.java
	edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/SerializationUtil.java
	edexOsgi/com.raytheon.uf.edex.textdbsrv/res/spring/textdbsrv-request.xml

Change-Id: I316979d4036b2e2d05b361c8c466747b04ee4900

Former-commit-id: 8b1a177110 [formerly 67683dd891] [formerly 44b1782461] [formerly 8b1a177110 [formerly 67683dd891] [formerly 44b1782461] [formerly 32957285fc [formerly 44b1782461 [formerly 311c52426b3715d3a73c1fa79a8fd427a4b1b09d]]]]
Former-commit-id: 32957285fc
Former-commit-id: 0dfa8cc4c6 [formerly 6966b79246] [formerly 2a324b0264c6962014f41df55690c7e2b09955e1 [formerly 80d4153878]]
Former-commit-id: 5715dc841fc8db519f94f6126094e2ff4eb83ea8 [formerly 24a3fe1466]
Former-commit-id: 938e39a0fc
2014-04-28 16:27:40 -05:00
brian.dyke
787c64e3cb Merge branch 'master_14.3.1' into asm_14.3.1
Merge 14.3.1-2 into ASM


Former-commit-id: a43a0922ba [formerly ffad42f2ef] [formerly 8bda882ed0] [formerly a43a0922ba [formerly ffad42f2ef] [formerly 8bda882ed0] [formerly 4621d66089 [formerly 8bda882ed0 [formerly 29bcb6987ee371f128b75eee84b65574d799135f]]]]
Former-commit-id: 4621d66089
Former-commit-id: 7d7d638f9c [formerly c27ffd0678] [formerly cfcdab0b566c6bf67c3201f0f09f89c9ab3941f8 [formerly 1939a06ced]]
Former-commit-id: 02c7199221f6c6eb86a0cbe2356c6c3d5d27bbe8 [formerly d6287274b2]
Former-commit-id: 864e83994e
2014-04-28 13:25:41 -04:00
steve.naples
138ea72d59 ASM #528 Updated DrawPolygonDlg to remember location when opened and closed.
Change-Id: I19ec2f2e1898506387d053b8ada80d2d2d67cf7c

Former-commit-id: 00c78e9047 [formerly 58b091e37b] [formerly e0b6f674f3] [formerly 00c78e9047 [formerly 58b091e37b] [formerly e0b6f674f3] [formerly 760fc00028 [formerly e0b6f674f3 [formerly ae0616b0b71e0d1952f2c3e8f461a4d8e79e934f]]]]
Former-commit-id: 760fc00028
Former-commit-id: 047e7fd5d6 [formerly 399702b22b] [formerly 92c6781705a8d544fcaa7d76ffd5e620a3a07d1e [formerly bed2334f57]]
Former-commit-id: 7b6047f57b006f1ebce3b43d85627ebf7101bed9 [formerly 26da8e332a]
Former-commit-id: b5e6653935
2014-04-28 13:55:21 +00:00
Brian.Dyke
19b4bb7dcc Merge branch 'master_14.2.2' into master_14.3.1
Merge (14.2.2-5 into 14.3.1-1)

Conflicts:
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/GFESpatialDisplayManager.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/grid/dataset/alias/gfeParamInfo.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscMosaic.py
	edexOsgi/com.raytheon.uf.common.archive/src/com/raytheon/uf/common/archive/config/ArchiveConfigManager.java
	edexOsgi/com.raytheon.uf.common.python/utility/common_static/base/python/MasterInterface.py
	edexOsgi/com.raytheon.uf.edex.datadelivery.registry/src/com/raytheon/uf/edex/datadelivery/registry/federation/RegistryFederationManager.java
	edexOsgi/com.raytheon.uf.edex.registry.ebxml/src/com/raytheon/uf/edex/registry/ebxml/services/lifecycle/LifecycleManagerImpl.java

Former-commit-id: 362d882b40 [formerly f0b8ea5822] [formerly fb1f5aa593] [formerly 362d882b40 [formerly f0b8ea5822] [formerly fb1f5aa593] [formerly 3524838f9f [formerly fb1f5aa593 [formerly f54d2c639a915db14f01f56a7fcc5841b60e1509]]]]
Former-commit-id: 3524838f9f
Former-commit-id: 14a63a19e1 [formerly bf3758efa3] [formerly bb5a7e713dac6962660d9c769971464b6792cb76 [formerly 029f5753ad]]
Former-commit-id: 4f6c777830575250a298510d89cfba1ef9df9753 [formerly c6d3fe6952]
Former-commit-id: f31d8cc8cf
2014-04-25 11:06:11 -04:00
Mike Duff
8edc6095c9 Issue #3025 - Fix incorrect sort algorithm.
Change-Id: Ied1ec59a8703c1f7476793d3896a253ec6aa2707

Former-commit-id: dd24e15b53 [formerly a17f187929] [formerly 0b9f8ce7f1] [formerly dd24e15b53 [formerly a17f187929] [formerly 0b9f8ce7f1] [formerly b1a4f69578 [formerly 0b9f8ce7f1 [formerly 9c275288183b93ba5cac991dbbdf72bdf122ad0a]]]]
Former-commit-id: b1a4f69578
Former-commit-id: a700a1a1dc [formerly 989fcfb42f] [formerly 70adbb0b80aadc062137a471048c29cdebf395e7 [formerly 54e95e399b]]
Former-commit-id: b1484391d4b5870a0203b19b92e6167d49ab4423 [formerly ce6d95bd3c]
Former-commit-id: cfadb576e6
2014-04-17 09:55:45 -05:00
Richard Peter
626ab0bd58 Merge branch 'omaha_14.2.2' (14.2.2-3) into development
Conflicts:
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResource.java
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
	cave/com.raytheon.viz.hydrobase/src/com/raytheon/viz/hydrobase/dialogs/QcAlertAlarmLimitsDlg.java
	cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/resource/HRAPOverlayResource.java
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/MPEDisplayManager.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
	edexOsgi/com.raytheon.edex.textdb/src/com/raytheon/edex/textdb/dbapi/impl/TextDBStaticData.java
	edexOsgi/com.raytheon.edex.textdb/src/com/raytheon/edex/textdb/ingest/TextDBStaticDataSubscriber.java
	edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/styleRules/d2dContourStyleRules.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/styleRules/gridImageryStyleRules.xml
	edexOsgi/com.raytheon.uf.edex.plugin.manualIngest/res/spring/manualIngest-spring.xml

Former-commit-id: 9b12d9ddaf [formerly cd51f3fa87] [formerly 3575d6586f] [formerly 9b12d9ddaf [formerly cd51f3fa87] [formerly 3575d6586f] [formerly 21ae3b5fcd [formerly 3575d6586f [formerly bd13bc332bcdd87723bec8669885f4594ad483b9]]]]
Former-commit-id: 21ae3b5fcd
Former-commit-id: 56089894f2 [formerly d65b11d404] [formerly 9377474013cb8e8722b3a32e83523c417b87fcd0 [formerly a7ec0bcf66]]
Former-commit-id: ea5917ddde80aa4f2fa095272512ef873794f21c [formerly b6482f2e54]
Former-commit-id: a22345ea6b
2014-04-11 16:23:09 -05:00
brian.dyke
e205810cba Merge branch 'master_14.2.2' into asm_14.2.2
Former-commit-id: c75dba32e9 [formerly 6a9ccba393] [formerly 6575f77fe3] [formerly c75dba32e9 [formerly 6a9ccba393] [formerly 6575f77fe3] [formerly a8d6d58f31 [formerly 6575f77fe3 [formerly 274338d3dfb6a839a59da8740ed968d8f0779d7d]]]]
Former-commit-id: a8d6d58f31
Former-commit-id: 16a261d7f6 [formerly 88ddd667b6] [formerly f4680f6e78d8dd9f6a0ede6791f8e2273054f211 [formerly ad63114f16]]
Former-commit-id: d5b0d90245289f70419c05b7aae730f0ee5d4f80 [formerly 1c4e02168c]
Former-commit-id: f299a28f9b
2014-04-11 10:58:48 -04:00
steve.naples
ec7e7b856e ASM #471 Updated Radar Bias Table Dialog to pass other office id and bias properly.
Change-Id: I3566b9e6bb5f29000beded0b6912b6771ebc85f5

Former-commit-id: 5d7cf6c098 [formerly 75be620d0d] [formerly f6636a3dd7] [formerly 5d7cf6c098 [formerly 75be620d0d] [formerly f6636a3dd7] [formerly 7624f7ab75 [formerly f6636a3dd7 [formerly 1c71a34944c7d823742b98dc65e19fe1f478eef0]]]]
Former-commit-id: 7624f7ab75
Former-commit-id: 86c06b5632 [formerly cfa9c6f01c] [formerly 1cf8539d045c95be911973c6773035bb176dd49d [formerly 050238ee44]]
Former-commit-id: da98d1d22c51d71497b6b15f804653483de7aa7c [formerly 571efe3596]
Former-commit-id: 32e931cead
2014-04-04 15:30:18 +00:00
Brian.Dyke
a30b45174a Merge branch 'omaha_14.2.2' of cm2:/home/slharris/repos/AWIPS2_baseline.14.2.2 into master_14.2.2
Former-commit-id: 411457248b [formerly 3186434368] [formerly 6e515eb334] [formerly 411457248b [formerly 3186434368] [formerly 6e515eb334] [formerly 1f5c6139e3 [formerly 6e515eb334 [formerly 5dbe50379db1558323dff2ffdc541cd81adfea4b]]]]
Former-commit-id: 1f5c6139e3
Former-commit-id: f5ed39a8d9 [formerly d163d9d190] [formerly d9da3cc373b8f207d487dbe28227905b8a81846e [formerly c013460db1]]
Former-commit-id: 57e818053f3d573b96db0f187009034ddd6fab8c [formerly 5345add58d]
Former-commit-id: c2a3ec6f04
2014-04-01 14:29:33 -04:00
David Friedman
8ea6e0b064 Merge branch 'master_14.2.2' into asm_14.2.2
Remove unintentional changes from cd136c3.
Fix problem in warning-request.xml from 3c9c34c.

Conflicts:
	cave/build/static/linux/cave/cave.sh
	cave/build/static/linux/cave/caveUtil.sh
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/PolygonUtil.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
	edexOsgi/com.raytheon.edex.plugin.warning/res/spring/warning-request.xml
	edexOsgi/com.raytheon.uf.common.ohd/utility/common_static/base/hydro/Apps_defaults
	edexOsgi/com.raytheon.uf.edex.plugin.manualIngest/res/spring/manualIngest-spring.xml

Change-Id: I814b0ae3c464bbb21b609870b3dca7d575ed948d

Former-commit-id: ee37afaf7b [formerly 32a7adbe4b] [formerly fd900e38c2] [formerly ee37afaf7b [formerly 32a7adbe4b] [formerly fd900e38c2] [formerly f146c7bcd0 [formerly fd900e38c2 [formerly cf35c1870fc4b6b3c2ceaf038274c4701f8046b1]]]]
Former-commit-id: f146c7bcd0
Former-commit-id: 1e4ac84f99 [formerly 1168a3eae5] [formerly 06e6f2e7e7ae2f1959eaefcb5e76c2a04c33de99 [formerly 533d15c863]]
Former-commit-id: beb961d5304e2c2df6afc0538bae8011c8b6f63f [formerly dde12b4fc3]
Former-commit-id: 8f8f55dd3c
2014-03-27 19:17:03 +00:00
Steve Harris
64b4a6a719 Merge branch 'omaha_14.2.2' (14.2.1-14,15) into development
Former-commit-id: 883244fa2e [formerly 29f4f53d27] [formerly a70710b467] [formerly 883244fa2e [formerly 29f4f53d27] [formerly a70710b467] [formerly 656ae897c1 [formerly a70710b467 [formerly eeb50c8acbe727769ed7f14b63b94af5b14bbf3f]]]]
Former-commit-id: 656ae897c1
Former-commit-id: 4cc478e83b [formerly b99ed0cce6] [formerly c89d11e09dd409255cf1e5daff026439aa00fab2 [formerly b1d31f21bc]]
Former-commit-id: 1efcd8cc307635929ab51dd088d4ae8d0cac33f0 [formerly 2d6dde4ac6]
Former-commit-id: d9af02b1d2
2014-03-26 16:19:26 -05:00
steve.naples
3c82d305bb ASM #428 Updated SATPRE file header to correct reftime.
Change-Id: I1ed89cd9010af085a0e3a9725af182c0cd1b5204

Former-commit-id: 20399400cb [formerly 64b19f2e41] [formerly d0f4df4ad9] [formerly 20399400cb [formerly 64b19f2e41] [formerly d0f4df4ad9] [formerly 1aa970164f [formerly d0f4df4ad9 [formerly e51a12ae977528eb85d2c59505ac5be92d945cfe]]]]
Former-commit-id: 1aa970164f
Former-commit-id: 8d9a51770d [formerly 885ceb834b] [formerly 5c8cd26c00210e720cf38e0d3c939e91ef07f9f2 [formerly 9c9ddaba6a]]
Former-commit-id: 1011ac2cb09f5dc6ca3423e02ff585fc80846ef1 [formerly 47e1a3627f]
Former-commit-id: f0b105bbdf
2014-03-19 18:16:41 +00:00
Steve Harris
24c55c616c Merge branch 'omaha_14.2.1' (14.2.1-13) into development
Former-commit-id: 1dd9192564 [formerly 5efb16fa8b] [formerly d0aeb854f5] [formerly 1dd9192564 [formerly 5efb16fa8b] [formerly d0aeb854f5] [formerly 0c2c5ad4bd [formerly d0aeb854f5 [formerly a2318f04eea89a258400dea526daa4fe67b69271]]]]
Former-commit-id: 0c2c5ad4bd
Former-commit-id: 016a659753 [formerly 5d95d594f8] [formerly 0a080d6ea36c63666072fb90d560b4b114c279fb [formerly b5a2d2237f]]
Former-commit-id: fde598cdbbe0d12d61ab87081d43c79970894959 [formerly 3a82fa7ac6]
Former-commit-id: a936941dff
2014-03-17 15:55:41 -05:00
Steve Harris
157a9ed352 Merge branch 'master_14.2.2' into omaha_14.2.2
Former-commit-id: 2db52dab8e [formerly 951c9b0d31] [formerly d087c8c31e] [formerly 2db52dab8e [formerly 951c9b0d31] [formerly d087c8c31e] [formerly 24fe6a248f [formerly d087c8c31e [formerly 543090e28936ce680e21cda802cfac73ff31ca58]]]]
Former-commit-id: 24fe6a248f
Former-commit-id: 78afbbe325 [formerly 5abea804af] [formerly a54cf16be99c26422929ca49bb4ae500bc503e48 [formerly f878fe8729]]
Former-commit-id: cfa704622f94511321108ca762111c90fac4bd03 [formerly 6cc8f3a295]
Former-commit-id: a612c4e6dd
2014-03-17 15:53:31 -05:00