"Team Workflow" - YGHW1 - "Block changes to requirements unless done under an appropriate action."

4 files changed, 28 insertions, 8 deletions

diff --git a/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/RelationTypeSide.java b/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/RelationTypeSide.java
index 19f27d9c591..fef47a002b5 100644
--- a/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/RelationTypeSide.java
+++ b/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/RelationTypeSide.java
@@ -63,4 +63,9 @@ public class RelationTypeSide implements IRelationEnumeration {
    public String getName() {
       return type.getName();
    }
+
+   @Override
+   public String toString() {
+      return "RelationTypeSide [type=" + type + ", side=" + side + "]";
+   }
 }
\ No newline at end of file
diff --git a/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/access/AccessData.java b/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/access/AccessData.java
index 878a97788cb..955be83d916 100644
--- a/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/access/AccessData.java
+++ b/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/access/AccessData.java
@@ -12,7 +12,6 @@ package org.eclipse.osee.framework.core.model.access;
 
 import java.util.Collection;
 import java.util.HashSet;
-import java.util.Map.Entry;
 import java.util.Set;
 import org.eclipse.osee.framework.core.enums.PermissionEnum;
 import org.eclipse.osee.framework.core.exception.OseeCoreException;
@@ -29,7 +28,13 @@ public final class AccessData {
    private final CompositeKeyHashMap<Object, Object, AccessDetail<?>> accessMap =
       new CompositeKeyHashMap<Object, Object, AccessDetail<?>>();
 
+   public AccessData() {
+      super();
+   }
+
    public void addAll(Object key, Collection<AccessDetail<?>> datas) throws OseeCoreException {
+      Conditions.checkNotNull(key, "access key");
+      Conditions.checkNotNull(datas, "accessDetails");
       for (AccessDetail<?> data : datas) {
          add(key, data);
       }
@@ -66,11 +71,20 @@ public final class AccessData {
    @Override
    public String toString() {
       StringBuilder builder = new StringBuilder();
-      for (Entry<Pair<Object, Object>, AccessDetail<?>> entry : accessMap.entrySet()) {
-         builder.append(entry.getKey().getFirst());
-         builder.append(entry.getValue());
-         builder.append(",\n");
+      builder.append("accessData [");
+      if (!accessMap.isEmpty()) {
+         builder.append("\n");
+         for (Object key : keySet()) {
+            for (AccessDetail<?> detail : accessMap.getValues(key)) {
+               builder.append("\t");
+               builder.append(key);
+               builder.append(" - ");
+               builder.append(detail);
+               builder.append(",\n");
+            }
+         }
       }
+      builder.append("]");
       return builder.toString();
    }
 }
\ No newline at end of file
diff --git a/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/access/AccessDetail.java b/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/access/AccessDetail.java
index 499f57d8c42..954f9715b9d 100644
--- a/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/access/AccessDetail.java
+++ b/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/access/AccessDetail.java
@@ -71,7 +71,7 @@ public class AccessDetail<T> {
 
    @Override
    public String toString() {
-      return String.format("Access [ accessObject=[%s] permission=[%s] reason=[%s]]", getAccessObject(),
+      return String.format("accessDetail [ object=[%s] permission=[%s] reason=[%s]]", getAccessObject(),
          getPermission(), getReason());
    }
 }
\ No newline at end of file
diff --git a/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/services/ConfigurationManagement.java b/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/services/ConfigurationManagement.java
index c243fe847ff..a5edd619940 100644
--- a/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/services/ConfigurationManagement.java
+++ b/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/services/ConfigurationManagement.java
@@ -10,6 +10,7 @@
  *******************************************************************************/
 package org.eclipse.osee.framework.core.services;
 
+import java.util.Collection;
 import org.eclipse.osee.framework.core.data.AccessContextId;
 import org.eclipse.osee.framework.core.exception.OseeCoreException;
 import org.eclipse.osee.framework.core.model.IBasicArtifact;
@@ -19,8 +20,8 @@ import org.eclipse.osee.framework.core.model.IBasicArtifact;
  */
 public interface ConfigurationManagement {
 
-   boolean isApplicable(IBasicArtifact<?> userArtifact, Object object);
+   boolean isApplicable(IBasicArtifact<?> user, Object object);
 
-   AccessContextId getContextId(IBasicArtifact<?> userArtifact, Object itemToCheck) throws OseeCoreException;
+   Collection<AccessContextId> getContextId(IBasicArtifact<?> user, Object object) throws OseeCoreException;
 
 }