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

Merge "Issue #2745 - Don't display fulfilled or cancelled allocations" into omaha_14.2.1

Browse source 
Former-commit-id: e16212d24d [formerly d68e99735aab51fa7a5f335534e89141ba00c890]
Former-commit-id: 995e0c538a
This commit is contained in:
Richard Peter 2014-02-04 09:45:08 -06:00 • committed by Gerrit Code Review
commit fb67e4410a
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.dao.SubscriptionRetrieval;
import com.raytheon.uf.edex.datadelivery.bandwidth.retrieval.RetrievalManager; 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.RetrievalPlan;
import com.raytheon.uf.edex.datadelivery.bandwidth.retrieval.RetrievalStatus;
/** /**
* Adapts the {@link BandwidthManager} formatted data into a GUI usable graphing * 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 11, 2013 2566 bgonzale handle case when there are no reservations.
* Dec 17, 2013 2636 bgonzale Refactored bucket fill in edex. * Dec 17, 2013 2636 bgonzale Refactored bucket fill in edex.
* Jan 23, 2014 2636 mpduff Changed download window generation. * Jan 23, 2014 2636 mpduff Changed download window generation.
* Feb 03, 2014 2745 mpduff Don't display fulfilled or cancelled allocations.
* *
* </pre> * </pre>
* *
@ -125,11 +127,15 @@ class BandwidthGraphDataAdapter {
for (BandwidthAllocation allocation : allocationList) { for (BandwidthAllocation allocation : allocationList) {
if (allocation instanceof SubscriptionRetrieval) { if (allocation instanceof SubscriptionRetrieval) {
final SubscriptionRetrieval subRetrieval = (SubscriptionRetrieval) allocation; // Don't display fulfilled or cancelled allocations
String subName = subRetrieval.getBandwidthSubscription() if (allocation.getStatus() != RetrievalStatus.FULFILLED
.getName(); && allocation.getStatus() != RetrievalStatus.CANCELLED) {
subAllocationMapping.addAllocationForSubscription(subName, final SubscriptionRetrieval subRetrieval = (SubscriptionRetrieval) allocation;
allocation); String subName = subRetrieval
.getBandwidthSubscription().getName();
subAllocationMapping.addAllocationForSubscription(
subName, allocation);
}
} }
} }
} }