Commit graph

589 commits

Author SHA1 Message Date
Rici.Yu
258dd40710 ASM #16858 - Check in SerpISC tool.
Change-Id: I4c15360c377370bd757ed2eaad7aeade49412fd6

Former-commit-id: 6958f11ea7 [formerly 9c2555466c [formerly 1e8961e4f4a8168b667ce4b689efd88157dfb61c]]
Former-commit-id: 9c2555466c
Former-commit-id: 51adc6a204
2014-10-20 14:39:46 -04:00
Sarah Pontius
87688a1e86 VLab Issue #5012 - HLS/TCV files for OPG Oct-15-2014; fixes #5012
Change-Id: Iacf701775c343077102647136272c92d08776caa

Former-commit-id: cdb47ed221 [formerly 8be0082cc2 [formerly c7b2c66316ccca08b56fe9ece8f8a24ec260207b]]
Former-commit-id: 8be0082cc2
Former-commit-id: 776886f5ea
2014-10-15 10:15:30 -06:00
Nate Jensen
08b6622cec Omaha #3676 harden numpy array to java array conversions to work with
newer versions of python/numpy and not crash when heap cannot be
allocated

Change-Id: I2a83f6e2720de331188ae5b42dd8c86b14900288

Former-commit-id: b23d42f561 [formerly 433e8b6fc1 [formerly 67630fce01ecbd64a760211820af5b5eaff4cade]]
Former-commit-id: 433e8b6fc1
Former-commit-id: 852fe79de3
2014-10-15 09:02:07 -05:00
Sarah Pontius
95ccd7c46f VLab Issue #5001 - HLS/TCV files for OPG Oct-2014; fixes #5001
Change-Id: I4018168e958a75ff7db3dd6cfd88a4ac17947981

Former-commit-id: 6dee51cb9f [formerly 2a96302bfb [formerly b7ccb5162f481e81dc50fcf63b200ab06a959cb8]]
Former-commit-id: 2a96302bfb
Former-commit-id: 3348a672be
2014-10-14 12:04:50 -06:00
Ron Anderson
cd518b18af Issue #3684 Fix GFE notification sending
Change-Id: I3b2ab7f454cb9454a9827ef994002d1b2348f462

Former-commit-id: 5368107615 [formerly c7bf818989 [formerly b538cd55c0662d3d593522817986109c7e03625a]]
Former-commit-id: c7bf818989
Former-commit-id: 95b1633c25
2014-10-09 09:21:29 -05:00
Steve Harris
c0c1ce7700 Merge tag 'OB_14.3.1-25m' into omaha_14.4.1
Conflicts:
	cave/com.raytheon.uf.viz.monitor.fog/src/com/raytheon/uf/viz/monitor/fog/ui/actions/FogAreaConfigAction.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/actions/SafeseasAreaConfigAction.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/actions/SnowAreaConfigAction.java
	cave/com.raytheon.uf.viz.monitor.snow/src/com/raytheon/uf/viz/monitor/snow/ui/dialogs/SnowMonitoringAreaConfigDlg.java
	cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/MonitoringAreaConfigDlg.java
	cave/com.raytheon.viz.core/src/com/raytheon/viz/core/rsc/AbstractSpatialEnabler.java
	cave/com.raytheon.viz.core/src/com/raytheon/viz/core/rsc/BestResResourceData.java
	edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/config/FogMonitorConfigurationManager.java
	edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/config/MonitorConfigurationManager.java
	edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/config/SSMonitorConfigurationManager.java
	edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/config/SnowMonitorConfigurationManager.java

