feature[TW18065]: Convert ChangeUiUtil.permissionsDeniedWithDialog to BranchToken
Change-Id: I0cc778e21cee354dcab24f733f86abac4145bede
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/ChangeUiUtil.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/ChangeUiUtil.java
index 2458e8c..6659353 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/ChangeUiUtil.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/ChangeUiUtil.java
@@ -43,7 +43,8 @@
public static void open(BranchId branch, boolean showTransactionTab) {
Conditions.checkNotNull(branch, "Branch");
- if (permissionsDeniedWithDialog(branch)) {
+ Branch brch = BranchManager.getBranch(branch);
+ if (permissionsDeniedWithDialog(brch)) {
return;
}
@@ -57,7 +58,7 @@
*
* @return true if permissions denied
*/
- public static boolean permissionsDeniedWithDialog(BranchId branch) {
+ public static boolean permissionsDeniedWithDialog(BranchToken branch) {
boolean hasPermission = AccessControlManager.hasPermission(branch, PermissionEnum.READ);
if (!hasPermission) {
AWorkbench.popup("Access Denied",
@@ -70,7 +71,7 @@
public static void open(TransactionToken transaction) {
Conditions.checkNotNull(transaction, "TransactionId");
Branch branch = BranchManager.getBranch(transaction);
- if (branch.isInvalid() || permissionsDeniedWithDialog(transaction.getBranch())) {
+ if (branch.isInvalid() || permissionsDeniedWithDialog(branch)) {
return;
}
open(createInput(transaction, true));
@@ -84,7 +85,7 @@
throw new OseeArgumentException("Invalid selection - transactions art not on the same branch.", txDelta);
}
Branch branch = BranchManager.getBranch(startTx);
- if (branch.isInvalid() || permissionsDeniedWithDialog(startTx.getBranch())) {
+ if (branch.isInvalid() || permissionsDeniedWithDialog(branch)) {
return;
}
open(createInput(CompareType.COMPARE_SPECIFIC_TRANSACTIONS, txDelta, true));
@@ -149,7 +150,7 @@
return;
}
branch = BranchManager.getBranch(parentBranch);
- if (branch.isInvalid() || permissionsDeniedWithDialog(parentBranch)) {
+ if (branch.isInvalid() || permissionsDeniedWithDialog(branch)) {
return;
}
ChangeReportEditorInput input = createInput(workingBranch, parentBranch, true);
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/ArtifactSearchPage.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/ArtifactSearchPage.java
index e184f9c..bb087b6 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/ArtifactSearchPage.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/ArtifactSearchPage.java
@@ -31,6 +31,7 @@
import org.eclipse.osee.framework.core.data.ArtifactTypeToken;
import org.eclipse.osee.framework.core.data.AttributeTypeToken;
import org.eclipse.osee.framework.core.data.BranchId;
+import org.eclipse.osee.framework.core.data.BranchToken;
import org.eclipse.osee.framework.core.data.RelationTypeToken;
import org.eclipse.osee.framework.core.enums.PermissionEnum;
import org.eclipse.osee.framework.core.enums.RelationSide;
@@ -167,8 +168,8 @@
}
}
- private BranchId getSelectedBranch() {
- BranchId branch = branchSelect.getData();
+ private BranchToken getSelectedBranch() {
+ BranchToken branch = branchSelect.getData();
if (branch == null) {
branch = BranchManager.getLastBranch();
}
@@ -493,7 +494,7 @@
@Override
public boolean performAction() {
- BranchId searchBranch = getSelectedBranch();
+ BranchToken searchBranch = getSelectedBranch();
if (ChangeUiUtil.permissionsDeniedWithDialog(searchBranch)) {
return false;
}
@@ -509,7 +510,7 @@
@Override
public boolean performReplace() {
- BranchId searchBranch = getSelectedBranch();
+ BranchToken searchBranch = getSelectedBranch();
if (ChangeUiUtil.permissionsDeniedWithDialog(searchBranch)) {
return false;
}
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/XBranchContentProvider.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/XBranchContentProvider.java
index 555f70c..7176e28 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/XBranchContentProvider.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/XBranchContentProvider.java
@@ -62,7 +62,8 @@
public Object[] getChildren(Object parentElement) {
if (parentElement instanceof BranchId) {
if (showChildBranchesUnderParents) {
- if (!ChangeUiUtil.permissionsDeniedWithDialog((BranchId) parentElement)) {
+ BranchToken branch = BranchManager.getBranch((BranchId) parentElement);
+ if (!ChangeUiUtil.permissionsDeniedWithDialog(branch)) {
return getBranchChildren((BranchId) parentElement);
}
}
