Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordonald.g.dunne2018-08-27 12:52:12 -0400
committerdonald.g.dunne2018-08-27 12:52:12 -0400
commit19893d5a5767a81eec72e8b7f3e4bf6a5e96c99e (patch)
tree3ee3d2181f11ad8fd61715d44bfdeb9157141885
parent78b5508bbf4a4acf8439ae6ba22326a4689b114f (diff)
downloadorg.eclipse.osee-19893d5a5767a81eec72e8b7f3e4bf6a5e96c99e.tar.gz
org.eclipse.osee-19893d5a5767a81eec72e8b7f3e4bf6a5e96c99e.tar.xz
org.eclipse.osee-19893d5a5767a81eec72e8b7f3e4bf6a5e96c99e.zip
Revert "bug[ats_TW9419]: Use parent branch for applicability only when merge branch"
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/branch/ViewApplicabilityUtil.java17
1 files changed, 12 insertions, 5 deletions
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/branch/ViewApplicabilityUtil.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/branch/ViewApplicabilityUtil.java
index 3505088b92..201d1e0f39 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/branch/ViewApplicabilityUtil.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/branch/ViewApplicabilityUtil.java
@@ -128,13 +128,20 @@ public class ViewApplicabilityUtil {
}
public static boolean isBranchOfProductLine(BranchId branch) {
- return ArtifactQuery.createQueryBuilder(branch).andIsOfType(CoreArtifactTypes.FeatureDefinition).getCount() > 0;
+ int count = ArtifactQuery.createQueryBuilder(branch).andIsOfType(CoreArtifactTypes.FeatureDefinition).getCount();
+ return count > 0;
+
}
public static BranchId getParentBranch(BranchId branch) {
- if (BranchManager.getType(branch).isMergeBranch()) {
- branch = BranchManager.getParentBranch(branch);
+ if (branch != null) {
+ BranchId parentBranch = BranchManager.getParentBranch(branch);
+ if (ViewApplicabilityUtil.isBranchOfProductLine(parentBranch)) {
+ return parentBranch;
+ }
+ return branch;
}
- return branch;
+ return null;
}
-} \ No newline at end of file
+
+}

Back to the top