Former-commit-id: c9e37bf440 [formerly ad4393bea3 [formerly 6bb7a7312a22a9585d2f5981d873751879082cb1]]
Former-commit-id: ad4393bea3
Former-commit-id: 39b2199cec
2014-10-07 13:35:58 -05:00
Steve Harris
53dc9657e2 Merge tag 'OB_14.3.1-24m' into omaha_14.4.1
Former-commit-id: 2db03d95b3 [formerly 39c5e9c314 [formerly df9ef1f664e14fa7843328338c5b234022f4bfd4]]
Former-commit-id: 39c5e9c314
Former-commit-id: 06a27b2d3c
2014-10-06 13:57:59 -05:00
Brian.Dyke
5da2026d2b Merge branch 'omaha_14.3.1' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.3.1
Former-commit-id: 92762f46c7 [formerly f440da9c70 [formerly 23d16004c389f0ef708bee2a8bfb84d465b7b36b]]
Former-commit-id: f440da9c70
Former-commit-id: 85d83aefe0
2014-10-03 14:04:46 -04:00
Steve Harris
fa1fa76dd9 Merge branch 'master_14.3.1' (14.3.1-23m) into omaha_14.4.1
Conflicts:
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/IFPClient.java
	cave/com.raytheon.viz.volumebrowser/localization/menus/xml/planesMenusPlanView.xml

        Issue #3648:
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFEDao.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParmManager.java

	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/IFPGridDatabase.java
	edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java

        Issue #3560:
	edexOsgi/com.raytheon.uf.common.registry.ebxml/src/com/raytheon/uf/common/registry/services/RegistryRESTServices.java
	edexOsgi/com.raytheon.uf.common.registry.ebxml/src/com/raytheon/uf/common/registry/services/RegistrySOAPServices.java
        Also modified with the resolution of #3560:
        edexOsgi/com.raytheon.uf.common.registry.ebxml/src/com/raytheon/uf/common/registry/services/RegistryServiceConfiguration.java


Former-commit-id: 2616fe04b6 [formerly da463c484e [formerly 8dc5abec482b4c1c3f3469c0ffc7e06fa697c6cd]]
Former-commit-id: da463c484e
Former-commit-id: f4b771ea72
2014-10-03 10:18:34 -05:00
Brian.Dyke
d1c62c3542 Merge branch 'field_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Former-commit-id: 2ac30f6c22 [formerly f47840e4d9 [formerly ece734cb6218a80fa2dda1b3c43673dc5a31bfbb]]
Former-commit-id: f47840e4d9
Former-commit-id: d4888adc0f
2014-10-02 10:24:04 -04:00
Steve Harris
0a8b36918a Merge branch 'master_14.3.1' (14.3.1-23) into omaha_14.3.1
Former-commit-id: cc34483b0b [formerly e201e1a493 [formerly ace8473f96c6151918ee8ecf61e3b8986d98a68a]]
Former-commit-id: e201e1a493
Former-commit-id: 09d8955b31
2014-10-02 08:09:02 -05:00
dmsys
70cb8d81b0 Merge branch 'master_14.2.4' into master_14.3.1 CM-MERGE:14.2.4-13-14 into 14.3.1
Conflicts:
	cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/StormTrackDisplay.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/IFPClient.java
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/specialWeatherStatement.vm

Former-commit-id: 9f4560c480 [formerly 8c3625cfec [formerly 0bf7ecb27d41f81f1d6727674fc1475eeaa8512c]]
Former-commit-id: 8c3625cfec
Former-commit-id: f704781f4f
2014-09-30 13:45:54 -04:00
Ron Anderson
ed2b4e9bfb Merge "Omaha #2975 optimize lookup of edit areas and gfe configs" into omaha_14.4.1
Former-commit-id: 245804a21a [formerly a9827b0545 [formerly 918dcb1b91fb45b84a82df42b7fe2d3fc2f86fa0]]
Former-commit-id: a9827b0545
Former-commit-id: 8116a665a8
2014-09-29 16:10:37 -05:00
Steve Harris
6900bb61c1 Merge branch 'master_14.3.1' (14.3.1-22m) into omaha_14.4.1
Conflicts:
	cave/com.raytheon.viz.volumebrowser/localization/menus/xml/fieldsMenus.xml
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
	edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/ohdlib/GagePP.java
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/T.xml
	edexOsgi/com.raytheon.uf.tools.cli/impl/src/textdb/TextDB.py

Former-commit-id: 3b6a8a1447 [formerly 90e08b96e1 [formerly c8b5d89c2e202e8bb4ad59d9ced8882ec8c2a6c1]]
Former-commit-id: 90e08b96e1
Former-commit-id: 3598e9b5b6
2014-09-29 12:58:56 -05:00
Nate Jensen
df979f3301 Omaha #2975 optimize lookup of edit areas and gfe configs
Change-Id: Ic89c84e79a27476ebb28573d49f60429424d4c37

