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

138 commits

Author SHA1 Message Date
Zihou Wang
3ea0e0d218 VLab Issue #5020 - DCS_16776 Ingest and display MBA; fixes #5020 
Change-Id: I5206e4efa240924caf07c4499bfb3b4cdf5aee5d

Former-commit-id: 5c86a177b7 [formerly 4fe74892ea [formerly e5e15da2f57e336d8f23444ab0932b710ad2c033]]
Former-commit-id: 4fe74892ea
Former-commit-id: 8d24be996a
 2014-11-21 15:42:48 +00:00
Ana Rivera
147ea30ebb Merge branch 'omaha_14.4.1' into field_14.4.1 
Former-commit-id: 86648e0a20 [formerly 999c66b3e4 [formerly 875c825320bdfb0e051b6d0ad2e530f7a7a16d19]]
Former-commit-id: 999c66b3e4
Former-commit-id: 69832d1fe3
 2014-10-22 12:58:09 +00:00
David Lovely
7b66037194 Omaha #3418 Fixed NPE for cell trends. Fixed possible NPE in PointsDataManager catch block. 
Change-Id: Ice45220f2798e4004d41fa8fe78ccad8b5737f0d

Former-commit-id: 2e7cade8d6 [formerly d7cd4cc845 [formerly 68d3cede303b82dd3fde23255d830289f967a889]]
Former-commit-id: d7cd4cc845
Former-commit-id: f83eb3e69b
 2014-10-20 14:42:39 -05:00
Ana Rivera
056592daa1 Merge branch 'omaha_14.4.1' into field_14.4.1 
Former-commit-id: ec6502df64 [formerly 5894102a1b [formerly 972e3d5117a3df147eaa83429f3649b1c1fb7a3f]]
Former-commit-id: 5894102a1b
Former-commit-id: 9c54ea5b56
 2014-10-17 17:42:56 +00: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
Ana Rivera
a96df6d6ad Merge branch 'omaha_14.4.1' into field_14.4.1 
Change-Id: I04cb8478a05b157e4acfc5f9ef02a9fd9186fe22

Former-commit-id: adfeb13067 [formerly 796380dd53 [formerly 56dc338129ed46612df4db1926e0b7e91551b60d]]
Former-commit-id: 796380dd53
Former-commit-id: 0c11f99805
 2014-09-30 19:59:19 +00:00
Ben Steffensmeier
ed401f7250 Issue #3669 Ensure best res does not parse alert messages. 
Former-commit-id: 95b096192b [formerly c573db2918 [formerly e93157375f90c6cc2038db9a78346592e4d46b0e]]
Former-commit-id: c573db2918
Former-commit-id: b333960362
 2014-09-29 11:20:33 -05:00
Steve Harris
db4aa1cebe 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: b979960b7b [formerly 7692e3f21d [formerly 72f387d2802c12eedfe5643616fe5a54420aef66]]
Former-commit-id: 7692e3f21d
Former-commit-id: 2e2072a963
 2014-09-23 11:41:10 -05:00
Ben Steffensmeier
6d8b9df40b Omaha #3300 Fix component and mosaic merge problems 
Former-commit-id: 217caaba15 [formerly 72f5799c44 [formerly 201854ac4154dc8526bf99bde69674ad51ec50ad]]
Former-commit-id: 72f5799c44
Former-commit-id: 766fdd80a8
 2014-09-19 15:08:21 -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
80f677e1e3 Merge branch 'ops_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1 
Former-commit-id: 57a361073d [formerly e1c88f287a [formerly 5703d4fbb0fa5e422e3fbd62529928091a2bdb1f]]
Former-commit-id: e1c88f287a
Former-commit-id: 1c0d6624a3
 2014-09-17 15:50:13 -04: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
Ben Steffensmeier
189380f33c Issue #3604 Fix NPE in Imaging Dialog. 
Former-commit-id: ed7b816989 [formerly 15f35e6dcc [formerly e2043fd8034dde47963a32108b1475ee7db1ea18]]
Former-commit-id: 15f35e6dcc
Former-commit-id: 3c4285fea1
 2014-09-10 14:43:23 -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
Brian.Dyke
4b84db346d Merge branch 'master_14.2.3' into master_14.2.4 
Former-commit-id: 702dd65aa7 [formerly 9e1ee22146 [formerly 876c6fc4db3901fdcd8dd9a6fb343d2f65254569]]
Former-commit-id: 9e1ee22146
Former-commit-id: 4220590613
 2014-09-05 11:13:12 -04:00
