Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordonald.g.dunne2017-09-05 16:32:40 -0400
committerdonald.g.dunne2017-09-05 16:32:40 -0400
commit6bd1b46fb55613fbae9e23843b90ab816624a5e6 (patch)
treea25bb8943ef99de2ea157c0d4821d59ba43e3752
parente7e53a9fa713c6935595b3bdf0e038f6a87190f4 (diff)
downloadorg.eclipse.osee-6bd1b46fb55613fbae9e23843b90ab816624a5e6.tar.gz
org.eclipse.osee-6bd1b46fb55613fbae9e23843b90ab816624a5e6.tar.xz
org.eclipse.osee-6bd1b46fb55613fbae9e23843b90ab816624a5e6.zip
bug[ats_TW1944]: Branch created without selecting new action dialog check
-rw-r--r--plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/wizard/AbstractWizardItem.java10
1 files changed, 7 insertions, 3 deletions
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/wizard/AbstractWizardItem.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/wizard/AbstractWizardItem.java
index 40cd617e67..419187dc83 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/wizard/AbstractWizardItem.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/wizard/AbstractWizardItem.java
@@ -67,6 +67,8 @@ public abstract class AbstractWizardItem implements IAtsWizardItem, IDynamicWidg
new DoubleKeyHashMap<>();
private final IAtsServices services;
private final WizardFields[] fields;
+ private XComboViewer versionCombo;
+ private XCheckBox createBranchCheck;
public AbstractWizardItem(IAtsServices services, WizardFields... fields) {
this.services = services;
@@ -190,7 +192,7 @@ public abstract class AbstractWizardItem implements IAtsWizardItem, IDynamicWidg
comp.setLayout(ALayout.getZeroMarginLayout(2, false));
comp.setLayoutData(new GridData(SWT.LEFT, SWT.TOP, false, false));
- XComboViewer versionCombo = new XComboViewer("Targeted Version", SWT.NONE);
+ versionCombo = new XComboViewer("Targeted Version", SWT.NONE);
Collection<Object> objects = new LinkedList<>();
objects.addAll(versions);
versionCombo.setInput(objects);
@@ -202,7 +204,7 @@ public abstract class AbstractWizardItem implements IAtsWizardItem, IDynamicWidg
comp2.setLayout(ALayout.getZeroMarginLayout(2, false));
comp2.setLayoutData(new GridData(SWT.LEFT, SWT.TOP, false, false));
- final XCheckBox createBranchCheck = new XCheckBox("Create Branch Automatically");
+ createBranchCheck = new XCheckBox("Create Branch Automatically");
createBranchCheck.setToolTip(
"Branch will be completed after Action Creation (Valid Targeted Version must be selected)");
createBranchCheck.setEditable(false);
@@ -323,7 +325,9 @@ public abstract class AbstractWizardItem implements IAtsWizardItem, IDynamicWidg
wizardCompletedFeatureGroup(teamWf, teamDef, changes);
wizardCompletedUnPlanned(teamWf, teamDef, changes);
- changes.addExecuteListener(new CreateBranch(teamDef));
+ if (versionCombo.getSelected() != null && createBranchCheck.isChecked()) {
+ changes.addExecuteListener(new CreateBranch(teamDef));
+ }
}
}

Back to the top