Former-commit-id: c3648d1989 [formerly 1b70e053a1 [formerly 860bcc70144d9a8478aef3cc9ebfe84e98b6c4a7]]
Former-commit-id: 1b70e053a1
Former-commit-id: c75ff5530d
2014-09-29 12:29:25 -05:00
Steve Harris
73f0f5b364 Merge branch 'master_14.3.1' (14.3.1-21,22) into omaha_14.3.1
Former-commit-id: c03bc273da [formerly 46da726675 [formerly 49ad8e0e780443a0439227694a92ec8ab683b125]]
Former-commit-id: 46da726675
Former-commit-id: fdfe16985d
2014-09-29 11:14:32 -05:00
Brian.Dyke
fac7a6aaa1 Merge branch 'master_14.2.3' into master_14.2.4
Former-commit-id: 46af1d0857 [formerly 0a497fc015 [formerly 01cb1dc674ae1249d97dc10be5c068de0ed2a222]]
Former-commit-id: 0a497fc015
Former-commit-id: fce029653d
2014-09-29 11:20:57 -04:00
Ana Rivera
17f629b3b6 VLab Issue #4669 - Add Beach Hazards Statement (RM 13467); fixes #4669
Change-Id: I54c1055b87b7bfab0a35fd391c6ef7156fc3d297

Former-commit-id: 9a0e9b17f4 [formerly 535f254357 [formerly 2c16492202230dcbec93cf390b47f400a77a545e]]
Former-commit-id: 535f254357
Former-commit-id: bb533d9ddd
2014-09-24 20:11:29 +00:00
Ron Anderson
9e6099c888 Issue #2729 Revert changes made to PythonPreferenceStore.java in favor changes to GfePyIncludeUtil.java made in #3500.
This reverts commit 426d0fcdd7 [formerly bd7e411653] [formerly 11c8529862] [formerly 2abfe6de77 [formerly 11c8529862 [formerly 552c3e9485ee03c552851c98455e57f12a8f033f]]].

Change-Id: I50a580d7c038b039cc8ebf3e05dd16c4453f8355

Former-commit-id: 61baeb4bcc [formerly b1fa793541 [formerly d1c6475343160eeb02171fb8fc3b04f527203154]]
Former-commit-id: b1fa793541
Former-commit-id: 1b011f4577
2014-09-24 09:17:43 -05:00
Ron Anderson
ab1773e62e Issue #3648 Improve GFE error handling for getAllAvailableParms.
Change-Id: I13d41a3c231a56fe7d6fc4bc3cbfd96e1bdcdccf

Former-commit-id: c37618c16c [formerly 429de3224f [formerly b77b3c916b4dcc9034408220006f941cd301ed3c]]
Former-commit-id: 429de3224f
Former-commit-id: 8d0d43a437
2014-09-23 18:47:38 -05:00
Steve Harris
e3a7796362 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: 4c56844e29 [formerly 091555cf10 [formerly 69c52fb4a22997d0a0f9c620bd20f00b8c5fd4ce]]
Former-commit-id: 091555cf10
Former-commit-id: da530db540
2014-09-19 10:28:57 -05:00
Brian.Dyke
bdffe16188 Merge branch 'master_14.3.1' into asm_14.3.1
Former-commit-id: 97dfb04eb6 [formerly 4bd417b313 [formerly 1f186fb314e78d93adefe03faaa71f348ee207c7]]
Former-commit-id: 4bd417b313
Former-commit-id: c2033ff569
2014-09-17 13:32:25 -04:00
Ron Anderson
ac096c3f9f Issue #3592 Fix issue with priority of file updates
Change-Id: I1404fc8f3c03fab7e828bf40ee01c8d03cfbda58

Former-commit-id: d8471fce1f [formerly f0c5e465b8 [formerly 554ea4118615055d4f2e0d80c58788f55c4b41e9]]
Former-commit-id: f0c5e465b8
Former-commit-id: f560ef000f
2014-09-16 17:25:43 -05:00
Ron Anderson
1408a91175 Issue #3592 Significantly reworked SampleSetManager and sample set dialogs to better match A1 behavior.
Change-Id: I8aef618a5091ee7acae470f5729add3c44287f30

