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

Issue #2330 SubscriptionManagerAction.execute now filters subscriptions by current site id.

Browse source 
Change-Id: I4572837369088bcc1ee0bb4d5fb2349162f386b2

Former-commit-id: 0f12e60d65 [formerly 2ebe39ea37 [formerly 92386c72ba9e7ef3ee0c64caa8b369c23b0367eb]]
Former-commit-id: 2ebe39ea37
Former-commit-id: 96b3794c45
This commit is contained in:
Brad Gonzales 2013-09-04 16:46:35 -05:00
parent 52522da59b
commit df86ac5a44
3 changed files with 23 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/actions/SubscriptionManagerAction.java
View file

@ -31,6 +31,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.viz.core.auth.UserController;
import com.raytheon.uf.viz.core.localization.LocalizationManager;
import com.raytheon.uf.viz.datadelivery.services.DataDeliveryServices;
import com.raytheon.uf.viz.datadelivery.subscription.ISubscriptionManagerFilter;
import com.raytheon.uf.viz.datadelivery.subscription.SubscriptionManagerDlg;
@ -49,6 +50,8 @@ import com.raytheon.uf.viz.datadelivery.subscription.SubscriptionManagerFilters;
* Oct 03, 2012 1241 djohnson Use {@link DataDeliveryPermission}.
* May 28, 2013 1650 djohnson Allow using filters for the Subscription Manager Dialog.
* Jul 26, 2031 2232 mpduff Refactored Data Delivery permissions.
* Sep 04, 2013 2330 bgonzale execute now filters subscriptions by current site id.
*
*
* </pre>
*
@ -77,7 +80,8 @@ public class SubscriptionManagerAction extends AbstractHandler {
@Override
public Object execute(ExecutionEvent arg0) {
return loadSubscriptionManager(SubscriptionManagerFilters.getAll());
return loadSubscriptionManager(SubscriptionManagerFilters
.getBySiteId(LocalizationManager.getInstance().getCurrentSite()));
}
/**

12
cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/SubscriptionManagerFilters.java
View file

@ -36,6 +36,7 @@ import com.raytheon.uf.common.registry.handler.RegistryHandlerException;
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* May 23, 2013 1650 djohnson Initial creation
* Sep 04, 2013 2330 bgonzale Added get by site id.
*
* </pre>
*
@ -101,4 +102,15 @@ public final class SubscriptionManagerFilters {
};
}
public static ISubscriptionManagerFilter getBySiteId(final String siteId) {
return new ISubscriptionManagerFilter() {
@Override
public List<Subscription> getSubscriptions(
ISubscriptionHandler subscriptionHandler)
throws RegistryHandlerException {
return subscriptionHandler.getByFilters(null, siteId);
}
};
}
}

7
edexOsgi/com.raytheon.uf.common.datadelivery.registry/src/com/raytheon/uf/common/datadelivery/registry/ebxml/SubscriptionFilterableQuery.java
View file

@ -35,6 +35,7 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerialize;
* Oct 10, 2012 0726 djohnson Add {@link #setActive(boolean)}.
* Feb 20, 2013 1543 djohnson Add ability to filter on routes.
* May 28, 2013 1650 djohnson More information when failing to schedule.
* Sep 04, 2013 2330 bgonzale OfficeIds attribute is a collection.
*
* </pre>
*
@ -138,7 +139,11 @@ public abstract class SubscriptionFilterableQuery<T> extends
* The value of the officeId attribute to search for.
*/
public void setOfficeId(String officeId) {
setAttribute("officeID", new StringAttribute(officeId));
List<String> officeIdList = new ArrayList<String>();
officeIdList.add(officeId);
StringAttribute stringAtt = new StringAttribute(officeIdList);
stringAtt.setCollection(true);
setAttribute("officeIDs", stringAtt);
}
/**