Nate Jensen
8cad8cb257 Issue #3574 Properly dispose radar graphics graphics objects. 
Change-Id: Ica8c630325bada6fd508eeb6b1b4d881a5169320

Former-commit-id: 87d507313b [formerly 2cfbfc1dc4 [formerly 78172a4ac0b9ece26cdc07da3a8f9a70bbc11782]]
Former-commit-id: 2cfbfc1dc4
Former-commit-id: a1bccdc57f
 2014-09-04 10:10:37 -05:00
Zihou Wang
4d1413888c VLab Issue #4464 - DR_17214 RADAR: NEXRAD Unit Status display problem due to the GSM change; fixes #4464 
Change-Id: I0ca330e385000e04ef21142e75adfc55d4615a89

Former-commit-id: a2a2a8cdf9 [formerly 3ffac397db [formerly 288dc7c439995a8ab48680832b63f7d6974885b4]]
Former-commit-id: 3ffac397db
Former-commit-id: dde3ee4904
 2014-08-21 12:04:30 +00:00
Zihou Wang
d71def2617 VLab Issue #3990 - DR_17356 Enhancement to Radar Display of SAILS 0.5 degree products; closes #3990 
Change-Id: I2af5cb375294163d9c20ac7342ef72ebaa6c51ce

Former-commit-id: f54da5f6ae [formerly e9f78d8f52 [formerly f61e935c0372ee19768f2080da1f8fa21fb9aeb1]]
Former-commit-id: e9f78d8f52
Former-commit-id: 2fd6278cf3
 2014-08-15 11:04:39 -05: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
Mark Peters
4ab3b14b30 Omaha #3504 Replace Raytheon references to IODataPreparer 
Change-Id: I376f430154996944bd49c2e72d89e57537b68084

Former-commit-id: 5b3893c56f [formerly ca0df210d9 [formerly 08621067f8046b4260e87583d16950fee1e741de]]
Former-commit-id: ca0df210d9
Former-commit-id: 70a7f2215f
 2014-08-12 12:15:35 -05:00
Baoyu Yin
2647bcfc68 VLab Issue #4404 - DR_17348 RADAR: no data on radar mosaic Hybrid Scan Refl; closes #4404 
Change-Id: I70e6ee57f545ddfbde4cd5d97e358aad571879c8

Former-commit-id: 4b0552c297 [formerly 13fff5d6fa [formerly 3a9b882cad70cdffd0de70ccb11a25e8b16a4dff]]
Former-commit-id: 13fff5d6fa
Former-commit-id: ffca276f44
 2014-08-11 15:21:26 -04:00
Brian Clements
73b2585d80 Omaha #3477 changed plot info locations to floats 
Change-Id: I592ba9d4b514aaed8902f3e8fba33b58200e1c61

Former-commit-id: 8738e9cece [formerly f8a1e79288 [formerly 00504d6aa7fefd7b6d28701aae777c0fb7d5ace5]]
Former-commit-id: f8a1e79288
Former-commit-id: 3b97fd15a7
 2014-08-11 13:43:22 -05:00
Baoyu Yin
74aa456388 VLab Issue #4396 - AWIPS2_DR_16265 minor typo in KXXX Menu; closes #4396 
Change-Id: I44c1ad9968117233c16cb8082d07b9aa233e0d6d

Former-commit-id: f355240287 [formerly dafff40283 [formerly 35283455a8562c02e888d5d955f739fcb7adbf3f]]
Former-commit-id: dafff40283
Former-commit-id: 02e926f569
 2014-08-08 14:55:59 -04:00
Mark Peters
96da09a65a Omaha #3429 Replace Raytheon plugin calls to deprecated IGraphicsTarget.drawLine() 
Change-Id: If0ada7c887b532e98c7d0d6df56c5b1b195c9d8b

Former-commit-id: dbc0015671 [formerly b15b09ee50 [formerly 3bae11d54bee5bf3b4a650bce02b85902ced1cbc]]
Former-commit-id: b15b09ee50
Former-commit-id: 22f86459ae
 2014-08-04 12:10:02 -05:00
