9 files changed, 130 insertions, 26 deletions

diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/XHyperlabelTeamDefinitionSelection.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/XHyperlabelTeamDefinitionSelection.java
index f88913276f3..cb64539f67e 100644
--- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/XHyperlabelTeamDefinitionSelection.java
+++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/XHyperlabelTeamDefinitionSelection.java
@@ -10,6 +10,7 @@
  *******************************************************************************/
 package org.eclipse.osee.ats.util.widgets;
 
+import java.util.Collection;
 import java.util.HashSet;
 import java.util.Set;
 import org.eclipse.osee.ats.artifact.TeamDefinitionArtifact;
@@ -27,6 +28,8 @@ public class XHyperlabelTeamDefinitionSelection extends XHyperlinkLabelSelection
 
    public static final String WIDGET_ID = XHyperlabelTeamDefinitionSelection.class.getSimpleName();
    Set<TeamDefinitionArtifact> selectedTeamDefs = new HashSet<TeamDefinitionArtifact>();
+   Collection<TeamDefinitionArtifact> teamDefs;
+   TeamDefinitionTreeWithChildrenDialog dialog = null;
 
    /**
     * @param label
@@ -62,7 +65,11 @@ public class XHyperlabelTeamDefinitionSelection extends XHyperlinkLabelSelection
    @Override
    public boolean handleSelection() {
       try {
-         TeamDefinitionTreeWithChildrenDialog dialog = new TeamDefinitionTreeWithChildrenDialog(Active.Active);
+         if (teamDefs == null) {
+            dialog = new TeamDefinitionTreeWithChildrenDialog(Active.Active);
+         } else {
+            dialog = new TeamDefinitionTreeWithChildrenDialog(teamDefs);
+         }
          int result = dialog.open();
          if (result == 0) {
             selectedTeamDefs.clear();
@@ -78,4 +85,14 @@ public class XHyperlabelTeamDefinitionSelection extends XHyperlinkLabelSelection
       return false;
    }
 
+   /**
+    * @param teamDefs the teamDefs to set
+    */
+   public void setTeamDefs(Collection<TeamDefinitionArtifact> teamDefs) {
+      this.teamDefs = teamDefs;
+      if (dialog != null) {
+         dialog.setInput(teamDefs);
+      }
+   }
+
 }
diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/TeamDefinitionTreeByVersionDialog.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/TeamDefinitionTreeByVersionDialog.java
index 593f2cc1d44..d116b714e1d 100644
--- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/TeamDefinitionTreeByVersionDialog.java
+++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/TeamDefinitionTreeByVersionDialog.java
@@ -21,6 +21,7 @@ import org.eclipse.osee.ats.AtsPlugin;
 import org.eclipse.osee.ats.artifact.TeamDefinitionArtifact;
 import org.eclipse.osee.ats.artifact.VersionArtifact;
 import org.eclipse.osee.ats.artifact.VersionArtifact.VersionReleaseType;
+import org.eclipse.osee.framework.db.connection.exception.OseeCoreException;
 import org.eclipse.osee.framework.logging.OseeLog;
 import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
 import org.eclipse.osee.framework.skynet.core.artifact.search.Active;
@@ -42,19 +43,14 @@ public class TeamDefinitionTreeByVersionDialog extends TeamDefinitionTreeDialog
 
    XListViewer versionList = new XListViewer("Version");
    VersionArtifact selectedVersion = null;
-private Button okButton;
+   private Button okButton;
 
    /**
     * @param active
     */
-   public TeamDefinitionTreeByVersionDialog(Active active) {
+   public TeamDefinitionTreeByVersionDialog(Active active) throws OseeCoreException {
       super(active);
-      try {
-         setInput(TeamDefinitionArtifact.getTeamReleaseableDefinitions(active));
-      } catch (Exception ex) {
-         OseeLog.log(AtsPlugin.class, Level.SEVERE, ex);
-      }
-
+      setInput(TeamDefinitionArtifact.getTeamReleaseableDefinitions(active));
    }
 
    @Override
@@ -100,7 +96,7 @@ private Button okButton;
                selectedVersion = null;
             else
                selectedVersion = (VersionArtifact) versionList.getSelected().iterator().next();
-            
+
             updateButtons();
          };
       });
@@ -123,17 +119,18 @@ private Button okButton;
    }
 
    protected boolean isComplete() {
-	   return selectedVersion != null;
+      return selectedVersion != null;
    }
 
    private void updateButtons() {
       if (okButton != null) {
-    	  okButton.setEnabled(isComplete());
+         okButton.setEnabled(isComplete());
       }
    }
-   
+
+   @Override
    protected void updateOKStatus() {
-	   updateButtons();
+      updateButtons();
    }
-   
+
 }
diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/TeamDefinitionTreeContentProvider.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/TeamDefinitionTreeContentProvider.java
index 999c3d5efe2..70fa74a298b 100644
--- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/TeamDefinitionTreeContentProvider.java
+++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/TeamDefinitionTreeContentProvider.java
@@ -26,6 +26,11 @@ public class TeamDefinitionTreeContentProvider implements ITreeContentProvider {
 
    private final Active active;
 
+   public TeamDefinitionTreeContentProvider() {
+      super();
+      this.active = null;
+   }
+
    public TeamDefinitionTreeContentProvider(Active active) {
       super();
       this.active = active;
@@ -35,7 +40,7 @@ public class TeamDefinitionTreeContentProvider implements ITreeContentProvider {
    public Object[] getChildren(Object parentElement) {
       if (parentElement instanceof Collection)
          return ((Collection) parentElement).toArray();
-      else if (parentElement instanceof TeamDefinitionArtifact) {
+      else if (parentElement instanceof TeamDefinitionArtifact && active != null) {
          try {
             TeamDefinitionArtifact teamDef = ((TeamDefinitionArtifact) parentElement);
             return AtsLib.getActiveSet(Artifacts.getChildrenOfTypeSet(teamDef, TeamDefinitionArtifact.class, false),
diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/TeamDefinitionTreeDialog.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/TeamDefinitionTreeDialog.java
index ff7270a27ec..6296a98b10b 100644
--- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/TeamDefinitionTreeDialog.java
+++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/TeamDefinitionTreeDialog.java
@@ -11,6 +11,7 @@
 
 package org.eclipse.osee.ats.util.widgets.dialog;
 
+import org.eclipse.osee.framework.db.connection.exception.OseeCoreException;
 import org.eclipse.osee.framework.skynet.core.artifact.search.Active;
 import org.eclipse.osee.framework.ui.skynet.widgets.XCheckBox;
 import org.eclipse.swt.events.SelectionEvent;
@@ -28,7 +29,7 @@ public class TeamDefinitionTreeDialog extends TeamDefinitionTreeWithChildrenDial
    XCheckBox showActionCheck = new XCheckBox("Show Action instead of Workflows");
    Boolean showAction = false;
 
-   public TeamDefinitionTreeDialog(Active active) {
+   public TeamDefinitionTreeDialog(Active active) throws OseeCoreException {
       super(active);
    }
 
diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/TeamDefinitionTreeWithChildrenDialog.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/TeamDefinitionTreeWithChildrenDialog.java
index 3da042d5d32..a08851a1d9f 100644
--- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/TeamDefinitionTreeWithChildrenDialog.java
+++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/TeamDefinitionTreeWithChildrenDialog.java
@@ -14,7 +14,6 @@ package org.eclipse.osee.ats.util.widgets.dialog;
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.Set;
-import org.eclipse.osee.ats.AtsPlugin;
 import org.eclipse.osee.ats.artifact.TeamDefinitionArtifact;
 import org.eclipse.osee.framework.db.connection.exception.OseeCoreException;
 import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
@@ -22,7 +21,6 @@ import org.eclipse.osee.framework.skynet.core.artifact.search.Active;
 import org.eclipse.osee.framework.skynet.core.utility.Artifacts;
 import org.eclipse.osee.framework.ui.skynet.util.ArtifactDescriptiveLabelProvider;
 import org.eclipse.osee.framework.ui.skynet.util.ArtifactNameSorter;
-import org.eclipse.osee.framework.ui.skynet.util.OSEELog;
 import org.eclipse.osee.framework.ui.skynet.widgets.XCheckBox;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionEvent;
@@ -43,17 +41,17 @@ public class TeamDefinitionTreeWithChildrenDialog extends CheckedTreeSelectionDi
    boolean recurseChildren = false;
    protected Composite dialogComp;
 
-   public TeamDefinitionTreeWithChildrenDialog(Active active) {
+   public TeamDefinitionTreeWithChildrenDialog(Active active) throws OseeCoreException {
+      this(TeamDefinitionArtifact.getTeamTopLevelDefinitions(active));
+   }
+
+   public TeamDefinitionTreeWithChildrenDialog(Collection<TeamDefinitionArtifact> teamDefinitionArtifacts) throws OseeCoreException {
       super(Display.getCurrent().getActiveShell(), new ArtifactDescriptiveLabelProvider(),
-            new TeamDefinitionTreeContentProvider(active));
+            new TeamDefinitionTreeContentProvider());
       setTitle("Select Team Definition");
       setMessage("Select Team Definition");
       setComparator(new ArtifactNameSorter());
-      try {
-         setInput(TeamDefinitionArtifact.getTeamTopLevelDefinitions(active));
-      } catch (Exception ex) {
-         OSEELog.logException(AtsPlugin.class, ex, true);
-      }
+      setInput(teamDefinitionArtifacts);
    }
 
    /**
diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/AtsWorldEditorItem.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/AtsWorldEditorItem.java
new file mode 100644
index 00000000000..52a273fc331
--- /dev/null
+++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/AtsWorldEditorItem.java
@@ -0,0 +1,69 @@
+/*

+ * Created on Jan 26, 2009

+ *

+ * PLACE_YOUR_DISTRIBUTION_STATEMENT_RIGHT_HERE

+ */

+package org.eclipse.osee.ats.world;

+

+import java.util.Collections;

+import java.util.List;

+import org.eclipse.jface.action.Action;

+import org.eclipse.nebula.widgets.xviewer.XViewerColumn;

+import org.eclipse.osee.framework.db.connection.exception.OseeCoreException;

+import org.eclipse.swt.graphics.Color;

+import org.eclipse.swt.graphics.Image;

+

+/**

+ * @author Donald G. Dunne

+ */

+public class AtsWorldEditorItem implements IAtsWorldEditorItem {

+

+   /* (non-Javadoc)

+    * @see org.eclipse.osee.ats.world.IAtsWorldEditorItem#getColumnImage(java.lang.Object, org.eclipse.nebula.widgets.xviewer.XViewerColumn, int)

+    */

+   @Override

+   public Image getColumnImage(Object element, XViewerColumn col, int columnIndex) throws OseeCoreException {

+      return null;

+   }

+

+   /* (non-Javadoc)

+    * @see org.eclipse.osee.ats.world.IAtsWorldEditorItem#getColumnText(java.lang.Object, org.eclipse.nebula.widgets.xviewer.XViewerColumn, int)

+    */

+   @Override

+   public String getColumnText(Object element, XViewerColumn col, int columnIndex) throws OseeCoreException {

+      return null;

+   }

+

+   /* (non-Javadoc)

+    * @see org.eclipse.osee.ats.world.IAtsWorldEditorItem#getForeground(java.lang.Object, org.eclipse.nebula.widgets.xviewer.XViewerColumn, int)

+    */

+   @Override

+   public Color getForeground(Object element, XViewerColumn col, int columnIndex) throws OseeCoreException {

+      return null;

+   }

+

+   /* (non-Javadoc)

+    * @see org.eclipse.osee.ats.world.IAtsWorldEditorItem#getWorldMenuActions(org.eclipse.osee.ats.world.WorldComposite)

+    */

+   @Override

+   public List<? extends Action> getWorldMenuActions(WorldComposite worldComposite) throws OseeCoreException {

+      return Collections.emptyList();

+   }

+

+   /* (non-Javadoc)

+    * @see org.eclipse.osee.ats.world.IAtsWorldEditorItem#getXViewerColumns()

+    */

+   @Override

+   public List<XViewerColumn> getXViewerColumns() throws OseeCoreException {

+      return Collections.emptyList();

+   }

+

+   /* (non-Javadoc)

+    * @see org.eclipse.osee.ats.world.IAtsWorldEditorItem#isXColumnProvider(org.eclipse.nebula.widgets.xviewer.XViewerColumn)

+    */

+   @Override

+   public boolean isXColumnProvider(XViewerColumn col) throws OseeCoreException {

+      return false;

+   }

+

+}

diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/IAtsWorldEditorItem.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/IAtsWorldEditorItem.java
index 18f5f6d97da..c10d74eef45 100644
--- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/IAtsWorldEditorItem.java
+++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/IAtsWorldEditorItem.java
@@ -6,6 +6,7 @@
 package org.eclipse.osee.ats.world;

 

 import java.util.List;

+import org.eclipse.jface.action.Action;

 import org.eclipse.nebula.widgets.xviewer.XViewerColumn;

 import org.eclipse.osee.framework.db.connection.exception.OseeCoreException;

 import org.eclipse.swt.graphics.Color;

@@ -26,4 +27,6 @@ public interface IAtsWorldEditorItem {
 

    public Image getColumnImage(Object element, XViewerColumn xCol, int columnIndex) throws OseeCoreException;

 

+   public List<? extends Action> getWorldMenuActions(WorldComposite worldComposite) throws OseeCoreException;

+

 }

diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldComposite.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldComposite.java
index eed0e2372a1..ad728f1ed88 100644
--- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldComposite.java
+++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldComposite.java
@@ -494,6 +494,16 @@ public class WorldComposite extends ScrolledComposite implements IFrameworkTrans
       actionToMenuItem(menu, toWorkFlow, SWT.PUSH);

       actionToMenuItem(menu, toTask, SWT.PUSH);

       actionToMenuItem(menu, toReview, SWT.PUSH);

+      new MenuItem(menu, SWT.SEPARATOR);

+      try {

+         for (IAtsWorldEditorItem item : AtsWorldEditorItems.getItems()) {

+            for (Action action : item.getWorldMenuActions(this)) {

+               actionToMenuItem(menu, action, SWT.PUSH);

+            }

+         }

+      } catch (Exception ex) {

+         OseeLog.log(AtsPlugin.class, Level.SEVERE, ex);

+      }

 

    }

 

diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/results/ResultsEditor.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/results/ResultsEditor.java
index 09fce32417b..d03dc2d13eb 100644
--- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/results/ResultsEditor.java
+++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/results/ResultsEditor.java
@@ -91,6 +91,10 @@ public class ResultsEditor extends AbstractArtifactEditor implements IDirtiableE
          }
 
          setPartName(provider.getEditorName());
+         if (provider.getResultsEditorTabs().size() == 0) {
+            createHtmlTab(new ResultsEditorHtmlTab("Error",
+                  AHTML.simplePage("Error: Pages creation error for \"" + provider.getEditorName() + "\"")));
+         }
          setActivePage(startPage);
 
       } catch (Exception ex) {