Former-commit-id: 19bd85af5e [formerly 5c7290bf7c [formerly bb859073c6ab56141434b84dc104857759a81d82]]
Former-commit-id: 5c7290bf7c
Former-commit-id: 7a5f911ae2
2014-09-16 13:20:40 -05:00
Steve Harris
04006bdb7a Merge branch 'master_14.3.1' (14.3.1-17) into omaha_14.3.1
Former-commit-id: 57f0a992d9 [formerly d5c0049ba2 [formerly 74d4b836dd8b2eb9a70cf772127d9b7eee23c1bf]]
Former-commit-id: d5c0049ba2
Former-commit-id: eb0a05ab81
2014-09-15 21:13:56 -05:00
Brian.Dyke
eb63c3e61a Merge branch 'master_14.3.1' into asm_14.3.1
Former-commit-id: 1541e4c255 [formerly 216f34fb25 [formerly 8e4f6e96f7b70d6f2b7517f3f0695350506169c7]]
Former-commit-id: 216f34fb25
Former-commit-id: 54b26b3616
2014-09-15 10:46:25 -04:00
Roger Ferrel
b35417acb6 Issue #3516 - Get Color Maps for levels off the dispatch thread.
Change-Id: Icc89f4860eef0b0b404e1e5b66bb0178eedd73dc

Former-commit-id: 246bc4770f [formerly c885873b25 [formerly a67a429eb2d266e66a99b6c18916193cd0d20d9d]]
Former-commit-id: c885873b25
Former-commit-id: fffec40c30
2014-09-11 14:36:50 -05:00
Max Schenkelberg
740d777efc Omaha #3612 Refactored AbstractCAVEComponent to extend CAVEApplication
Change-Id: Iccaa6d95ec47fa41080929e456ff450eb61f41eb

Former-commit-id: 994605c1ce [formerly 3ea9b1b4be [formerly 154c4ac7131ae8f533d4080055d9afe257bf0506]]
Former-commit-id: 3ea9b1b4be
Former-commit-id: 422ceffbdd
2014-09-10 15:43:19 -05:00
Ron Anderson
6471f81a7f Issue #3592 Fixed several localization issue in GFE
Change-Id: I2e65649d490372b5c1738f07c79b5ed15885f8c7

Former-commit-id: b91141ef7b [formerly 52e5636261 [formerly a5ef55df33009948fec139e7729dd53ae4251667]]
Former-commit-id: 52e5636261
Former-commit-id: 57a3542038
2014-09-09 16:10:53 -05:00
Brian.Dyke
d8271549ff 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: 01dfe503f5 [formerly 3d9a3de6e4 [formerly a3365943e7b7972a5c86f8cb1ad39667ab9e0695]]
Former-commit-id: 3d9a3de6e4
Former-commit-id: fe85eb9f70
2014-09-09 11:44:30 -04:00
Chris Cody
c5e477e8ff Omaha #3365 Removing and realigning AWIPS2 Baseline tests
Change-Id: Iba40d0b074df500c52b7302ab59a688680153f48

Former-commit-id: 9e823a47d6 [formerly f4445d24cd [formerly 97000cc70e8d826b3e8828a1731278673e0ac635]]
Former-commit-id: f4445d24cd
Former-commit-id: 39887a4b9c
2014-09-05 10:14:14 -05:00
Ben Steffensmeier
59e6ec282f Omaha #3390 Remove references to deprecated API.
Former-commit-id: e32037b42a [formerly 1d2144e840 [formerly ec7eeeb08af2cbad5d7880ae17ba7b351de23dc3]]
Former-commit-id: 1d2144e840
Former-commit-id: 950075dc59
2014-09-02 15:39:45 -05:00
Ron Anderson
c5a32980d6 Issue #3572 Fixed getNumpy errors for Grid2DFloat
Change-Id: I6caf979c1d531a842f77d23dbd7f8e0865afecce