Mark Peters
90a74cb89b Omaha #3465 Replace plugin calls to deprecated IGraphicsTarget.drawStrings() 
Change-Id: Ib72cf8806852aff718af56c5f2c2cf4e07f9f548

Former-commit-id: 47aec2aae3 [formerly ad794f8fba [formerly 29d170af7a0c36e614a84923c2fb5054db73c390]]
Former-commit-id: ad794f8fba
Former-commit-id: b40e589488
 2014-07-30 16:03:57 -05:00
Mark Peters
6376572795 Omaha #3429 Replace Raytheon plugin calls to deprecated IGraphicsTarget.drawLine() 
Change-Id: I9de68a9a047a2d6c3744b29de292efb7cfb44bbf

Former-commit-id: bac12d844b [formerly 437e127ebc [formerly a222b29ff24bf81d1c8aefd54fa33f52461c9c25]]
Former-commit-id: 437e127ebc
Former-commit-id: 11abefd4de
 2014-07-29 11:20:53 -05:00
Mark Peters
d04f7dd252 Omaha #3412 Replace drawCircle calls 
Change-Id: I812f1941b0fe1c7601126e327bb001772eedf5ca

Former-commit-id: e4c455f5c0 [formerly e638d2f41b [formerly c176ef7e45f8ad9e8273dd1a74ace2075aacdddd]]
Former-commit-id: e638d2f41b
Former-commit-id: b5a25e7372
 2014-07-21 17:07:02 -05:00
Zihou Wang
0407d9da83 VLab Issue #3990 - DR_17356 Enhancement to Radar Display of SAILS 0.5 degree products; closes #3990 
Change-Id: I2af5cb375294163d9c20ac7342ef72ebaa6c51ce

Former-commit-id: dc0c340094 [formerly ea54766486 [formerly f2c9fc4ba6e9c91dffb2c34b72b4a6b36e872571]]
Former-commit-id: ea54766486
Former-commit-id: 5d614a78d1
 2014-07-11 13:46:05 -04:00
Zihou Wang
90ca2ba554 VLab Issue #3979 - DR17399 Add PPS products to ASR/ARSR menu; closes #3979 
Change-Id: Iecc209b153b812995d5586683869afb9dffaf678

Former-commit-id: fb8220a4d2 [formerly baaf5b234b [formerly b9c5e26a5d9d6f012a6fe507f9f7d7d85245c918]]
Former-commit-id: baaf5b234b
Former-commit-id: 42a1188670
 2014-07-11 13:40:16 -04:00
Zihou Wang
b2ee4929e6 VLab Issue #3989 - DR_15324 Radar Menu - Dual Pol Mosaic Products; closes #3989 
Change-Id: I622781291d2b46df8587d27adbcb759287ab3c21

Former-commit-id: 7fdd3e28d5 [formerly 9c26829ff9 [formerly 1c22067f8750f51820a1b55c7ac4df42d0fc631d]]
Former-commit-id: 9c26829ff9
Former-commit-id: 3f9671241f
 2014-07-11 13:33:42 -04:00
Nate Jensen
b7c6ab2386 Omaha #3165 remove deprecated buildColorMap() 
Change-Id: I1bcf368173ff785c0e05acb9c14cfbaa33080bed

Former-commit-id: 128950ec19 [formerly 766d3323d3 [formerly 6b3aa0f461293e6b8d94f8cfc5f956ab172b2e3c]]
Former-commit-id: 766d3323d3
Former-commit-id: a393ad429a
 2014-06-30 13:22:57 -05:00
Ben Steffensmeier
0a9e0932ce Omaha #3072 Remove RadarRecord dependency for Radial Mesh. 
Former-commit-id: 5c4f89644c [formerly e244664b7d [formerly 664ae8372cd7df344ae66dfec599646b31dbd27b]]
Former-commit-id: e244664b7d
Former-commit-id: 08fe257daa
 2014-06-24 18:16:09 -05:00
Nate Jensen
40c2a6c486 Merge "Omaha #2061 Remove references to IDecoderGettable.Amount from Range Rings." into omaha_14.4.1 
Former-commit-id: 9b7ed95e6b [formerly b1acd1709a [formerly 2ee54c1f78136332f1cd2c40da0c2e7953510e7f]]
Former-commit-id: b1acd1709a
Former-commit-id: 95b2e262a0
 2014-06-16 09:26:30 -05:00
