DWL56 - "Create ability to apply access control for Blams"

2 files changed, 12 insertions, 8 deletions

diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/BlamOperations.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/BlamOperations.java
index b39774ad1c7..58c1b17e9d7 100644
--- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/BlamOperations.java
+++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/BlamOperations.java
@@ -74,19 +74,23 @@ public class BlamOperations {
       Map<String, XNavigateItem> nameToParent = new HashMap<String, XNavigateItem>();

       XNavigateItem blamOperationItems = new XNavigateItem(null, "Blam Operations");

       for (BlamOperation blamOperation : BlamOperations.getBlamOperationsNameSort()) {

-         // If categories not specified, add to top level

-         if (blamOperation.getCategories().size() == 0) {

-            new XNavigateItemBlam(blamOperationItems, blamOperation);

-         }

-         // Create categories

+

+         // Create categories first (so can have them up top)

          for (String category : blamOperation.getCategories()) {

             if (AccessControlManager.isOseeAdmin() || !category.contains("Admin") || (category.contains("Admin") && AccessControlManager.isOseeAdmin())) {

                createCategories(category.split("\\."), 0, blamOperationItems, nameToParent);

             }

          }

-         // Add this navigate item to categories

+      }

+      // Add blams to categories

+      for (BlamOperation blamOperation : BlamOperations.getBlamOperationsNameSort()) {

+         // If categories not specified, add to top level

+         if (blamOperation.getCategories().size() == 0) {

+            new XNavigateItemBlam(blamOperationItems, blamOperation);

+         }

          for (String category : blamOperation.getCategories()) {

-            if (AccessControlManager.isOseeAdmin() || !category.contains("Admin") || (category.contains("Admin") && AccessControlManager.isOseeAdmin())) {

+            // Category will be null if admin category and not admin

+            if (nameToParent.get(category) != null) {

                new XNavigateItemBlam(nameToParent.get(category), blamOperation);

             }

          }

diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/XWidgetPopulateExample.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/XWidgetPopulateExample.java
index e6ef8d112cd..d984b5c58af 100644
--- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/XWidgetPopulateExample.java
+++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/XWidgetPopulateExample.java
@@ -82,6 +82,6 @@ public class XWidgetPopulateExample extends AbstractBlam {
    }
 
    public Collection<String> getCategories() {
-      return Arrays.asList("Example");
+      return Arrays.asList("Util");
    }
 }
\ No newline at end of file