From 21323fe41c1e6e1af86b3c5aa510c8d517764c93 Mon Sep 17 00:00:00 2001 From: Mike Duff Date: Tue, 15 Oct 2013 09:52:08 -0500 Subject: [PATCH] Issue #2386 - Fix for editing subscriptions from subscription manager dlg. Change-Id: I0d5532648456cc1a0960fb14e9115c52d4478682 Former-commit-id: 15fe243ebc27accd4122be9041965a4ee4f4f359 [formerly 15fe243ebc27accd4122be9041965a4ee4f4f359 [formerly f32286059bfc661408ab16d8a6a118beffe0ce17]] Former-commit-id: 65c693d5c456c41a23e2205d4783e13974a937a6 Former-commit-id: a49af4489ec577ec5272cc60636ee5a53406d464 --- .../subset/GriddedSubsetManagerDlg.java | 37 ++++++++----------- .../subset/PointSubsetManagerDlg.java | 15 +------- .../subscription/subset/SubsetManagerDlg.java | 10 +++-- 3 files changed, 23 insertions(+), 39 deletions(-) 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 cbfebd0a6d..2c2133bcd8 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 @@ -149,8 +149,6 @@ public class GriddedSubsetManagerDlg extends SubsetManagerDlg { /** Gridded data size utility */ private GriddedDataSizeUtils dataSize; - private final GriddedDataSet dataSet; - private GriddedTimingSubsetTab timingTabControls; /** @@ -166,9 +164,8 @@ public class GriddedSubsetManagerDlg extends SubsetManagerDlg { public GriddedSubsetManagerDlg(Shell shell, boolean loadDataSet, Subscription subscription) { super(shell, loadDataSet, subscription); - this.dataSet = (GriddedDataSet) MetaDataManager.getInstance() - .getDataSet(subscription.getDataSetName(), - subscription.getProvider()); + this.dataSet = MetaDataManager.getInstance().getDataSet( + subscription.getDataSetName(), subscription.getProvider()); setTitle(); } @@ -206,19 +203,12 @@ public class GriddedSubsetManagerDlg extends SubsetManagerDlg { setTitle(); } - /** - * {@inheritDoc} - */ - @Override - protected void setTitle() { - setText(DD_SUBSET_MANAGER + dataSet.getDataSetName()); - } - /** * {@inheritDoc} */ @Override protected void createTabs(TabFolder tabFolder) { + GriddedDataSet griddedDataSet = (GriddedDataSet) dataSet; GridData gd = new GridData(SWT.CENTER, SWT.DEFAULT, true, false); GridLayout gl = new GridLayout(1, false); @@ -243,7 +233,7 @@ public class GriddedSubsetManagerDlg extends SubsetManagerDlg { timingTab.setControl(timingComp); timingTabControls = new GriddedTimingSubsetTab(timingComp, this, shell); - Ensemble e = dataSet.getEnsemble(); + Ensemble e = griddedDataSet.getEnsemble(); if (e != null && e.getMembers() != null) { TabItem ensembleTabItem = new TabItem(tabFolder, SWT.NONE, 2); Composite ensembleComp = new Composite(tabFolder, SWT.NONE); @@ -252,7 +242,7 @@ public class GriddedSubsetManagerDlg extends SubsetManagerDlg { true, false)); ensembleTabItem.setControl(ensembleComp); ensembleTab = new GriddedEnsembleSubsetTab(ensembleComp, - dataSet.getEnsemble()); + griddedDataSet.getEnsemble()); ensembleTab.addListener(this); ensembleTabItem.setText(ensembleTab.getName()); } @@ -266,7 +256,7 @@ public class GriddedSubsetManagerDlg extends SubsetManagerDlg { spatialTabControls = new SpatialSubsetTab(spatialComp, dataSet, this); SortedSet forecastHours = new TreeSet( - dataSet.getForecastHours()); + griddedDataSet.getForecastHours()); List forecastHoursAsString = new ArrayList(); for (Integer integer : forecastHours) { @@ -515,7 +505,7 @@ public class GriddedSubsetManagerDlg extends SubsetManagerDlg { } if (dataSize == null) { - this.dataSize = new GriddedDataSizeUtils(dataSet); + this.dataSize = new GriddedDataSizeUtils((GriddedDataSet) dataSet); } // Update the data set size label text. @@ -541,6 +531,7 @@ public class GriddedSubsetManagerDlg extends SubsetManagerDlg { @Override protected GriddedTime setupDataSpecificTime(Time subTime, Subscription sub) { GriddedTime newTime = (GriddedTime) subTime; + GriddedDataSet griddedDataSet = (GriddedDataSet) dataSet; if (asString.isEmpty()) { SortedSet newestToOldest = new TreeSet( @@ -571,7 +562,7 @@ public class GriddedSubsetManagerDlg extends SubsetManagerDlg { } GriddedTimingSelectionDlg dlg = new GriddedTimingSelectionDlg( - getShell(), dataSet, sub, asString); + getShell(), griddedDataSet, sub, asString); GriddedTimeSelection selection = dlg.openDlg(); @@ -596,8 +587,8 @@ public class GriddedSubsetManagerDlg extends SubsetManagerDlg { } else { // If use latest data is selected then add all cycle times, the // retrieval generator will determine which one to use. - time = dataSet.getTime(); - for (Integer c : new TreeSet(dataSet.getCycles())) { + time = griddedDataSet.getTime(); + for (Integer c : new TreeSet(griddedDataSet.getCycles())) { time.addCycleTime(c); } } @@ -646,6 +637,8 @@ public class GriddedSubsetManagerDlg extends SubsetManagerDlg { @Override protected T populateSubscription(T sub, boolean create) { + GriddedDataSet griddedDataSet = (GriddedDataSet) dataSet; + ArrayList selectedParameterObjs = vTab.getParameters(); sub.setParameter(selectedParameterObjs); sub.setProvider(dataSet.getProviderName()); @@ -653,7 +646,7 @@ public class GriddedSubsetManagerDlg extends SubsetManagerDlg { sub.setDataSetType(dataSet.getDataSetType()); sub.setDataSetName(dataSet.getDataSetName()); - GriddedTime dataSetTime = dataSet.getTime(); + GriddedTime dataSetTime = griddedDataSet.getTime(); GriddedTime newTime = new GriddedTime(); @@ -687,7 +680,7 @@ public class GriddedSubsetManagerDlg extends SubsetManagerDlg { sub.setTime(newTime); } - GriddedCoverage cov = dataSet.getCoverage(); + GriddedCoverage cov = griddedDataSet.getCoverage(); cov.setModelName(dataSet.getDataSetName()); cov.setGridName(getNameText()); GridCoverage coverage = cov.getGridCoverage(); 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 297333e01c..69a0cc91f6 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 @@ -86,9 +86,6 @@ public class PointSubsetManagerDlg extends SubsetManagerDlg { /** Point data size utility */ private PointDataSizeUtils dataSize; - /** The data set */ - private PointDataSet dataSet; - /** The point subset tab */ private PointTimeSubsetTab timingTabControls; @@ -142,14 +139,6 @@ public class PointSubsetManagerDlg extends SubsetManagerDlg { setTitle(); } - /** - * {@inheritDoc} - */ - @Override - protected void setTitle() { - setText(DD_SUBSET_MANAGER + dataSet.getDataSetName()); - } - /** * {@inheritDoc} */ @@ -186,7 +175,7 @@ public class PointSubsetManagerDlg extends SubsetManagerDlg { } if (dataSize == null) { - this.dataSize = new PointDataSizeUtils(dataSet); + this.dataSize = new PointDataSizeUtils((PointDataSet) dataSet); } ReferencedEnvelope env = spatialTabControls.getEnvelope(); @@ -260,7 +249,7 @@ public class PointSubsetManagerDlg extends SubsetManagerDlg { sub.setParameter(paramList); if (dataSize == null) { - this.dataSize = new PointDataSizeUtils(dataSet); + this.dataSize = new PointDataSizeUtils((PointDataSet) dataSet); } sub.setDataSetSize(dataSize.getDataSetSizeInKb(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 6b0f1624d2..99668f6349 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 @@ -193,7 +193,7 @@ public abstract class SubsetManagerDlg extends CaveSWTDialog implements private CreateSubscriptionDlg subDlg; /** The dataset */ - private final DataSet dataSet; + protected DataSet dataSet; /** * Constructor @@ -272,9 +272,6 @@ public abstract class SubsetManagerDlg extends CaveSWTDialog implements */ protected abstract TimeXML getTimeXmlFromSubscription(); - /** Set the title */ - protected abstract void setTitle(); - /** Get the data time information */ protected abstract TimeXML getDataTimeInfo(); @@ -312,6 +309,11 @@ public abstract class SubsetManagerDlg extends CaveSWTDialog implements updateDataSize(); } + /** Set the title */ + protected void setTitle() { + setText(DD_SUBSET_MANAGER + dataSet.getDataSetName()); + } + /* * (non-Javadoc) *