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

Issue #2477 - Fix bug in group settings in create sub dlg.

Browse source 
Change-Id: I32921ec989bb72cfbaea898af5b696c18d514f4c

Former-commit-id: a9c8797e9e [formerly 6111ef3dacff5be7f3fa80334553646b988b60d2]
Former-commit-id: 1485ddd779
This commit is contained in:
Mike Duff 2013-10-15 10:55:15 -05:00 • committed by Gerrit Code Review
parent b089df5ca1
commit 9e2a8a0e04
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/common/ui/GroupSelectComp.java
View file

@ -50,6 +50,7 @@ import com.raytheon.viz.ui.presenter.components.ComboBoxConf;
* Dec 18, 2012 1440 mpduff Ignore "None" group.
* Jan 02, 2013 1441 djohnson Add isGroupSelected(), separate NO_GROUP constant to reusable location.
* Oct 14, 2013 2386 mpduff Added NONE_AVAILABLE constant.
* OCt 15, 2013 2477 mpduff Removed NONE_AVAILABLE constant.
* </pre>
*
* @author jpiatt
@ -57,8 +58,6 @@ import com.raytheon.viz.ui.presenter.components.ComboBoxConf;
*/
public class GroupSelectComp extends Composite {
public final static String NONE_AVAILABLE = "None Available";
/** Group Name combo box. */
private Combo groupNameCombo;

7
cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/CreateSubscriptionDlg.java
View file

@ -139,7 +139,8 @@ import com.raytheon.viz.ui.presenter.components.ComboBoxConf;
* Aug 30, 2013 2288 bgonzale Added display of priority and latency rules.
* Sep 04, 2013 2314 mpduff Pass in the office to Shared Subscription Dialog.
* Sept 30, 2013 1797 dhladky separated Time from GriddedTime
* Oct 11, 2013 2386 mpduff Refactor DD Front end.
* Oct 11, 2013 2386 mpduff Refactor DD Front end.
* Oct 15, 2013 2477 mpduff Fix bug in group settings.
*
* </pre>
*
@ -1382,7 +1383,7 @@ public class CreateSubscriptionDlg extends CaveSWTDialog {
}
// if group selected check if properties match saved group
if (GroupSelectComp.NONE_AVAILABLE.equals(this.groupSelectComp
if (!GroupDefinition.NO_GROUP.equals(this.groupSelectComp
.getGroupName()) && valid) {
groupDefinition = GroupDefinitionManager
.getGroup(this.groupSelectComp.getGroupName());
@ -1729,7 +1730,7 @@ public class CreateSubscriptionDlg extends CaveSWTDialog {
activePeriodEndDate,
activePeriodStartCal.get(Calendar.YEAR), now);
setStartDate(activePeriodStartDate);
setActiveStartDate(activePeriodStartDate);
setActiveEndDate(activePeriodEndDate);
setAlwaysActive(false);
} else {

2
cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/subset/SubsetManagerDlg.java
View file

@ -130,6 +130,7 @@ import com.raytheon.viz.ui.presenter.IDisplay;
* Jun 11, 2013 2064 mpduff Fix editing of subscriptions.
* Jun 14, 2013 2108 mpduff Refactored DataSizeUtils.
* Oct 11, 2013 2386 mpduff Refactor DD Front end.
* Oct 15, 2013 2477 mpduff Remove debug code.
* </pre>
*
* @author mpduff
@ -473,7 +474,6 @@ public abstract class SubsetManagerDlg extends CaveSWTDialog implements
* Launch the Create Subscription GUI
*/
private boolean handleOK(Subscription sub) {
System.out.println("SubsetManagerDlg.handleOK(): Implement Me");
if (this.validated(true)) {
if (subDlg != null && !subDlg.isDisposed()) {
subDlg.bringToTop();