xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Issue #2112 Fix volume browser sounding errors." into development

Browse source 
Former-commit-id: 008f2f98ad [formerly 8a4506e794] [formerly c57aa39ddd [formerly 019b1d63f11c9d1d57593e26f939d6b089730693]]
Former-commit-id: c57aa39ddd
Former-commit-id: 5d53ab253d
This commit is contained in:
Richard Peter 2013-07-26 10:23:08 -05:00 • committed by Gerrit Code Review
commit 5c59b1257c
2 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/util/CoverageUtils.java
View file

@ -68,7 +68,8 @@ import com.raytheon.viz.alerts.observers.ProductAlertObserver;
* SOFTWARE HISTORY
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* Jan 8, 2010 rjpeter Initial creation
* Jan 08, 2010 rjpeter Initial creation
* Jul 25, 2013 2112 bsteffen Fix volume browser sounding errors.
*
* </pre>
*
@ -149,6 +150,13 @@ public class CoverageUtils implements IAlertObserver {
set.add(new UniqueIdGridCoverageWrapper(coverage));
}
rval = coverageCache.get(datasetId);
if (rval == null) {
HashSet<UniqueIdGridCoverageWrapper> set = new HashSet<UniqueIdGridCoverageWrapper>(
0);
coverageCache.put(datasetId, set);
rval = set;
}
}
List<GridCoverage> finalSet = new ArrayList<GridCoverage>(rval.size());
for (UniqueIdGridCoverageWrapper wrapper : rval) {

10
cave/com.raytheon.viz.volumebrowser/src/com/raytheon/viz/volumebrowser/datacatalog/AbstractInventoryDataCatalog.java
View file

@ -61,7 +61,8 @@ import com.raytheon.viz.volumebrowser.vbui.VolumeBrowserAction;
* SOFTWARE HISTORY
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* Apr 14, 2010 bsteffen Initial creation
* Apr 14, 2010 bsteffen Initial creation
* Jul 25, 2013 2112 bsteffen Fix volume browser sounding errors.
*
* </pre>
*
@ -241,11 +242,14 @@ public abstract class AbstractInventoryDataCatalog extends AbstractDataCatalog {
public List<String> getSupportedSourcesInternal() {
BlockingQueue<String> returnQueue = new LinkedBlockingQueue<String>();
try {
getInventory().checkSources(null, null, null, returnQueue);
AbstractInventory inventory = getInventory();
if (inventory != null) {
try {
inventory.checkSources(null, null, null, returnQueue);
} catch (InterruptedException e) {
statusHandler.handle(Priority.PROBLEM, e.getLocalizedMessage(), e);
}
}
List<String> result = new ArrayList<String>(returnQueue);
result.retainAll(MenuItemManager.getInstance()
.getMapOfKeys(DataSelection.SOURCES).keySet());