Former-commit-id: 434d412882 [formerly 46c62a1db6 [formerly e2ecb91569c2f622d45f7301c1eb4e058a2ab641]]
Former-commit-id: 46c62a1db6
Former-commit-id: c7fbca0298
2014-09-02 12:21:42 -05:00
Ron Anderson
63ab6bd9a9 Merge "Omaha #3527 Error occurs when attempting to reset or customize the Localization perspective" into omaha_14.4.1
Former-commit-id: aa6835147b [formerly 6a5d4acf7c [formerly 31578a50044053da2ecf14697764bfac2ee8ac8d]]
Former-commit-id: 6a5d4acf7c
Former-commit-id: 8d9741bd83
2014-09-02 12:08:44 -05:00
Mark Peters
fc72ed828c Omaha #3527 Error occurs when attempting to reset or customize the Localization perspective
Change-Id: Ie029b1aff905b57b5a353e0acf60c5137014c473

Former-commit-id: 045746ec21 [formerly e35a7451c6 [formerly 8099cbe2359334d6718761046a1475fca687af35]]
Former-commit-id: e35a7451c6
Former-commit-id: 966879b8a1
2014-08-29 16:17:22 -05:00
Ron Anderson
0bb6076cdc Omaha #3459 Ensure font is initialized before queryJob runs,
Additional refactoring to someday allow ZoneSelectorResource to use more common code.

Change-Id: I87e4d1a16b6086f4241e67bb1058bb096eb5e062

Former-commit-id: de490ea582 [formerly 8583386e5f [formerly a1896437f432bcb360365d28a0ee7377cec565af]]
Former-commit-id: 8583386e5f
Former-commit-id: f3f2ec8843
2014-08-29 12:04:52 -05:00
Ron Anderson
30ef2a7667 Omaha #3561 Yet another attempt to fix combinations file updating
Change-Id: I4131ed6043e4bbfa2955024b5e3ce4508734585f

Former-commit-id: 9f37d7914a [formerly bd52b5a924 [formerly b1c067fe33d1fe09f89e981b03ef178bcc3a5f93]]
Former-commit-id: bd52b5a924
Former-commit-id: 89cde78ea6
2014-08-29 10:45:54 -05:00
Brian Clements
c0b132d6ee Issue #3500 moved ProcedureXMLManager initialization to CAVE component subclass
Change-Id: Ie8a509a5f5b6b0a358460f0218925458106fd040

Former-commit-id: cfeb16eff8 [formerly b352bd3944 [formerly b3482522860408c2d052261e845899cf73c2ce96]]
Former-commit-id: b352bd3944
Former-commit-id: 981390eb22
2014-08-29 08:55:58 -05:00
Ron Anderson
1e05b981fa Omaha #3563 Fixed GFE site activation to not regenerate edit areas unnecessarily
Change-Id: Ifaa654758e51c64cec552e3c76ee0e3c660a4a34

Former-commit-id: 2b88ade974 [formerly bb1e80b844 [formerly e7acedd733e4f1acc89f6287fe74ff116376a4ca]]
Former-commit-id: bb1e80b844
Former-commit-id: dc185b8dd1
2014-08-28 10:43:54 -05:00
Brian Clements
5d794a5135 Issue #3500 back port of loadConfig.py to fix gfe starup issue
Change-Id: I841af0ac81b86e499c0b52dedab64431e7f1ecd7

Former-commit-id: cf671dcda8 [formerly 4314f71387 [formerly 2a0af03242692708b3e752417ca7d60d28520768]]
Former-commit-id: 4314f71387
Former-commit-id: 960eb2dc29
2014-08-25 13:34:36 -05:00
Ron Anderson
0cb234d764 Omaha #3459 Restructured Map resource class hierarchy so DataStoreResource could use common query job
Change-Id: Id759e14fcec25a68add1b65e9bf48d836ada14c0

Former-commit-id: 606e2b210c [formerly 8434195c57 [formerly 6b6213fe5b0ca48045fa59136b72efdf46f7e3f1]]
Former-commit-id: 8434195c57
Former-commit-id: 56b553ad0d
2014-08-25 12:39:58 -05:00
Brian Clements
d3f0f7dea4 Issue #3500 remove locking on osgi internals, rework gfe client startup
fixed error handling in loadConfig.py
added python to path in GfePyIncludeUtil
moved ProcedureXMLManager to overridable method in AbstractCaveComponent

Change-Id: Ie7dff55657ba216c47f7a56b3506cbed3a3f6ab2

