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

Issue #2974 added DD id to sub dialogs

Browse source 
Change-Id: I2392f4ef1736edd940998a83b4ecba43829f92e7

Former-commit-id: 87075dee8f [formerly 246dfa699f] [formerly 030541d701] [formerly 030541d701 [formerly 5b6c972210]] [formerly ef337f77d2 [formerly 030541d701 [formerly 5b6c972210] [formerly ef337f77d2 [formerly d86b847689c3843a8b49f30a2f0613a34e70167a]]]]
Former-commit-id: ef337f77d2
Former-commit-id: 44248ae472f82b6ecfb1e0dd88bd7e9589214c85 [formerly 185884f62e58f4ad15cd3dbaacca1889be318a36] [formerly 48d96c7a19 [formerly 729cc25047]]
Former-commit-id: 48d96c7a19
Former-commit-id: 7138f246cc
This commit is contained in:
Dave Hladky 2014-04-02 12:26:20 -05:00
parent b2037b2d85
commit f523e4d700
3 changed files with 30 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/SiteSelectionDlg.java
View file

@ -38,6 +38,7 @@ import org.eclipse.swt.widgets.Shell;
import com.raytheon.uf.common.site.SiteData;
import com.raytheon.uf.common.site.SiteData.SiteDataType;
import com.raytheon.uf.common.site.SiteMap;
import com.raytheon.uf.viz.datadelivery.utils.DataDeliveryUtils;
import com.raytheon.viz.ui.dialogs.CaveSWTDialog;
import com.raytheon.viz.ui.widgets.DualListComposite;
import com.raytheon.viz.ui.widgets.duallist.DualListConfig;
@ -53,6 +54,7 @@ import com.raytheon.viz.ui.widgets.duallist.DualListConfig;
* ------------ ---------- ----------- --------------------------
* Apr 29, 2013 1040 mpduff Initial creation
* Feb 11, 2014 2771 bgonzale Show all SiteDataTypes in site list.
* Apr 2, 2014 2974 dhladky DD ID added to list for dropdowns in DD.
*
* </pre>
*
@ -147,15 +149,8 @@ public class SiteSelectionDlg extends CaveSWTDialog {
* @return list of site ids
*/
private List<String> getSiteList() {
SiteMap siteMap = SiteMap.getInstance();
List<String> siteList = new ArrayList<String>();
Map<String, SiteData> siteDataMap = siteMap.getSiteData();
for (Entry<String, SiteData> entry : siteDataMap.entrySet()) {
SiteDataType type = entry.getValue().getType();
siteList.add(entry.getKey());
}
List<String> siteList = DataDeliveryUtils.getDataDeliverySiteList();
// Remove the current site
siteList.remove(this.site);

11
cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/SubscriptionManagerDlg.java
View file

@ -21,6 +21,7 @@ package com.raytheon.uf.viz.datadelivery.subscription;
import java.io.File;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
@ -156,8 +157,8 @@ import com.raytheon.viz.ui.presenter.IDisplay;
* Feb 14, 2014 2806 mpduff Disable activate/deactivate buttons when viewing other site's subscriptions
* Feb 11, 2014 2771 bgonzale Use Data Delivery ID instead of Site.
* Mar 24, 2014 #2951 lvenable Added dispose checks for SWT widgets.
* Mar 31, 2014 2889 dhladky Added username for notification center tracking.
*
* Mar 31, 2014 2889 dhladky Added username for notification center tracking.
* Apr 2, 2014 2974 dhladky DD ID added to list for dropdowns in DD.
*
* </pre>
*
@ -1309,10 +1310,8 @@ public class SubscriptionManagerDlg extends CaveSWTDialog implements
*/
public void loadOfficeNames() {
Map<String, SiteData> siteData = SiteMap.getInstance().getSiteData();
Set<String> sites = siteData.keySet();
officeNames = sites.toArray(new String[sites.size()]);
List<String> siteList = DataDeliveryUtils.getDataDeliverySiteList();
officeNames = siteList.toArray(new String[siteList.size()]);
officeCbo.setItems(officeNames);

21
cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/utils/DataDeliveryUtils.java
View file

@ -48,6 +48,8 @@ import com.raytheon.uf.common.datadelivery.registry.Subscription;
import com.raytheon.uf.common.datadelivery.registry.Time;
import com.raytheon.uf.common.datadelivery.request.DataDeliveryConstants;
import com.raytheon.uf.common.serialization.comm.RequestRouter;
import com.raytheon.uf.common.site.SiteData;
import com.raytheon.uf.common.site.SiteMap;
import com.raytheon.uf.common.time.util.TimeUtil;
import com.raytheon.uf.common.util.CollectionUtil;
import com.raytheon.uf.common.util.SizeUtil;
@ -90,6 +92,7 @@ import com.vividsolutions.jts.geom.Coordinate;
* Oct 11, 2013 2386 mpduff Refactor DD Front end.
* Nov 07, 2013 2291 skorolev Added showText() method for messages with many lines.
* Feb 11, 2014 2771 bgonzale Added Data Delivery ID, getter, and retrieval method.
* Apr 2, 2014 2974 dhladky DD ID added to list for dropdowns in DD.
* </pre>
*
* @author mpduff
@ -857,4 +860,22 @@ public class DataDeliveryUtils {
"Unable to retrieve Data Delivery ID from EDEX.", e);
}
}
/**
* Gets the DD id containing site List.
* @return
*/
public static List<String> getDataDeliverySiteList() {
Map<String, SiteData> siteData = SiteMap.getInstance().getSiteData();
Set<String> sites = siteData.keySet();
List<String> siteList = new ArrayList<String>(sites);
String DDid = DataDeliveryUtils.getDataDeliveryId();
if (!siteList.contains(DDid)) {
siteList.add(DDid);
Collections.sort(siteList);
}
return siteList;
}
}