refinement: Standardize ATS XViewerFactory and catch exceptions

Change-Id: I805516daf444e09cf3da4dd48a0376c610d39e34

4 files changed, 116 insertions, 102 deletions

diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/agile/SprintXViewerFactory.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/agile/SprintXViewerFactory.java
index b3e93491301..3ac262f5bf8 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/agile/SprintXViewerFactory.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/agile/SprintXViewerFactory.java
@@ -12,7 +12,6 @@ package org.eclipse.osee.ats.agile;
 
 import java.util.Arrays;
 import java.util.List;
-import java.util.logging.Level;
 import org.eclipse.nebula.widgets.xviewer.XViewer;
 import org.eclipse.nebula.widgets.xviewer.XViewerColumn;
 import org.eclipse.nebula.widgets.xviewer.XViewerSorter;
@@ -28,12 +27,9 @@ import org.eclipse.osee.ats.column.TargetedVersionColumn;
 import org.eclipse.osee.ats.column.TitleColumn;
 import org.eclipse.osee.ats.column.TypeColumn;
 import org.eclipse.osee.ats.core.client.artifact.SprintArtifact;
-import org.eclipse.osee.ats.internal.Activator;
-import org.eclipse.osee.ats.world.AtsWorldEditorItems;
-import org.eclipse.osee.ats.world.IAtsWorldEditorItem;
 import org.eclipse.osee.ats.world.WorldXViewerFactory;
 import org.eclipse.osee.ats.world.WorldXViewerSorter;
-import org.eclipse.osee.framework.logging.OseeLog;
+import org.eclipse.osee.ats.world.WorldXViewerUtil;
 import org.eclipse.osee.framework.ui.skynet.widgets.xviewer.skynet.SkynetXViewerFactory;
 
 /**
@@ -79,18 +75,10 @@ public class SprintXViewerFactory extends SkynetXViewerFactory {
             registerColumns(newCol);
          }
       }
-      // Register any columns from other plugins
-      try {
-         for (IAtsWorldEditorItem item : AtsWorldEditorItems.getItems()) {
-            for (XViewerColumn xCol : item.getXViewerColumns()) {
-               registerColumns(xCol);
-            }
-         }
-      } catch (Exception ex) {
-         OseeLog.log(Activator.class, Level.SEVERE, ex);
-      }
-      registerAllAttributeColumns();
-      WorldXViewerFactory.registerStateColumns(this);
+      WorldXViewerUtil.registerAtsAttributeColumns(this);
+      WorldXViewerUtil.registerPluginColumns(this);
+      WorldXViewerUtil.registerStateColumns(this);
+      WorldXViewerUtil.registerConfigurationsColumns(this);
    }
 
    @Override
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/goal/GoalXViewerFactory.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/goal/GoalXViewerFactory.java
index 147f622e02f..803c608dc88 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/goal/GoalXViewerFactory.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/goal/GoalXViewerFactory.java
@@ -12,7 +12,6 @@ package org.eclipse.osee.ats.goal;
 
 import java.util.Arrays;
 import java.util.List;
-import java.util.logging.Level;
 import org.eclipse.nebula.widgets.xviewer.XViewer;
 import org.eclipse.nebula.widgets.xviewer.XViewerColumn;
 import org.eclipse.nebula.widgets.xviewer.XViewerSorter;
@@ -30,12 +29,9 @@ import org.eclipse.osee.ats.column.TargetedVersionColumn;
 import org.eclipse.osee.ats.column.TitleColumn;
 import org.eclipse.osee.ats.column.TypeColumn;
 import org.eclipse.osee.ats.core.client.artifact.GoalArtifact;
-import org.eclipse.osee.ats.internal.Activator;
-import org.eclipse.osee.ats.world.AtsWorldEditorItems;
-import org.eclipse.osee.ats.world.IAtsWorldEditorItem;
 import org.eclipse.osee.ats.world.WorldXViewerFactory;
 import org.eclipse.osee.ats.world.WorldXViewerSorter;
-import org.eclipse.osee.framework.logging.OseeLog;
+import org.eclipse.osee.ats.world.WorldXViewerUtil;
 import org.eclipse.osee.framework.ui.skynet.widgets.xviewer.skynet.SkynetXViewerFactory;
 
 /**
@@ -83,18 +79,10 @@ public class GoalXViewerFactory extends SkynetXViewerFactory {
             registerColumns(newCol);
          }
       }
-      // Register any columns from other plugins
-      try {
-         for (IAtsWorldEditorItem item : AtsWorldEditorItems.getItems()) {
-            for (XViewerColumn xCol : item.getXViewerColumns()) {
-               registerColumns(xCol);
-            }
-         }
-      } catch (Exception ex) {
-         OseeLog.log(Activator.class, Level.SEVERE, ex);
-      }
-      registerAllAttributeColumns();
-      WorldXViewerFactory.registerStateColumns(this);
+      WorldXViewerUtil.registerAtsAttributeColumns(this);
+      WorldXViewerUtil.registerPluginColumns(this);
+      WorldXViewerUtil.registerStateColumns(this);
+      WorldXViewerUtil.registerConfigurationsColumns(this);
    }
 
    @Override
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldXViewerFactory.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldXViewerFactory.java
index 50096f766e0..4345d2e87ff 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldXViewerFactory.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldXViewerFactory.java
@@ -10,15 +10,9 @@
  *******************************************************************************/
 package org.eclipse.osee.ats.world;
 