Former-commit-id: 9f7905b58d [formerly d62db22874 [formerly b0ea9a2a04cf043fe1a9e4dbf4d4498b0d3f4684]]
Former-commit-id: d62db22874
Former-commit-id: bcc3e405e5
2014-08-22 08:56:56 -05:00
Ron Anderson
cbb5d9302f Omaha #1664 Fixed invalid thread access in several GFE dialogs
Change-Id: Ib40e6928c61a0f9e4f9fad9d8e7a06a66af292e3

Former-commit-id: bb124e7fa2 [formerly 4178dac741 [formerly 93aa457f4918cd16edd21422819cda12af26250f]]
Former-commit-id: 4178dac741
Former-commit-id: a9d580647e
2014-08-21 09:25:14 -05:00
Rici.Yu
2edc04f27e ASM #15084 - check in files for DCS 25
Change-Id: I956d9f5175e8beb3d52db89035251add51973dda

Former-commit-id: e5c4562e83 [formerly ae581dc444 [formerly eb85d059b64d9c2a41014d8f1762a61e58a5226b]]
Former-commit-id: ae581dc444
Former-commit-id: 30aaafc702
2014-08-20 16:52:08 -04:00
Mark Peters
3b4f4394be Omaha #3523 Replace Raytheon usage of IGraphicsTarget.TextStyle.NORMAL and directly assigning the text style
Change-Id: Idcc31d11251df8de949bd1bd9bf8c402a5d47f4f

Former-commit-id: 4011a4392c [formerly 308ada356b [formerly e409b578fcb15caadf28da57d2cb1860e1ea246c]]
Former-commit-id: 308ada356b
Former-commit-id: f6799659ea
2014-08-14 15:43:17 -05:00
Nate Jensen
d61c65787b Omaha #3356 cleanup of unnecessary register buddies and buddy policies
Change-Id: I1d6c279478f38876a8df67d2f9dd186a2efdeca0

Former-commit-id: 9b72a1399d [formerly b3083a663e [formerly 48536dd79d933508ac54b3b6e9bbd166fd218330]]
Former-commit-id: b3083a663e
Former-commit-id: 253198b5bc
2014-08-14 10:22:37 -05:00
Mark Peters
8231790215 Omaha #3492 Replace Raytheon plugin calls to deprecated IGraphicsTarget.createWireframeShape()
Change-Id: Ie521a2041586825b9fb995a675e5caa550fa5313

Former-commit-id: 8e7d6964c6 [formerly 58dd0873e3 [formerly 0df04ef8a5b4eee4398a411fc02baba22f719eaf]]
Former-commit-id: 58dd0873e3
Former-commit-id: 1d0983cd4a
2014-08-13 12:22:47 -05:00
Nate Jensen
2924215c63 Merge "Omaha #3356 remove registering buddies to viz.volumebrowser and viz.ui since those plugins don't even have buddy policies" into omaha_14.4.1
Former-commit-id: 69a7955015 [formerly 0873be5eac [formerly 4e837f409cdc55d597b8fcd019381353a5bd5b29]]
Former-commit-id: 0873be5eac
Former-commit-id: a6ac3609a9
2014-08-05 10:33:29 -05:00
Brian Clements
c69b29ba14 Issue #2594 added low memory warning job
UiPlugin starts and stops job
job notifies perspective manager of low memory
Viz perspective manager has default alert implementation
D2D and GFE override alert message
added memory threshold property to product files

(cherry picked from commit 8d6a469928 [formerly c63c8e2fc6] [formerly f9a8b68da5] [formerly 0076ec9aaf [formerly f9a8b68da5 [formerly 4af42d405d3bf24b00c027f5dab8faf500a9e5b7]]])

Conflicts:
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/perspective/GFEPerspectiveManager.java
	cave/com.raytheon.viz.product.awips/awips.product

Former-commit-id: 6859f8cca8 [formerly 5a3c66323a [formerly 7fb934f4782d23f1772ba32db05ed0c1c30ff6db]]
Former-commit-id: 5a3c66323a
Former-commit-id: 1cd4dc7d4a
2014-08-05 08:21:27 -05:00
Steve Harris
d606269c5b 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: bf9a0fa5de [formerly 0fb743ec44 [formerly f7d474895366eb23ae5eef242a4568f911435aa3]]
Former-commit-id: 0fb743ec44
Former-commit-id: a92dc418c6
2014-08-04 22:20:29 -05:00