Ben Steffensmeier
0016b16e61 Omaha #3263 Check for null when mosaic time matches. 
Former-commit-id: df2fed2be3 [formerly 5355ca8c1c [formerly 913d70b860c1f129d1632dfd1d84e5fbcca5e2d9]]
Former-commit-id: 5355ca8c1c
Former-commit-id: c105de1a4c
 2014-06-12 15:00:26 -05:00
Ben Steffensmeier
db668f8b63 Omaha #2061 Remove references to IDecoderGettable.Amount from Range Rings. 
Former-commit-id: fc25774506 [formerly f292f204c9 [formerly e267e8b0bae314abf3396db6072c6ff8adc732bf]]
Former-commit-id: f292f204c9
Former-commit-id: 5a4f7a1fd4
 2014-06-11 13:45:42 -05:00
Nate Jensen
7783919a76 Omaha #3266 remove unused attributes and elements from baseline menu xml 
files

Change-Id: I1a1f75f2b2a314679487ddf719f4f0055bdf8d01

Former-commit-id: 955e115c00 [formerly 205e491d71 [formerly 797504a970ec39c4fd56c9e0d51b292acfceea1b]]
Former-commit-id: 205e491d71
Former-commit-id: 23f3a15f31
 2014-06-10 18:30:14 -05:00
Ben Steffensmeier
d2587a7d57 Omaha #3232 Radar code improvements. 
Former-commit-id: 26325b57be [formerly 8587b9b43b [formerly 696f45d67c5e5b02183f97cfcc139db017f01848]]
Former-commit-id: 8587b9b43b
Former-commit-id: 3eb6b79c56
 2014-06-05 14:53:25 -05:00
Ben Steffensmeier
8aff2fc4a1 Omaha #2918 Synchronize mosaic dataTimes. 
Former-commit-id: b078baf67d [formerly 8a117864d8 [formerly c4d8ed9d0d7eb4c17d8a0922302a3fc50a0ae383]]
Former-commit-id: 8a117864d8
Former-commit-id: 93ce7ddb33
 2014-06-02 10:41:45 -05:00
Steve Harris
08308cd279 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: 3b16bbafb1 [formerly 99bc6f990c [formerly 117fa26f537131552bbe51b2c5fe12405a26db32]]
Former-commit-id: 99bc6f990c
Former-commit-id: 3de24b7b07
 2014-05-27 14:48:24 -04:00
Steve Harris
343444715e 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: fc2bf6b45c [formerly cf62cf4a6e [formerly a830db2a282e6a29d119fc0d3357c2223c48d175]]
Former-commit-id: cf62cf4a6e
Former-commit-id: 848519177d
 2014-05-12 16:13:19 -05:00
Brian.Dyke
82ce970ad6 CM-MERGE:OB13.5.5-5 into 14.1.2 
Former-commit-id: 41ba5fc348 [formerly 386ec058e1 [formerly 3b0df2482b87ba9d37dd32d50e8e1fc3b3ae55e3]]
Former-commit-id: 386ec058e1
Former-commit-id: 3aa2f7974b
 2014-05-12 14:07:11 -04:00
Ben Steffensmeier
e712f37076 Issue #3100 Time match mosaics on data update. 
Former-commit-id: 897f67301c [formerly d98bdd64d8 [formerly 3655558c91224a57a31cfb25389cee33258e0227]]
Former-commit-id: d98bdd64d8
Former-commit-id: ae1af14ccd
 2014-05-01 14:17:33 -05:00
Everett Kladstrup
eab1358602 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: 0699041518 [formerly 06d6961c0f [formerly ad4a8cfbbc6de72810492c8f1de9701d381b6019]]
Former-commit-id: 06d6961c0f
Former-commit-id: 8b19b3601a
 2014-04-09 09:31:12 -05:00
Nate Jensen
b0e727938b Merge "Issue #2804 Fixed clipping pane issues where clipped map borders would be visible due to other resources not resetting up the clipping pane when done." into development 
Former-commit-id: 7ac7dd5f01 [formerly f50a2789dd [formerly 788133c5ea1a3005ed309a466e8cafad6db84ce3]]
Former-commit-id: f50a2789dd
Former-commit-id: 75611f0631
 2014-03-04 10:55:05 -06:00