-import java.util.List;
-import java.util.logging.Level;
 import org.eclipse.nebula.widgets.xviewer.XViewer;
 import org.eclipse.nebula.widgets.xviewer.XViewerColumn;
-import org.eclipse.nebula.widgets.xviewer.XViewerColumn.SortDataType;
-import org.eclipse.nebula.widgets.xviewer.XViewerFactory;
 import org.eclipse.nebula.widgets.xviewer.XViewerSorter;
-import org.eclipse.osee.ats.api.config.AtsAttributeValueColumn;
-import org.eclipse.osee.ats.api.config.ColumnAlign;
 import org.eclipse.osee.ats.column.ActionableItemOwner;
 import org.eclipse.osee.ats.column.ActionableItemsColumnUI;
 import org.eclipse.osee.ats.column.AnnualCostAvoidanceColumn;
@@ -94,9 +88,7 @@ import org.eclipse.osee.ats.column.ReviewNumMajorDefectsColumn;
 import org.eclipse.osee.ats.column.ReviewNumMinorDefectsColumn;
 import org.eclipse.osee.ats.column.ReviewReviewerColumn;
 import org.eclipse.osee.ats.column.StartDateColumn;
-import org.eclipse.osee.ats.column.StateAssigneesColumn;
 import org.eclipse.osee.ats.column.StateColumn;
-import org.eclipse.osee.ats.column.StateCompletedColumn;
 import org.eclipse.osee.ats.column.TargetedVersionColumn;
 import org.eclipse.osee.ats.column.TeamColumn;
 import org.eclipse.osee.ats.column.TitleColumn;
@@ -115,20 +107,12 @@ import org.eclipse.osee.ats.column.ev.WorkPackageIdColumnUI;
 import org.eclipse.osee.ats.column.ev.WorkPackageNameColumnUI;
 import org.eclipse.osee.ats.column.ev.WorkPackageProgramColumnUI;
 import org.eclipse.osee.ats.column.ev.WorkPackageTypeColumnUI;
-import org.eclipse.osee.ats.config.AtsConfigurationUtil;
 import org.eclipse.osee.ats.core.client.artifact.GoalArtifact;
