refactor: Replace occurances of Branch with IOseeBranch

6 files changed, 35 insertions, 36 deletions

diff --git a/plugins/org.eclipse.osee.framework.access/src/org/eclipse/osee/framework/access/AccessControlManager.java b/plugins/org.eclipse.osee.framework.access/src/org/eclipse/osee/framework/access/AccessControlManager.java
index 81b399100f5..e9879a0b42c 100644
--- a/plugins/org.eclipse.osee.framework.access/src/org/eclipse/osee/framework/access/AccessControlManager.java
+++ b/plugins/org.eclipse.osee.framework.access/src/org/eclipse/osee/framework/access/AccessControlManager.java
@@ -41,7 +41,7 @@ public final class AccessControlManager {
       return accessService;
    }
 
-   public static void lockObjects(Collection<Artifact> objects, Artifact subject) {
+   public static void lockObjects(Collection<Artifact> objects, Artifact subject) throws OseeCoreException {
       getService().lockObjects(objects, subject);
    }
 
@@ -61,7 +61,7 @@ public final class AccessControlManager {
       return getService().getSubjectFromLockedObject(object);
    }
 
-   public static boolean hasLockAccess(Artifact object) {
+   public static boolean hasLockAccess(Artifact object) throws OseeCoreException {
       return getService().hasLockAccess(object);
    }
 
@@ -73,7 +73,7 @@ public final class AccessControlManager {
       return getService().getAccessControlList(object);
    }
 
-   public static AccessObject getAccessObject(Object object) {
+   public static AccessObject getAccessObject(Object object) throws OseeCoreException {
       return getService().getAccessObject(object);
    }
 
@@ -89,7 +89,7 @@ public final class AccessControlManager {
       return getService().hasPermission(object, permission);
    }
 
-   public static void setPermission(Artifact subject, Object object, PermissionEnum permission) {
+   public static void setPermission(Artifact subject, Object object, PermissionEnum permission) throws OseeCoreException {
       getService().setPermission(subject, object, permission);
    }
 
diff --git a/plugins/org.eclipse.osee.framework.access/src/org/eclipse/osee/framework/access/AccessObject.java b/plugins/org.eclipse.osee.framework.access/src/org/eclipse/osee/framework/access/AccessObject.java
index d8a31d2603c..5e6fb8f998b 100644
--- a/plugins/org.eclipse.osee.framework.access/src/org/eclipse/osee/framework/access/AccessObject.java
+++ b/plugins/org.eclipse.osee.framework.access/src/org/eclipse/osee/framework/access/AccessObject.java
@@ -14,7 +14,6 @@ import org.eclipse.osee.framework.access.internal.data.ArtifactAccessObject;
 import org.eclipse.osee.framework.access.internal.data.BranchAccessObject;
 import org.eclipse.osee.framework.core.data.IOseeBranch;
 import org.eclipse.osee.framework.core.exception.OseeCoreException;
-import org.eclipse.osee.framework.core.model.Branch;
 import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
 
 /**
@@ -27,21 +26,21 @@ public abstract class AccessObject {
 
    public abstract int getId();
 
-   public static AccessObject getAccessObject(Object object) {
+   public static AccessObject getAccessObject(Object object) throws OseeCoreException {
       if (object instanceof Artifact) {
          return ArtifactAccessObject.getArtifactAccessObject((Artifact) object);
       } else if (object instanceof IOseeBranch) {
-         return BranchAccessObject.getBranchAccessObject((Branch) object);
+         return BranchAccessObject.getBranchAccessObject((IOseeBranch) object);
       } else {
          return null;
       }
    }
 
-   public static AccessObject getAccessObjectFromCache(Object object) {
+   public static AccessObject getAccessObjectFromCache(Object object) throws OseeCoreException {
       if (object instanceof Artifact) {
          return ArtifactAccessObject.getArtifactAccessObjectFromCache((Artifact) object);
       } else if (object instanceof IOseeBranch) {
-         return BranchAccessObject.getBranchAccessObjectFromCache((Branch) object);
+         return BranchAccessObject.getBranchAccessObjectFromCache((IOseeBranch) object);
       } else {
          return null;
       }
diff --git a/plugins/org.eclipse.osee.framework.access/src/org/eclipse/osee/framework/access/internal/AccessControlService.java b/plugins/org.eclipse.osee.framework.access/src/org/eclipse/osee/framework/access/internal/AccessControlService.java
index 221b6f6956f..cb982fde063 100644
--- a/plugins/org.eclipse.osee.framework.access/src/org/eclipse/osee/framework/access/internal/AccessControlService.java
+++ b/plugins/org.eclipse.osee.framework.access/src/org/eclipse/osee/framework/access/internal/AccessControlService.java
@@ -197,7 +197,8 @@ public class AccessControlService implements IAccessControlService {
                objectToBranchLockCache.put(objectId, branchId);
                lockedObjectToSubject.put(objectId, subjectId);
             } else {
-               AccessObject accessObject = ArtifactAccessObject.getArtifactAccessObject(objectId, branchId);
+               AccessObject accessObject =
+                  ArtifactAccessObject.getArtifactAccessObject(objectId, BranchManager.getBranch(branchId));
                cacheAccessObject(objectId, subjectId, permission, accessObject);
 
                ArtifactType subjectArtifactType = getArtifactTypeCache().getById(subjectArtifactTypeId);
@@ -303,7 +304,7 @@ public class AccessControlService implements IAccessControlService {
       }
    }
 
-   public PermissionEnum getBranchPermission(IBasicArtifact<?> subject, Branch branch) {
+   public PermissionEnum getBranchPermission(IBasicArtifact<?> subject, IOseeBranch branch) throws OseeCoreException {
       PermissionEnum userPermission = null;
       AccessObject accessObject = BranchAccessObject.getBranchAccessObjectFromCache(branch);
 
@@ -315,7 +316,7 @@ public class AccessControlService implements IAccessControlService {
       return userPermission;
    }
 
-   public PermissionEnum getArtifactPermission(IBasicArtifact<?> subject, Artifact artifact) {
+   public PermissionEnum getArtifactPermission(IBasicArtifact<?> subject, Artifact artifact) throws OseeCoreException {
       PermissionEnum userPermission = null;
       AccessObject accessObject = null;
 
@@ -325,7 +326,7 @@ public class AccessControlService implements IAccessControlService {
       }
 
       Integer artId = artifact.getArtId();
-      Integer branchId = artifact.getBranch().getId();
+      Branch branchId = artifact.getFullBranch();
       Integer lockedBranchId;
 
       //      accessObject = accessObjectCache.get(artId, branchId);
@@ -335,7 +336,7 @@ public class AccessControlService implements IAccessControlService {
          lockedBranchId = objectToBranchLockCache.get(artId);
 
          // this object is locked under a different branch
-         if (lockedBranchId.intValue() != branchId.intValue()) {
+         if (lockedBranchId.intValue() != branchId.getId()) {
             userPermission = PermissionEnum.LOCK;
          }
       }
@@ -380,7 +381,7 @@ public class AccessControlService implements IAccessControlService {
       persistPermission(data, false);
    }
 
-   public void setPermission(Artifact subject, Object object, PermissionEnum permission) {
+   public void setPermission(Artifact subject, Object object, PermissionEnum permission) throws OseeCoreException {
       AccessObject accessObject = getAccessObject(object);
 
       boolean newAccessControlData = !accessControlListCache.containsKey(subject.getArtId(), accessObject);
@@ -553,7 +554,7 @@ public class AccessControlService implements IAccessControlService {
       }
    }
 
-   public AccessObject getAccessObject(Object object) {
+   public AccessObject getAccessObject(Object object) throws OseeCoreException {
       return AccessObject.getAccessObject(object);
    }
 
@@ -562,14 +563,14 @@ public class AccessControlService implements IAccessControlService {
       objectToSubjectCache.put(accessObject, subjectId);
    }
 
-   public void lockObjects(Collection<Artifact> objects, Artifact subject) {
+   public void lockObjects(Collection<Artifact> objects, Artifact subject) throws OseeCoreException {
       AccessControlEvent event = new AccessControlEvent();
       event.setEventType(AccessControlEventType.ArtifactsLocked);
       Set<Artifact> lockedArts = new HashSet<Artifact>();
       for (Artifact object : objects) {
          Integer objectArtId = object.getArtId();
          Integer subjectArtId = subject.getArtId();
-         Integer objectBranchId = object.getBranch().getId();
+         Integer objectBranchId = object.getFullBranch().getId();
 
          if (!objectToBranchLockCache.containsKey(objectArtId)) {
             AccessObject accessObject = getAccessObject(object);
@@ -594,7 +595,7 @@ public class AccessControlService implements IAccessControlService {
       Set<Artifact> lockedArts = new HashSet<Artifact>();
       for (Artifact object : objects) {
          Integer objectArtId = object.getArtId();
-         Integer branchId = object.getBranch().getId();
+         Integer branchId = object.getFullBranch().getId();
          Integer lockedBranchId;
 
          if (objectToBranchLockCache.containsKey(objectArtId) && canUnlockObject(object, subject)) {
@@ -650,7 +651,7 @@ public class AccessControlService implements IAccessControlService {
       return subject;
    }
 
-   public boolean hasLockAccess(Artifact object) {
+   public boolean hasLockAccess(Artifact object) throws OseeCoreException {
       boolean hasAccess = false;
 
       if (!object.isInDb()) {
@@ -658,7 +659,7 @@ public class AccessControlService implements IAccessControlService {
       }
 
       if (hasLock(object)) {
-         hasAccess = objectToBranchLockCache.get(object.getArtId()) == object.getBranch().getId();
+         hasAccess = objectToBranchLockCache.get(object.getArtId()) == object.getFullBranch().getId();
       }
       return hasAccess;
    }
diff --git a/plugins/org.eclipse.osee.framework.access/src/org/eclipse/osee/framework/access/internal/ObjectAccessProvider.java b/plugins/org.eclipse.osee.framework.access/src/org/eclipse/osee/framework/access/internal/ObjectAccessProvider.java
index 0a512c6ab36..91b75704d22 100644
--- a/plugins/org.eclipse.osee.framework.access/src/org/eclipse/osee/framework/access/internal/ObjectAccessProvider.java
+++ b/plugins/org.eclipse.osee.framework.access/src/org/eclipse/osee/framework/access/internal/ObjectAccessProvider.java
@@ -59,7 +59,7 @@ public class ObjectAccessProvider implements IAccessProvider {
       } else if (artifact.isHistorical()) {
          userPermission = PermissionEnum.READ;
          reason = "User Permission set to Read - artifact is historical  - artifact is read only";
-      } else if (!artifact.getBranch().isEditable()) {
+      } else if (!artifact.getFullBranch().isEditable()) {
          userPermission = PermissionEnum.READ;
          reason = "User Permission set to Read - artifact's branch is not editable - artifact is read only";
       }
@@ -68,7 +68,7 @@ public class ObjectAccessProvider implements IAccessProvider {
          new AccessDetail<IBasicArtifact<Artifact>>(artifact, userPermission, Scope.createLegacyScope(), reason));
    }
 
-   private void setBranchAccessData(IBasicArtifact<?> userArtifact, Branch branch, AccessData accessData) throws OseeCoreException {
+   private void setBranchAccessData(IBasicArtifact<?> userArtifact, IOseeBranch branch, AccessData accessData) throws OseeCoreException {
       String reason = "Legacy Branch Permission";
       PermissionEnum userPermission = accessService.getBranchPermission(userArtifact, branch);
       accessData.add(branch, new AccessDetail<IOseeBranch>(branch, userPermission, Scope.createLegacyScope(), reason));
diff --git a/plugins/org.eclipse.osee.framework.access/src/org/eclipse/osee/framework/access/internal/data/ArtifactAccessObject.java b/plugins/org.eclipse.osee.framework.access/src/org/eclipse/osee/framework/access/internal/data/ArtifactAccessObject.java
index be11c1a782c..cc68f415bc3 100644
--- a/plugins/org.eclipse.osee.framework.access/src/org/eclipse/osee/framework/access/internal/data/ArtifactAccessObject.java
+++ b/plugins/org.eclipse.osee.framework.access/src/org/eclipse/osee/framework/access/internal/data/ArtifactAccessObject.java
@@ -11,10 +11,12 @@
 package org.eclipse.osee.framework.access.internal.data;
 
 import org.eclipse.osee.framework.access.AccessObject;
+import org.eclipse.osee.framework.core.data.IOseeBranch;
 import org.eclipse.osee.framework.core.exception.OseeCoreException;
 import org.eclipse.osee.framework.database.core.ConnectionHandler;
 import org.eclipse.osee.framework.jdk.core.type.DoubleKeyHashMap;
 import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
+import org.eclipse.osee.framework.skynet.core.artifact.BranchManager;
 
 /**
  * @author Jeff C. Phillips
@@ -61,13 +63,14 @@ public class ArtifactAccessObject extends AccessObject {
       ConnectionHandler.runPreparedUpdate(DELETE_ARTIFACT_ACL, subjectId, artId, branchId);
    }
 
-   public static ArtifactAccessObject getArtifactAccessObject(Artifact artifact) {
+   public static ArtifactAccessObject getArtifactAccessObject(Artifact artifact) throws OseeCoreException {
       Integer artId = artifact.getArtId();
-      Integer branchId = artifact.getBranch().getId();
+      IOseeBranch branchId = artifact.getBranch();
       return getArtifactAccessObject(artId, branchId);
    }
 
-   public static ArtifactAccessObject getArtifactAccessObject(Integer artId, Integer branchId) {
+   public static ArtifactAccessObject getArtifactAccessObject(Integer artId, IOseeBranch branch) throws OseeCoreException {
+      int branchId = BranchManager.getBranchId(branch);
       ArtifactAccessObject accessObject = cache.get(artId, branchId);
 
       if (accessObject == null) {
@@ -77,11 +80,12 @@ public class ArtifactAccessObject extends AccessObject {
       return accessObject;
    }
 
-   public static AccessObject getArtifactAccessObjectFromCache(Artifact art) {
-      return getArtifactAccessObjectFromCache(art.getArtId(), art.getBranch().getId());
+   public static AccessObject getArtifactAccessObjectFromCache(Artifact art) throws OseeCoreException {
+      return getArtifactAccessObjectFromCache(art.getArtId(), art.getBranch());
    }
 
-   public static AccessObject getArtifactAccessObjectFromCache(Integer artId2, Integer branchId2) {
+   public static AccessObject getArtifactAccessObjectFromCache(Integer artId2, IOseeBranch branch) throws OseeCoreException {
+      int branchId2 = BranchManager.getBranchId(branch);
       return cache.get(artId2, branchId2);
    }
 
diff --git a/plugins/org.eclipse.osee.framework.access/src/org/eclipse/osee/framework/access/internal/data/BranchAccessObject.java b/plugins/org.eclipse.osee.framework.access/src/org/eclipse/osee/framework/access/internal/data/BranchAccessObject.java
index a335653c4e1..d4335e5c2c7 100644
--- a/plugins/org.eclipse.osee.framework.access/src/org/eclipse/osee/framework/access/internal/data/BranchAccessObject.java
+++ b/plugins/org.eclipse.osee.framework.access/src/org/eclipse/osee/framework/access/internal/data/BranchAccessObject.java
@@ -15,7 +15,6 @@ import java.util.Map;
 import org.eclipse.osee.framework.access.AccessObject;
 import org.eclipse.osee.framework.core.data.IOseeBranch;
 import org.eclipse.osee.framework.core.exception.OseeCoreException;
-import org.eclipse.osee.framework.core.model.Branch;
 import org.eclipse.osee.framework.database.core.ConnectionHandler;
 import org.eclipse.osee.framework.skynet.core.artifact.BranchManager;
 
@@ -53,8 +52,8 @@ public class BranchAccessObject extends AccessObject {
       ConnectionHandler.runPreparedUpdate(DELETE_BRANCH_ACL, subjectId, branchId);
    }
 
-   public static BranchAccessObject getBranchAccessObject(Branch branch) {
-      return getBranchAccessObject(branch.getId());
+   public static BranchAccessObject getBranchAccessObject(IOseeBranch branch) throws OseeCoreException {
+      return getBranchAccessObject(BranchManager.getBranchId(branch));
    }
 
    public static BranchAccessObject getBranchAccessObject(String branchGuid) throws OseeCoreException {
@@ -72,10 +71,6 @@ public class BranchAccessObject extends AccessObject {
       return branchAccessObject;
    }
 
-   public static BranchAccessObject getBranchAccessObjectFromCache(Branch branch) {
-      return cache.get(branch.getId());
-   }
-
    public static BranchAccessObject getBranchAccessObjectFromCache(IOseeBranch branch) throws OseeCoreException {
       return cache.get(BranchManager.getBranchId(branch));
    }