Max Schenkelberg
dbc6cc3fc6 Issue #2861 Rewrote HierarchicalPreferenceStore to be more efficient and thread safe when reading values. 
Amend: Added comments and cleaned up preference store

Change-Id: Iac708c0988fc1b8f552d3bccf76b1706d6324b8d

Former-commit-id: cbf8b9249c [formerly a01a6d68d0 [formerly cc34e3dbebe13ec4f63b7529f5053391135837ef]]
Former-commit-id: a01a6d68d0
Former-commit-id: 59434c8a60
 2014-03-04 09:23:36 -06:00
Max Schenkelberg
4bcdc9f85b Issue #2804 Fixed clipping pane issues where clipped map borders would be visible due to other resources not resetting up the clipping pane when done. 
Change-Id: If27cd7c8e11cdc6287303e6d5fc1f4990e300ada

Former-commit-id: 1854bbb477 [formerly dbcbd1b560 [formerly 51664693bd87df52acdb74d5286b61eeb06b792d]]
Former-commit-id: dbcbd1b560
Former-commit-id: 6edfb8965f
 2014-03-03 17:59:48 -06:00
Ron Anderson
2e8cbade9f Merge branch 'master_14.1.1' into solutions 
Conflicts:
	cave/com.raytheon.uf.viz.xy.crosssection/src/com/raytheon/uf/viz/xy/crosssection/rsc/CrossSectionVectorResource.java
	cave/com.raytheon.uf.viz.xy.timeseries/META-INF/MANIFEST.MF
	cave/com.raytheon.uf.viz.xy.varheight/META-INF/MANIFEST.MF
	cave/com.raytheon.uf.viz.xy.varheight/src/com/raytheon/uf/viz/xy/varheight/rsc/VarHeightResource.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/DataManager.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/rsc/GFEResource.java
	cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/GeneralGridData.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.uf.edex.archive/utility/common_static/base/archiver/purger/PROCESSED_DATA.xml
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/dao/CoreDao.java

Change-Id: I8c5fabf90d864db89a0db7d5f3f6f54c1e5f44a5

Former-commit-id: 62c445d872 [formerly ba7a25a88f [formerly 9f121ec921a2f8635c48f005ddb71787ad6bf166]]
Former-commit-id: ba7a25a88f
Former-commit-id: 0bde38cef3
 2014-01-13 17:45:20 -06:00
Steve Harris
94a748fa8d 14.1.1-14 baseline 
Former-commit-id: 9ef1c841b9 [formerly f2ad9da4eb [formerly 46bdb43889bdc681fec2aba45004a1583caaa6ae]]
Former-commit-id: f2ad9da4eb
Former-commit-id: 6df7c67f95
 2014-01-06 14:02:30 -05:00
Richard Peter
ba577ff354 Merge branch 'omaha_14.1.1' (14.1.1-11) into development 
Conflicts:
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/commondialogs/SCANUnwarnedDlg.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/resource/ScanResourceData.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/AbstractTableDlg.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANCellTableDlg.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANDmdTableDlg.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANMesoTableDlg.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANTvsTableDlg.java
	cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/TableComp.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	cave/com.raytheon.viz.warnings/src/com/raytheon/viz/warnings/rsc/AbstractWWAResource.java
	edexOsgi/com.raytheon.edex.ingestsrv/res/spring/persist-ingest.xml
	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/smartinit/IFPWE.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscMosaic.py
	edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/decoderpostprocessors/EnsembleGridAssembler.java
	edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/annotations/DataURIUtil.java
	msi/VizLauncher/VizLauncher/com/raytheon/viz/launcher/process/AbstractProcessLauncher.cs

Change-Id: Iaf9f42e7ee93949d34c70916fd91acf8c838c83a

Former-commit-id: a0b6ea8bb2 [formerly 0c4ae068ad [formerly b09f1559254f06a82afa91f0cc14c8150f88ce64]]
Former-commit-id: 0c4ae068ad
Former-commit-id: b3b23647b4
 2013-12-05 12:12:27 -06:00
Steve Harris
f53eb87892 14.1.1-12 baseline 
Former-commit-id: a3ec45a99f [formerly b24d9c80b0 [formerly 3b3b8ffbdadc65f41b67f2d649ec18e19521c989]]
Former-commit-id: b24d9c80b0
Former-commit-id: 371d1ca63c
 2013-12-04 16:47:59 -05:00