-import org.eclipse.osee.ats.internal.Activator;
-import org.eclipse.osee.ats.util.xviewer.column.XViewerAtsAttributeValueColumn;
-import org.eclipse.osee.ats.workdef.AtsWorkDefinitionSheetProviders;
-import org.eclipse.osee.framework.core.model.type.AttributeType;
-import org.eclipse.osee.framework.logging.OseeLog;
-import org.eclipse.osee.framework.skynet.core.attribute.AttributeTypeManager;
 import org.eclipse.osee.framework.ui.skynet.widgets.xviewer.skynet.SkynetXViewerFactory;
 import org.eclipse.osee.framework.ui.skynet.widgets.xviewer.skynet.column.ArtifactTypeColumn;
 import org.eclipse.osee.framework.ui.skynet.widgets.xviewer.skynet.column.GuidColumn;
 import org.eclipse.osee.framework.ui.skynet.widgets.xviewer.skynet.column.LastModifiedByColumn;
 import org.eclipse.osee.framework.ui.skynet.widgets.xviewer.skynet.column.LastModifiedDateColumn;
-import org.eclipse.swt.SWT;
 
 //import org.eclipse.osee.ats.column.ActivityIdColumn;
 
@@ -248,58 +232,7 @@ public class WorldXViewerFactory extends SkynetXViewerFactory {
    public WorldXViewerFactory() {
       super(NAMESPACE);
       registerColumns(WorldViewColumns);
-      // Register all ats.* attribute columns
-      try {
-         for (AttributeType attributeType : AttributeTypeManager.getAllTypes()) {
-            if (attributeType.getName().startsWith("ats.")) {
-               registerColumns(getAttributeColumn(attributeType));
-            }
-         }
-      } catch (Exception ex) {
-         OseeLog.log(Activator.class, Level.SEVERE, ex);
-      }
-
-      // Register any columns from other plugins
-      try {
-         for (IAtsWorldEditorItem item : AtsWorldEditorItems.getItems()) {
-            for (XViewerColumn xCol : item.getXViewerColumns()) {
-               registerColumns(xCol);
-            }
-         }
-      } catch (Exception ex) {
-         OseeLog.log(Activator.class, Level.SEVERE, ex);
-      }
-      registerStateColumns(this);
-      registerConfigurationsColumns();
-   }
-
-   private void registerConfigurationsColumns() {
-      List<AtsAttributeValueColumn> columns = AtsConfigurationUtil.getConfigurations().getViews().getAttrColumns();
-      for (AtsAttributeValueColumn column : columns) {
-         registerColumns(new XViewerAtsAttributeValueColumn(AttributeTypeManager.getTypeByGuid(column.getAttrTypeId()),
-            column.getWidth(), getSwtAlign(column.getAlign()), column.isVisible(),
-            SortDataType.valueOf(column.getSortDataType()), column.isColumnMultiEdit(), column.getDescription()));
-      }
-   }
-
-   private int getSwtAlign(ColumnAlign align) {
-      if (align == ColumnAlign.Left) {
-         return SWT.LEFT;
-      } else if (align == ColumnAlign.Center) {
-         return SWT.CENTER;
-      } else if (align == ColumnAlign.Right) {
-         return SWT.RIGHT;
-      }
-      return 0;
-   }
-
-   public static void registerStateColumns(XViewerFactory factory) {
-      for (String stateName : AtsWorkDefinitionSheetProviders.getAllValidStateNames()) {
-         factory.registerColumns(new StateAssigneesColumn(stateName));
-      }
-      for (String stateName : AtsWorkDefinitionSheetProviders.getAllValidStateNames()) {
-         factory.registerColumns(new StateCompletedColumn(stateName));
-      }
+      WorldXViewerUtil.registerOtherColumns(this);
    }
 
    @Override
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldXViewerUtil.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldXViewerUtil.java
new file mode 100644
index 00000000000..f3f331c52e9
--- /dev/null
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldXViewerUtil.java
@@ -0,0 +1,105 @@
+/*******************************************************************************
+ * Copyright (c) 2004, 2007 Boeing.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Boeing - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.osee.ats.world;
+
+import java.util.List;
+import java.util.logging.Level;
+import org.eclipse.nebula.widgets.xviewer.XViewerColumn;
+import org.eclipse.nebula.widgets.xviewer.XViewerColumn.SortDataType;
+import org.eclipse.nebula.widgets.xviewer.XViewerFactory;
+import org.eclipse.osee.ats.api.config.AtsAttributeValueColumn;
+import org.eclipse.osee.ats.api.config.ColumnAlign;
+import org.eclipse.osee.ats.column.StateAssigneesColumn;
+import org.eclipse.osee.ats.column.StateCompletedColumn;
+import org.eclipse.osee.ats.config.AtsConfigurationUtil;
+import org.eclipse.osee.ats.internal.Activator;
+import org.eclipse.osee.ats.util.xviewer.column.XViewerAtsAttributeValueColumn;
+import org.eclipse.osee.ats.workdef.AtsWorkDefinitionSheetProviders;
+import org.eclipse.osee.framework.core.model.type.AttributeType;
+import org.eclipse.osee.framework.logging.OseeLog;
+import org.eclipse.osee.framework.skynet.core.attribute.AttributeTypeManager;
+import org.eclipse.osee.framework.ui.skynet.widgets.xviewer.skynet.SkynetXViewerFactory;
+import org.eclipse.swt.SWT;
+
+/**
+ * @author Donald G. Dunne
+ */
+public class WorldXViewerUtil {
+
+   public static void registerOtherColumns(XViewerFactory factory) {
+      registerAtsAttributeColumns(factory);
+      registerPluginColumns(factory);
+      registerStateColumns(factory);
+      registerConfigurationsColumns(factory);
+   }
+
+   public static void registerPluginColumns(XViewerFactory factory) {
+      // Register any columns from other plugins
+      try {
+         for (IAtsWorldEditorItem item : AtsWorldEditorItems.getItems()) {
+            for (XViewerColumn xCol : item.getXViewerColumns()) {
+               factory.registerColumns(xCol);
+            }
+         }
+      } catch (Exception ex) {
+         OseeLog.log(Activator.class, Level.SEVERE, ex);
+      }
+   }
+
+   public static void registerAtsAttributeColumns(XViewerFactory factory) {
+      // Register all ats.* attribute columns
+      try {
+         for (AttributeType attributeType : AttributeTypeManager.getAllTypes()) {
+            if (attributeType.getName().startsWith("ats.")) {
+               factory.registerColumns(SkynetXViewerFactory.getAttributeColumn(attributeType));
+            }
+         }
+      } catch (Exception ex) {
+         OseeLog.log(Activator.class, Level.SEVERE, ex);
+      }
+   }
+
+   public static void registerConfigurationsColumns(XViewerFactory factory) {
+      List<AtsAttributeValueColumn> columns = AtsConfigurationUtil.getConfigurations().getViews().getAttrColumns();
+      for (AtsAttributeValueColumn column : columns) {
+         try {
+            factory.registerColumns(new XViewerAtsAttributeValueColumn(
+               AttributeTypeManager.getTypeByGuid(column.getAttrTypeId()), column.getWidth(),
+               getSwtAlign(column.getAlign()), column.isVisible(), SortDataType.valueOf(column.getSortDataType()),
+               column.isColumnMultiEdit(), column.getDescription()));
+
+         } catch (Exception ex) {
+            OseeLog.log(Activator.class, Level.SEVERE, ex);
+         }
+      }
+   }
+
+   private static int getSwtAlign(ColumnAlign align) {
+      if (align == ColumnAlign.Left) {
+         return SWT.LEFT;
+      } else if (align == ColumnAlign.Center) {
+         return SWT.CENTER;
+      } else if (align == ColumnAlign.Right) {
+         return SWT.RIGHT;
+      }
+      return 0;
+   }
+
+   public static void registerStateColumns(XViewerFactory factory) {
+      for (String stateName : AtsWorkDefinitionSheetProviders.getAllValidStateNames()) {
+         factory.registerColumns(new StateAssigneesColumn(stateName));
+      }
+      for (String stateName : AtsWorkDefinitionSheetProviders.getAllValidStateNames()) {
+         factory.registerColumns(new StateCompletedColumn(stateName));
+      }
+   }
+
+}