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

Issue #2745 - Don't display fulfilled or cancelled allocations

Browse source 
Former-commit-id: 9c70fb3261 [formerly 4d529f5051] [formerly f81772f4be] [formerly 9c70fb3261 [formerly 4d529f5051] [formerly f81772f4be] [formerly c9b98868d2 [formerly f81772f4be [formerly 7b7f294622e886d7457d7abe0451d3e819568677]]]]
Former-commit-id: c9b98868d2
Former-commit-id: c9aa63c3c8 [formerly 8b3b5a688f] [formerly 444d2596405cc6142a1dc0b4b806d00c570225c6 [formerly 4a07f6fb4c]]
Former-commit-id: f563b418bf49a1b36f27d31b1c9de60b6b56ab31 [formerly 1065c56bde]
Former-commit-id: a33c96d8fc
This commit is contained in:
Mike Duff 2014-02-03 16:57:03 -06:00
parent b016112b8f
commit f7f6516da2
1 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/BandwidthGraphDataAdapter.java
View file

@ -44,6 +44,7 @@ import com.raytheon.uf.edex.datadelivery.bandwidth.dao.BandwidthSubscription;
import com.raytheon.uf.edex.datadelivery.bandwidth.dao.SubscriptionRetrieval;
import com.raytheon.uf.edex.datadelivery.bandwidth.retrieval.RetrievalManager;
import com.raytheon.uf.edex.datadelivery.bandwidth.retrieval.RetrievalPlan;
import com.raytheon.uf.edex.datadelivery.bandwidth.retrieval.RetrievalStatus;
/**
* Adapts the {@link BandwidthManager} formatted data into a GUI usable graphing
@ -64,6 +65,7 @@ import com.raytheon.uf.edex.datadelivery.bandwidth.retrieval.RetrievalPlan;
* Dec 11, 2013 2566 bgonzale handle case when there are no reservations.
* Dec 17, 2013 2636 bgonzale Refactored bucket fill in edex.
* Jan 23, 2014 2636 mpduff Changed download window generation.
* Feb 03, 2014 2745 mpduff Don't display fulfilled or cancelled allocations.
*
* </pre>
*
@ -125,11 +127,15 @@ class BandwidthGraphDataAdapter {
for (BandwidthAllocation allocation : allocationList) {
if (allocation instanceof SubscriptionRetrieval) {
final SubscriptionRetrieval subRetrieval = (SubscriptionRetrieval) allocation;
String subName = subRetrieval.getBandwidthSubscription()
.getName();
subAllocationMapping.addAllocationForSubscription(subName,
allocation);
// Don't display fulfilled or cancelled allocations
if (allocation.getStatus() != RetrievalStatus.FULFILLED
&& allocation.getStatus() != RetrievalStatus.CANCELLED) {
final SubscriptionRetrieval subRetrieval = (SubscriptionRetrieval) allocation;
String subName = subRetrieval
.getBandwidthSubscription().getName();
subAllocationMapping.addAllocationForSubscription(
subName, allocation);
}
}
}
}