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

Merge "Issue #3026 - Fix for HPE displays is volume browser" into omaha_14.3.1

Browse source 
Former-commit-id: e4da2244f9 [formerly b46b4b51a8] [formerly 63c505f357 [formerly 1cf731bc43346810f1976650ad509ee538cf3067]]
Former-commit-id: 63c505f357
Former-commit-id: 102d0e7a29
This commit is contained in:
Nate Jensen 2014-11-21 15:46:16 -06:00 • committed by Gerrit Code Review
commit e2f2a73ae3
2 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
cave/com.raytheon.uf.viz.hpe/build.properties
View file

@ -1,4 +1,5 @@
source.. = src/ source.. = src/
output.. = bin/ output.. = bin/
bin.includes = META-INF/,\ bin.includes = META-INF/,\
. .,\
plugin.xml

16
cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/record/RequestableDataRecord.java
View file

@ -21,16 +21,18 @@ package com.raytheon.viz.grid.record;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;
import java.util.HashSet;
import java.util.List; import java.util.List;
import java.util.Set;
import com.raytheon.uf.common.inventory.data.AbstractRequestableData;
import com.raytheon.uf.common.inventory.exception.DataCubeException;
import com.raytheon.uf.common.dataplugin.PluginException; import com.raytheon.uf.common.dataplugin.PluginException;
import com.raytheon.uf.common.dataplugin.grid.GridRecord; import com.raytheon.uf.common.dataplugin.grid.GridRecord;
import com.raytheon.uf.common.datastorage.Request; import com.raytheon.uf.common.datastorage.Request;
import com.raytheon.uf.common.datastorage.records.FloatDataRecord; import com.raytheon.uf.common.datastorage.records.FloatDataRecord;
import com.raytheon.uf.common.datastorage.records.IDataRecord; import com.raytheon.uf.common.datastorage.records.IDataRecord;
import com.raytheon.uf.common.gridcoverage.GridCoverage; import com.raytheon.uf.common.gridcoverage.GridCoverage;
import com.raytheon.uf.common.inventory.data.AbstractRequestableData;
import com.raytheon.uf.common.inventory.exception.DataCubeException;
import com.raytheon.uf.common.parameter.Parameter; import com.raytheon.uf.common.parameter.Parameter;
import com.raytheon.uf.viz.core.exception.VizException; import com.raytheon.uf.viz.core.exception.VizException;
import com.raytheon.viz.grid.data.GridRequestableData; import com.raytheon.viz.grid.data.GridRequestableData;
@ -48,6 +50,7 @@ import com.raytheon.viz.grid.util.TiltRequest;
* ------------ ---------- ----------- -------------------------- * ------------ ---------- ----------- --------------------------
* Mar 18, 2010 bsteffen Initial creation * Mar 18, 2010 bsteffen Initial creation
* Aug 30, 2013 2298 rjpeter Make getPluginName abstract * Aug 30, 2013 2298 rjpeter Make getPluginName abstract
* Nov 21, 2014 3026 mpduff Set secondary ID if it exists.
* *
* *
* </pre> * </pre>
@ -68,9 +71,12 @@ public class RequestableDataRecord extends GridRecord {
GridCoverage coverage = null; GridCoverage coverage = null;
if (requester.getSpace() instanceof GridCoverage) { if (requester.getSpace() instanceof GridCoverage) {
coverage = (GridCoverage) requester.getSpace(); coverage = (GridCoverage) requester.getSpace();
if (requester instanceof GridRequestableData) { Set<String> secondaryIds = new HashSet<String>();
setSecondaryId(((GridRequestableData) requester) for (GridRequestableData data : getGribRequests()) {
.getGridSource().getSecondaryId()); secondaryIds.add(data.getGridSource().getSecondaryId());
}
if (secondaryIds.size() == 1) {
setSecondaryId(secondaryIds.iterator().next());
} }
} }
setDatasetId(requester.getSource()); setDatasetId(requester.getSource());