Change view attribute columns

2 files changed, 6 insertions, 4 deletions

diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/attribute/AttributeTypeManager.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/attribute/AttributeTypeManager.java
index 302d66413e8..597dae28a6e 100644
--- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/attribute/AttributeTypeManager.java
+++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/attribute/AttributeTypeManager.java
@@ -101,13 +101,17 @@ public class AttributeTypeManager {
    }

 

    /**

-    * use attribute validitiy to get attributes by branch instead

+    * use attribute validity to get attributes by branch instead

     * 

     * @return Returns all of the descriptors.

     * @throws Exception

     */

    @Deprecated

    public static Collection<AttributeType> getTypes(Branch branch) throws SQLException {

+      return getTypes();

+   }

+

+   public static Collection<AttributeType> getTypes() throws SQLException {

       ensurePopulated();

       return instance.idToTypeMap.values();

    }

diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xchange/ChangeXViewerFactory.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xchange/ChangeXViewerFactory.java
index 1ee6d0c79c9..1f3fa2c95aa 100644
--- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xchange/ChangeXViewerFactory.java
+++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xchange/ChangeXViewerFactory.java
@@ -17,7 +17,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import org.eclipse.osee.framework.skynet.core.artifact.Branch;
-import org.eclipse.osee.framework.skynet.core.artifact.BranchPersistenceManager;
 import org.eclipse.osee.framework.skynet.core.attribute.AttributeType;
 import org.eclipse.osee.framework.skynet.core.attribute.AttributeTypeManager;
 import org.eclipse.osee.framework.skynet.core.exception.OseeCoreException;
@@ -71,8 +70,7 @@ public class ChangeXViewerFactory extends SkynetXViewerFactory {
             idToColumn.put(xCol.getId(), xCol);
          }
          try {
-            // TODO change from getcommonbranch to getBranch(xViewer) when fixed
-            for (AttributeType attributeType : AttributeTypeManager.getTypes(BranchPersistenceManager.getCommonBranch())) {
+            for (AttributeType attributeType : AttributeTypeManager.getTypes()) {
                XViewerAttributeFromChangeColumn newCol =
                      new XViewerAttributeFromChangeColumn(null, attributeType.getName(), attributeType.getName(), 75,
                            75, SWT.LEFT, false, XViewerAttributeSortDataType.get(attributeType));