diff --git a/cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/SubscriptionManagerDlg.java b/cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/SubscriptionManagerDlg.java index d7ab9154ba..fc57c6bdb4 100644 --- a/cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/SubscriptionManagerDlg.java +++ b/cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/SubscriptionManagerDlg.java @@ -123,6 +123,7 @@ import com.raytheon.viz.ui.presenter.IDisplay; * May 09, 2013 2000 djohnson Copy subscription now requires editing first to prevent duplicates, and remove duplicate code. * May 17, 2013 1040 mpduff Change office id to list for shared subscription. * May 28, 2013 1650 djohnson Allow specifying filters for what subscriptions to show. + * Jun 05, 2013 2064 mpduff Fix for filtering combo boxes. * Jun 06, 2013 2030 mpduff Refactored help. * * @@ -212,6 +213,15 @@ public class SubscriptionManagerDlg extends CaveSWTDialog implements private final ISubscriptionManagerFilter filter; + /** The selected office */ + private String selectedOffice; + + /** The selected group */ + private String selectedGroup; + + /** The office display list */ + private final SortedSet officeDisplayItems = new TreeSet(); + /** * Constructor * @@ -779,6 +789,8 @@ public class SubscriptionManagerDlg extends CaveSWTDialog implements final String group = groupCbo.getText(); final String office = officeCbo.getText(); + this.selectedOffice = office; + this.selectedGroup = group; tableComp.setSubscriptionFilter(new ISubscriptionManagerFilter() { @Override @@ -953,17 +965,18 @@ public class SubscriptionManagerDlg extends CaveSWTDialog implements groupNameList.add(0, "All Subscriptions"); groupNames = groupNameList.toArray(new String[0]); groupCbo.setItems(groupNames); - groupCbo.select(0); + + if (this.selectedGroup != null) { + groupCbo.select(groupNameList.indexOf(selectedGroup)); + } else { + groupCbo.select(0); + } } /** * Return the list of office names available. Default is "ALL" office ids */ public void loadOfficeNames() { - - // Create sorted set - SortedSet officeDisplayItems = new TreeSet(); - int numRows = tableComp.getTable().getItemCount(); if (numRows > 0) { @@ -983,16 +996,21 @@ public class SubscriptionManagerDlg extends CaveSWTDialog implements officeAll[0] = "ALL"; System.arraycopy(officeNames, 0, officeAll, 1, officeNames.length); - int idx = 0; - for (String site : officeAll) { - if (site.equalsIgnoreCase(CURRENT_SITE)) { - break; - } - idx++; - } officeCbo.setItems(officeAll); - officeCbo.select(idx); + String site = CURRENT_SITE; + if (this.selectedOffice != null) { + for (Iterator iter = officeDisplayItems.iterator(); iter + .hasNext();) { + String next = iter.next(); + if (next.equals(selectedOffice)) { + site = next; + break; + } + } + } + + officeCbo.select(officeCbo.indexOf(site)); } /* diff --git a/cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/subset/GriddedSubsetManagerDlg.java b/cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/subset/GriddedSubsetManagerDlg.java index c4e11807d4..7eef8ca748 100644 --- a/cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/subset/GriddedSubsetManagerDlg.java +++ b/cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/subset/GriddedSubsetManagerDlg.java @@ -620,22 +620,13 @@ public class GriddedSubsetManagerDlg sub.setTime(newTime); - // TODO Phase 1 is only gridded coverage GriddedCoverage cov = (GriddedCoverage) dataSet.getCoverage(); cov.setModelName(dataSet.getDataSetName()); cov.setGridName(getNameText()); GridCoverage coverage = cov.getGridCoverage(); coverage.setName(getNameText()); - if (spatialTabControls.useDataSetSize()) { - cov.setRequestEnvelope(cov.getEnvelope()); - sub.setFullDataSet(true); - } else { - cov.setRequestEnvelope(spatialTabControls.getEnvelope()); - sub.setFullDataSet(false); - } - - sub.setCoverage(cov); + setCoverage(sub, cov); return sub; } diff --git a/cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/subset/PointSubsetManagerDlg.java b/cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/subset/PointSubsetManagerDlg.java index b1405088ef..1480a48d55 100644 --- a/cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/subset/PointSubsetManagerDlg.java +++ b/cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/subset/PointSubsetManagerDlg.java @@ -19,7 +19,10 @@ **/ package com.raytheon.uf.viz.datadelivery.subscription.subset; +import java.util.ArrayList; import java.util.Date; +import java.util.List; +import java.util.Map; import org.eclipse.swt.SWT; import org.eclipse.swt.layout.GridData; @@ -30,6 +33,7 @@ import org.eclipse.swt.widgets.TabFolder; import org.eclipse.swt.widgets.TabItem; import com.raytheon.uf.common.datadelivery.registry.Coverage; +import com.raytheon.uf.common.datadelivery.registry.Parameter; import com.raytheon.uf.common.datadelivery.registry.PointDataSet; import com.raytheon.uf.common.datadelivery.registry.PointTime; import com.raytheon.uf.common.datadelivery.registry.Subscription; @@ -171,10 +175,17 @@ public class PointSubsetManagerDlg extends newTime.setEndDate(new Date()); sub.setTime(newTime); - Coverage coverage = new Coverage(); - coverage.setEnvelope(spatialTabControls.getEnvelope()); - sub.setCoverage(coverage); + Coverage cov = new Coverage(); + setCoverage(sub, cov); + + List paramList = new ArrayList(); + Map paramMap = dataSet.getParameters(); + for (String key : paramMap.keySet()) { + paramList.add(paramMap.get(key)); + } + + sub.setParameter(paramList); return sub; } diff --git a/cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/subset/SubsetManagerDlg.java b/cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/subset/SubsetManagerDlg.java index 31e0aa6278..75f5dee821 100644 --- a/cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/subset/SubsetManagerDlg.java +++ b/cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/subset/SubsetManagerDlg.java @@ -45,6 +45,7 @@ import org.opengis.referencing.operation.TransformException; import com.google.common.base.Preconditions; import com.raytheon.uf.common.datadelivery.registry.AdhocSubscription; +import com.raytheon.uf.common.datadelivery.registry.Coverage; import com.raytheon.uf.common.datadelivery.registry.DataSet; import com.raytheon.uf.common.datadelivery.registry.DataType; import com.raytheon.uf.common.datadelivery.registry.GriddedDataSet; @@ -1006,4 +1007,21 @@ public abstract class SubsetManagerDlg