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

Merge "Issue #2458 - Fixed product browser for DD so only active subs from local site are displayed" into development

Browse source 
Former-commit-id: b296fd1d02 [formerly 4c9bcf718a [formerly d3559746302f09db933f9b8deecfe410e63d8430]]
Former-commit-id: 4c9bcf718a
Former-commit-id: c82e143fe1
This commit is contained in:
Richard Peter 2013-11-19 13:18:05 -06:00 • committed by Gerrit Code Review
commit d7bc1d2975
1 changed files with 17 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/DataDeliveryProductBrowserDataDefinition.java
View file

@ -32,6 +32,7 @@ import com.raytheon.uf.common.datadelivery.registry.AdhocSubscription;
import com.raytheon.uf.common.datadelivery.registry.Coverage;
import com.raytheon.uf.common.datadelivery.registry.DataType;
import com.raytheon.uf.common.datadelivery.registry.Subscription;
import com.raytheon.uf.common.datadelivery.registry.Utils.SubscriptionStatus;
import com.raytheon.uf.common.datadelivery.registry.handlers.IAdhocSubscriptionHandler;
import com.raytheon.uf.common.datadelivery.registry.handlers.ISubscriptionHandler;
import com.raytheon.uf.common.dataquery.requests.RequestConstraint;
@ -42,6 +43,7 @@ import com.raytheon.uf.common.status.IUFStatusHandler;
import com.raytheon.uf.common.status.UFStatus;
import com.raytheon.uf.common.status.UFStatus.Priority;
import com.raytheon.uf.common.time.BinOffset;
import com.raytheon.uf.viz.core.localization.LocalizationManager;
import com.raytheon.uf.viz.core.rsc.AbstractRequestableResourceData;
import com.raytheon.uf.viz.core.rsc.DisplayType;
import com.raytheon.uf.viz.core.rsc.LoadProperties;
@ -69,6 +71,7 @@ import com.raytheon.viz.pointdata.util.PointDataInventory;
* Sep 17, 2013 2391 mpduff Initial creation
* Sept 22, 2013 2246 dhladky Setup binoffset for time into +-5 min intervals
* Oct 13, 2013 2460 dhladky Added display of Adhoc subscriptions
* Nov 19, 2013 2458 mpduff Only pull subscriptions for the local site
*
* </pre>
*
@ -396,11 +399,13 @@ public class DataDeliveryProductBrowserDataDefinition
activeSubList.clear();
final List<String> subNames = new ArrayList<String>();
List<Subscription> activeSubs = getSubscriptions();
for (Subscription s : activeSubs) {
if (s.getDataSetType() == dataType) {
activeSubList.add(s);
subNames.add(s.getName());
List<Subscription> subList = getSubscriptions();
for (Subscription s : subList) {
if (SubscriptionStatus.ACTIVE.toString().equals(s.getStatus())) {
if (s.getDataSetType() == dataType) {
activeSubList.add(s);
subNames.add(s.getName());
}
}
}
@ -431,7 +436,8 @@ public class DataDeliveryProductBrowserDataDefinition
final ISubscriptionHandler handler = RegistryObjectHandlers
.get(ISubscriptionHandler.class);
try {
subList = handler.getActive();
subList = handler.getByFilters(null, LocalizationManager
.getInstance().getCurrentSite());
} catch (RegistryHandlerException e) {
statusHandler.handle(Priority.PROBLEM, e.getLocalizedMessage(), e);
}