5 files changed, 656 insertions, 228 deletions

diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/ATSAttributes.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/ATSAttributes.java
index 74445d99de5..c2bf412f8c8 100644
--- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/ATSAttributes.java
+++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/ATSAttributes.java
@@ -1,188 +1,190 @@
-/*******************************************************************************
- * 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.artifact;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * @author Donald G. Dunne
- */
-public class ATSAttributes {
-
-   private final String displayName;
-   private final String storeName;
-   private final String description;
-   private static Map<String, ATSAttributes> attrNameToAttr = new HashMap<String, ATSAttributes>();
-
-   public static final ATSAttributes ROLE_ATTRIBUTE = new ATSAttributes("Role");
-   public static final ATSAttributes ACTIONABLE_ITEM_GUID_ATTRIBUTE =
-         new ATSAttributes("Actionable Item", "Actionable Items that are impacted by this change.");
-   public static final ATSAttributes TEAM_DEFINITION_GUID_ATTRIBUTE = new ATSAttributes("Team Definition");
-   public static final ATSAttributes TITLE_ATTRIBUTE =
-         new ATSAttributes("Title", "Name", "Enter clear and consise title that can be generally understood.");
-   public static final ATSAttributes STATE_ATTRIBUTE = new ATSAttributes("State", "States of workflow state machine.");
-   public static final ATSAttributes CURRENT_STATE_ATTRIBUTE =
-         new ATSAttributes("Current State", "Current state of workflow state machine.");
-   public static final ATSAttributes FULL_NAME_ATTRIBUTE =
-         new ATSAttributes("Full Name", "Expanded and descriptive name.");
-   public static final ATSAttributes DESCRIPTION_ATTRIBUTE = new ATSAttributes("Description", "Detailed explanation.");
-   public static final ATSAttributes CHANGE_TYPE_ATTRIBUTE = new ATSAttributes("Change Type", "Type of change.");
-   public static final ATSAttributes ASSIGNEE_ATTRIBUTE =
-         new ATSAttributes("Assignees", "Users currently assigned to do work.");
-   public static final ATSAttributes PRIORITY_TYPE_ATTRIBUTE = new ATSAttributes("Priority", "1 = High; 5 = Low");
-   public static final ATSAttributes USER_COMMUNITY_ATTRIBUTE =
-         new ATSAttributes(
-               "User Community",
-               "If working in one of these communities resulted in the creation of this Action, please select.  Otherwise, select Other.");
-   public static final ATSAttributes DEADLINE_ATTRIBUTE =
-         new ATSAttributes("Deadline", "ats.Need By", "Hard schedule date that workflow must be completed.");
-   public static final ATSAttributes VALIDATION_REQUIRED_ATTRIBUTE =
-         new ATSAttributes("Validation Required",
-               "If selected, originator will be asked to validate the implementation.");
-   public static final ATSAttributes ACTIVE_ATTRIBUTE = new ATSAttributes("Active", "Active ATS configuration object.");
-   public static final ATSAttributes LOG_ATTRIBUTE = new ATSAttributes("Log");
-   public static final ATSAttributes LOCATION_ATTRIBUTE =
-         new ATSAttributes("Location", "Enter location of materials to review.");
-   public static final ATSAttributes REVIEW_DEFECT_ATTRIBUTE = new ATSAttributes("Review Defect");
-   public static final ATSAttributes STATE_NOTES_ATTRIBUTE = new ATSAttributes("State Notes");
-   public static final ATSAttributes ESTIMATED_HOURS_ATTRIBUTE =
-         new ATSAttributes(
-               "Estimated Hours",
-               "Hours estimated to implement the changes associated with this Action.\nIncludes estimated hours for workflows, tasks and reviews.");
-   public static final ATSAttributes WEEKLY_BENEFIT_ATTRIBUTE =
-         new ATSAttributes("Weekly Benefit",
-               "Estimated number of hours that will be saved over a single year if this change is completed.");
-   public static final ATSAttributes PERCENT_REWORK_ATTRIBUTE = new ATSAttributes("Percent Rework");
-   public static final ATSAttributes TASK_USES_RESOLUTION_OPTIONS_ATTRIBUTE =
-         new ATSAttributes("Task Uses Resolution Options",
-               "True if resolution field is driven by option selections versus simple text.");
-   public static final ATSAttributes RESOLUTION_ATTRIBUTE = new ATSAttributes("Resolution", "Implementation details.");
-   public static final ATSAttributes RELATED_TO_STATE_ATTRIBUTE =
-         new ATSAttributes("Related To State", "State of parent workflow this object is related to.");
-   public static final ATSAttributes CANCEL_REASON_ATTRIBUTE =
-         new ATSAttributes("Cancel Reason", "Reason for cancellation of this ATS object.");
-   public static final ATSAttributes SMA_NOTE_ATTRIBUTE =
-         new ATSAttributes("Notes", "ats.SMA Note", "Notes applicable to ATS object");
-   public static final ATSAttributes WORK_PACKAGE_ATTRIBUTE =
-         new ATSAttributes("Work Package", "Designated accounting work package for completing workflow.");
-   public static final ATSAttributes COMMIT_MANAGER_WIDGET =
-         new ATSAttributes("Commit Manager", "Commit branches to parent and parallel branches.");
-   public static final ATSAttributes CATEGORY_ATTRIBUTE =
-         new ATSAttributes("Category", "Open field for user to be able to enter text to use for categorizing/sorting.");
-   public static final ATSAttributes CATEGORY2_ATTRIBUTE =
-         new ATSAttributes("Category2", "Open field for user to be able to enter text to use for categorizing/sorting.");
-   public static final ATSAttributes CATEGORY3_ATTRIBUTE =
-         new ATSAttributes("Category3", "Open field for user to be able to enter text to use for categorizing/sorting.");
-   public static final ATSAttributes CANCELLED_FROM_STATE_ATTRIBUTE =
-         new ATSAttributes("Cancelled From State", "State prior to cancellation of workflow.");
-   public static final ATSAttributes RELEASED_ATTRIBUTE =
-         new ATSAttributes("Released", "True if object is in a released state.");
-   public static final ATSAttributes NEXT_VERSION_ATTRIBUTE =
-         new ATSAttributes("Next Version", "True if version artifact is \"Next\" version to be released.");
-   public static final ATSAttributes ACTIONABLE_ATTRIBUTE =
-         new ATSAttributes("Actionable", "True if item can have Action written against or assigned to.");
-   public static final ATSAttributes TEAM_USES_VERSIONS_ATTRIBUTE =
-         new ATSAttributes("Team Uses Versions", "True if Team Workflow uses versioning/releasing option.");
-   public static final ATSAttributes LEGACY_PCR_ID_ATTRIBUTE =
-         new ATSAttributes("Legacy PCR Id",
-               "Field to register problem change report id from legacy items imported into ATS.");
-   public static final ATSAttributes PARENT_BRANCH_ID_ATTRIBUTE =
-         new ATSAttributes("Parent Branch Id", "Parent branch associated with ATS object.");
-   public static final ATSAttributes DECISION_REVIEW_OPTIONS_ATTRIBUTE =
-         new ATSAttributes(
-               "Decision Review Options",
-               "Options available for selection in review.  " + "Each line is a separate option. Format: <option name>;<state to transition to>;<assignee>");
-   public static final ATSAttributes DECISION_ATTRIBUTE =
-         new ATSAttributes("Decision", "Option selected during decision review.");
-   public static final ATSAttributes PROBLEM_ATTRIBUTE = new ATSAttributes("Problem", "Problem found during analysis.");
-   public static final ATSAttributes REQUIRES_FOLLOWUP_ATTRIBUTE =
-         new ATSAttributes("Requires Followup", "True if review requires someone to folloup after decision.");
-   public static final ATSAttributes PROPOSED_RESOLUTION_ATTRIBUTE =
-         new ATSAttributes("Proposed Resolution", "Recommended resolution.");
-   public static final ATSAttributes PROBLEM_OVERRIDE_ATTRIBUTE =
-         new ATSAttributes("Problem Override", "Select if Problem is same as Title/Description");
-   public static final ATSAttributes PROPOSED_RESOLUTION_OVERRIDE_ATTRIBUTE =
-         new ATSAttributes("Proposed Resolution Override",
-               "Select if Proposed Resolution is same as Title/Description/Problem");
-   public static final ATSAttributes RESOLUTION_OVERRIDE_ATTRIBUTE =
-         new ATSAttributes("Resolution Override",
-               "Select if Proposed Resolution is same as Title/Description/Problem/Proposed Resolution");
-   // TODO Remove this after 0.5.0 release
-   public static final ATSAttributes BLOCKING_REVIEW_ATTRIBUTE =
-         new ATSAttributes("Blocking Review",
-               "True if workflow should be blocked from contining until review is completed.");
-   public static final ATSAttributes REVIEW_BLOCKS_ATTRIBUTE =
-         new ATSAttributes("Review Blocks", "Review Completion will block it's parent workflow in this manner.");
-   public static final ATSAttributes ESTIMATED_RELEASE_DATE_ATTRIBUTE =
-         new ATSAttributes("Estimated Release Date", "Date the changes will be made available to the users.");
-   public static final ATSAttributes ESTIMATED_COMPLETION_DATE_ATTRIBUTE =
-         new ATSAttributes("Estimated Completion Date", "Date the changes will be completed.");
-   public static final ATSAttributes RELEASE_DATE_ATTRIBUTE =
-         new ATSAttributes("Release Date", "Date the changes were made available to the users.");
-   public static final ATSAttributes MAN_DAYS_NEEDED_ATTRIBUTE = new ATSAttributes("Man Days Needed");
-
-   protected ATSAttributes(String displayName, String storeName, String description) {
-      this.displayName = displayName;
-      this.storeName = storeName;
-      this.description = description;
-      attrNameToAttr.put(getStoreName(), this);
-   }
-
-   /**
-    * Creates attribute with displayName = "<name>" and storeName = "ats.<name>"
-    * 
-    * @param name
-    */
-   private ATSAttributes(String name) {
-      this(name, "ats." + name, null);
-   }
-
-   /**
-    * Creates attribute with displayName = "<displayName>" and storeName = "ats.<displayName>"
-    * 
-    * @param name
-    */
-   private ATSAttributes(String displayName, String description) {
-      this(displayName, "ats." + displayName, description);
-   }
-
-   public static ATSAttributes getAtsAttributeByStoreName(String storeName) {
-      return attrNameToAttr.get(storeName);
-   }
-
-   @Override
-   public final boolean equals(Object obj) {
-      return super.equals(obj);
-   }
-
-   /**
-    * @return Returns the displayName.
-    */
-   public String getDisplayName() {
-      return displayName;
-   }
-
-   /**
-    * @return Returns the storeName.
-    */
-   public String getStoreName() {
-      return storeName;
-   }
-
-   /**
-    * @return the description
-    */
-   public String getDescription() {
-      return description;
-   }
-
-}
+/*******************************************************************************

+ * 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.artifact;

+

+import java.util.HashMap;

+import java.util.Map;

+

+/**

+ * @author Donald G. Dunne

+ */

+public class ATSAttributes {

+

+   private final String displayName;

+   private final String storeName;

+   private final String description;

+   private static Map<String, ATSAttributes> attrNameToAttr = new HashMap<String, ATSAttributes>();

+

+   public static final ATSAttributes WORKING_BRANCH_WIDGET = new ATSAttributes("Working Branch");

+   public static final ATSAttributes ROLE_ATTRIBUTE = new ATSAttributes("Role");

+   public static final ATSAttributes ACTIONABLE_ITEM_GUID_ATTRIBUTE =

+         new ATSAttributes("Actionable Item", "Actionable Items that are impacted by this change.");

+   public static final ATSAttributes TEAM_DEFINITION_GUID_ATTRIBUTE = new ATSAttributes("Team Definition");

+   public static final ATSAttributes TITLE_ATTRIBUTE =

+         new ATSAttributes("Title", "Name", "Enter clear and consise title that can be generally understood.");

+   public static final ATSAttributes STATE_ATTRIBUTE = new ATSAttributes("State", "States of workflow state machine.");

+   public static final ATSAttributes CURRENT_STATE_ATTRIBUTE =

+         new ATSAttributes("Current State", "Current state of workflow state machine.");

+   public static final ATSAttributes FULL_NAME_ATTRIBUTE =

+         new ATSAttributes("Full Name", "Expanded and descriptive name.");

+   public static final ATSAttributes DESCRIPTION_ATTRIBUTE = new ATSAttributes("Description", "Detailed explanation.");

+   public static final ATSAttributes CHANGE_TYPE_ATTRIBUTE = new ATSAttributes("Change Type", "Type of change.");

+   public static final ATSAttributes ASSIGNEE_ATTRIBUTE =

+         new ATSAttributes("Assignees", "Users currently assigned to do work.");

+   public static final ATSAttributes PRIORITY_TYPE_ATTRIBUTE = new ATSAttributes("Priority", "1 = High; 5 = Low");

+   public static final ATSAttributes USER_COMMUNITY_ATTRIBUTE =

+         new ATSAttributes(

+               "User Community",

+               "If working in one of these communities resulted in the creation of this Action, please select.  Otherwise, select Other.");

+   public static final ATSAttributes DEADLINE_ATTRIBUTE =

+         new ATSAttributes("Deadline", "ats.Need By", "Hard schedule date that workflow must be completed.");

+   public static final ATSAttributes VALIDATION_REQUIRED_ATTRIBUTE =

+         new ATSAttributes("Validation Required",

+               "If selected, originator will be asked to validate the implementation.");

+   public static final ATSAttributes ACTIVE_ATTRIBUTE = new ATSAttributes("Active", "Active ATS configuration object.");

+   public static final ATSAttributes LOG_ATTRIBUTE = new ATSAttributes("Log");

+   public static final ATSAttributes LOCATION_ATTRIBUTE =

+         new ATSAttributes("Location", "Enter location of materials to review.");

+   public static final ATSAttributes REVIEW_DEFECT_ATTRIBUTE = new ATSAttributes("Review Defect");

+   public static final ATSAttributes STATE_NOTES_ATTRIBUTE = new ATSAttributes("State Notes");

+   public static final ATSAttributes ESTIMATED_HOURS_ATTRIBUTE =

+         new ATSAttributes(

+               "Estimated Hours",

+               "Hours estimated to implement the changes associated with this Action.\nIncludes estimated hours for workflows, tasks and reviews.");

+   public static final ATSAttributes WEEKLY_BENEFIT_ATTRIBUTE =

+         new ATSAttributes("Weekly Benefit",

+               "Estimated number of hours that will be saved over a single year if this change is completed.");

+   public static final ATSAttributes PERCENT_REWORK_ATTRIBUTE = new ATSAttributes("Percent Rework");

+   public static final ATSAttributes TASK_USES_RESOLUTION_OPTIONS_ATTRIBUTE =

+         new ATSAttributes("Task Uses Resolution Options",

+               "True if resolution field is driven by option selections versus simple text.");

+   public static final ATSAttributes RESOLUTION_ATTRIBUTE = new ATSAttributes("Resolution", "Implementation details.");

+   public static final ATSAttributes RELATED_TO_STATE_ATTRIBUTE =

+         new ATSAttributes("Related To State", "State of parent workflow this object is related to.");

+   public static final ATSAttributes CANCEL_REASON_ATTRIBUTE =

+         new ATSAttributes("Cancel Reason", "Reason for cancellation of this ATS object.");

+   public static final ATSAttributes SMA_NOTE_ATTRIBUTE =

+         new ATSAttributes("Notes", "ats.SMA Note", "Notes applicable to ATS object");

+   public static final ATSAttributes WORK_PACKAGE_ATTRIBUTE =

+         new ATSAttributes("Work Package", "Designated accounting work package for completing workflow.");

+   public static final ATSAttributes COMMIT_MANAGER_WIDGET =

+         new ATSAttributes("Commit Manager", "Commit branches to parent and parallel branches.");

+   public static final ATSAttributes CATEGORY_ATTRIBUTE =

+         new ATSAttributes("Category", "Open field for user to be able to enter text to use for categorizing/sorting.");

+   public static final ATSAttributes CATEGORY2_ATTRIBUTE =

+         new ATSAttributes("Category2", "Open field for user to be able to enter text to use for categorizing/sorting.");

+   public static final ATSAttributes CATEGORY3_ATTRIBUTE =

+         new ATSAttributes("Category3", "Open field for user to be able to enter text to use for categorizing/sorting.");

+   public static final ATSAttributes CANCELLED_FROM_STATE_ATTRIBUTE =

+         new ATSAttributes("Cancelled From State", "State prior to cancellation of workflow.");

+   public static final ATSAttributes RELEASED_ATTRIBUTE =

+         new ATSAttributes("Released", "True if object is in a released state.");

+   public static final ATSAttributes NEXT_VERSION_ATTRIBUTE =

+         new ATSAttributes("Next Version", "True if version artifact is \"Next\" version to be released.");

+   public static final ATSAttributes ACTIONABLE_ATTRIBUTE =

+         new ATSAttributes("Actionable", "True if item can have Action written against or assigned to.");

+   public static final ATSAttributes TEAM_USES_VERSIONS_ATTRIBUTE =

+         new ATSAttributes("Team Uses Versions", "True if Team Workflow uses versioning/releasing option.");

+   public static final ATSAttributes LEGACY_PCR_ID_ATTRIBUTE =

+         new ATSAttributes("Legacy PCR Id",

+               "Field to register problem change report id from legacy items imported into ATS.");

+   public static final ATSAttributes PARENT_BRANCH_ID_ATTRIBUTE =

+         new ATSAttributes("Parent Branch Id", "Parent branch associated with ATS object.");

+   public static final ATSAttributes DECISION_REVIEW_OPTIONS_ATTRIBUTE =

+         new ATSAttributes(

+               "Decision Review Options",

+               "Options available for selection in review.  " + "Each line is a separate option. Format: <option name>;<state to transition to>;<assignee>");

+   public static final ATSAttributes DECISION_ATTRIBUTE =

+         new ATSAttributes("Decision", "Option selected during decision review.");

+   public static final ATSAttributes PROBLEM_ATTRIBUTE = new ATSAttributes("Problem", "Problem found during analysis.");

+   public static final ATSAttributes REQUIRES_FOLLOWUP_ATTRIBUTE =

+         new ATSAttributes("Requires Followup", "True if review requires someone to folloup after decision.");

+   public static final ATSAttributes PROPOSED_RESOLUTION_ATTRIBUTE =

+         new ATSAttributes("Proposed Resolution", "Recommended resolution.");

+   public static final ATSAttributes PROBLEM_OVERRIDE_ATTRIBUTE =

+         new ATSAttributes("Problem Override", "Select if Problem is same as Title/Description");

+   public static final ATSAttributes PROPOSED_RESOLUTION_OVERRIDE_ATTRIBUTE =

+         new ATSAttributes("Proposed Resolution Override",

+               "Select if Proposed Resolution is same as Title/Description/Problem");

+   public static final ATSAttributes RESOLUTION_OVERRIDE_ATTRIBUTE =

+         new ATSAttributes("Resolution Override",

+               "Select if Proposed Resolution is same as Title/Description/Problem/Proposed Resolution");

+   // TODO Remove this after 0.5.0 release

+   public static final ATSAttributes BLOCKING_REVIEW_ATTRIBUTE =

+         new ATSAttributes("Blocking Review",

+               "True if workflow should be blocked from contining until review is completed.");

+   public static final ATSAttributes REVIEW_BLOCKS_ATTRIBUTE =

+         new ATSAttributes("Review Blocks", "Review Completion will block it's parent workflow in this manner.");

+   public static final ATSAttributes ESTIMATED_RELEASE_DATE_ATTRIBUTE =

+         new ATSAttributes("Estimated Release Date", "Date the changes will be made available to the users.");

+   public static final ATSAttributes ESTIMATED_COMPLETION_DATE_ATTRIBUTE =

+         new ATSAttributes("Estimated Completion Date", "Date the changes will be completed.");

+   public static final ATSAttributes RELEASE_DATE_ATTRIBUTE =

+         new ATSAttributes("Release Date", "Date the changes were made available to the users.");

+   public static final ATSAttributes MAN_DAYS_NEEDED_ATTRIBUTE = new ATSAttributes("Man Days Needed");

+   public static final ATSAttributes BRANCH_ID_ATTRIBUTE = new ATSAttributes("Working Branch");

+

+   protected ATSAttributes(String displayName, String storeName, String description) {

+      this.displayName = displayName;

+      this.storeName = storeName;

+      this.description = description;

+      attrNameToAttr.put(getStoreName(), this);

+   }

+

+   /**

+    * Creates attribute with displayName = "<name>" and storeName = "ats.<name>"

+    * 

+    * @param name

+    */

+   private ATSAttributes(String name) {

+      this(name, "ats." + name, null);

+   }

+

+   /**

+    * Creates attribute with displayName = "<displayName>" and storeName = "ats.<displayName>"

+    * 

+    * @param name

+    */

+   private ATSAttributes(String displayName, String description) {

+      this(displayName, "ats." + displayName, description);

+   }

+

+   public static ATSAttributes getAtsAttributeByStoreName(String storeName) {

+      return attrNameToAttr.get(storeName);

+   }

+

+   @Override

+   public final boolean equals(Object obj) {

+      return super.equals(obj);

+   }

+

+   /**

+    * @return Returns the displayName.

+    */

+   public String getDisplayName() {

+      return displayName;

+   }

+

+   /**

+    * @return Returns the storeName.

+    */

+   public String getStoreName() {

+      return storeName;

+   }

+

+   /**

+    * @return the description

+    */

+   public String getDescription() {

+      return description;

+   }

+

+}

diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/AtsWidgetProvider.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/AtsWidgetProvider.java
index f197ef64363..11c0b730804 100644
--- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/AtsWidgetProvider.java
+++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/AtsWidgetProvider.java
@@ -41,6 +41,9 @@ public class AtsWidgetProvider implements IXWidgetProvider {
       if (widgetName.equals("XCommitManager")) {

          return new XCommitManager();

       }

+      if (widgetName.equals("XWorkingBranch")) {

+         return new XWorkingBranch();

+      }

       return toReturn;

    }

 

diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/XWorkingBranch.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/XWorkingBranch.java
new file mode 100644
index 00000000000..572b1da1cd1
--- /dev/null
+++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/XWorkingBranch.java
@@ -0,0 +1,290 @@
+/*******************************************************************************

+ * 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.util.widgets;

+

+import org.eclipse.osee.ats.AtsPlugin;

+import org.eclipse.osee.ats.artifact.TeamWorkFlowArtifact;

+import org.eclipse.osee.ats.editor.SMAManager;

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

+import org.eclipse.osee.framework.logging.OseeLevel;

+import org.eclipse.osee.framework.logging.OseeLog;

+import org.eclipse.osee.framework.skynet.core.artifact.Artifact;

+import org.eclipse.osee.framework.skynet.core.artifact.Branch;

+import org.eclipse.osee.framework.ui.plugin.util.Result;

+import org.eclipse.osee.framework.ui.skynet.ArtifactExplorer;

+import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin;

+import org.eclipse.osee.framework.ui.skynet.widgets.IArtifactWidget;

+import org.eclipse.osee.framework.ui.skynet.widgets.IBranchArtifact;

+import org.eclipse.osee.framework.ui.skynet.widgets.XWidget;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.layout.GridData;

+import org.eclipse.swt.layout.GridLayout;

+import org.eclipse.swt.widgets.Button;

+import org.eclipse.swt.widgets.Composite;

+import org.eclipse.swt.widgets.Control;

+import org.eclipse.swt.widgets.Event;

+import org.eclipse.swt.widgets.Label;

+import org.eclipse.swt.widgets.Listener;

+

+/**

+ * @author Megumi Telles

+ */

+public class XWorkingBranch extends XWidget implements IArtifactWidget {

+

+   private Artifact artifact;

+   private SMAManager smaMgr;

+   private Button createBranch;

+   private Button showArtifactExplorer;

+   private Button showChangeReport;

+   private Button deleteBranch;

+

+   public XWorkingBranch() {

+      super("Working Branch", "");

+   }

+

+   /**

+    * 

+    */

+   @Override

+   public void createWidgets(Composite parent, int horizontalSpan) {

+      setSMAMgr();

+      if (horizontalSpan < 2) horizontalSpan = 2;

+      if (!label.equals("")) {

+         labelWidget = new Label(parent, SWT.NONE);

+         labelWidget.setText(label + ": " + getWorkingBranchShortName() + " " + getStatus());

+         if (toolTip != null) {

+            labelWidget.setToolTipText(toolTip);

+         }

+      }

+

+      Composite bComp = new Composite(parent, SWT.NONE);

+      bComp.setLayout(new GridLayout(4, false));

+      bComp.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));

+

+      createBranch = new Button(bComp, SWT.PUSH);

+      if (getWorkingBranch() != null) createBranch.setEnabled(false);

+      createBranch.setToolTipText("Create Working Branch");

+      createBranch.addListener(SWT.Selection, new Listener() {

+         public void handleEvent(Event e) {

+            Result result = smaMgr.getBranchMgr().createWorkingBranch(null, true);

+            if (result.isFalse()) result.popup();

+         }

+      });

+

+      showArtifactExplorer = new Button(bComp, SWT.PUSH);

+      if (getWorkingBranch() == null) showArtifactExplorer.setEnabled(false);

+      showArtifactExplorer.setToolTipText("Show Artifact Explorer");

+      showArtifactExplorer.addListener(SWT.Selection, new Listener() {

+         public void handleEvent(Event e) {

+            ArtifactExplorer.exploreBranch(getWorkingBranch());

+         }

+      });

+

+      showChangeReport = new Button(bComp, SWT.PUSH);

+      if (getWorkingBranch() == null) showChangeReport.setEnabled(false);

+      showChangeReport.setToolTipText("Show Change Report");

+      showChangeReport.addListener(SWT.Selection, new Listener() {

+         public void handleEvent(Event e) {

+            smaMgr.getBranchMgr().showChangeReport();

+         }

+      });

+

+      deleteBranch = new Button(bComp, SWT.PUSH);

+      if (getWorkingBranch() == null) deleteBranch.setEnabled(false);

+      deleteBranch.setToolTipText("Delete Working Branch");

+      deleteBranch.addListener(SWT.Selection, new Listener() {

+         public void handleEvent(Event e) {

+            smaMgr.getBranchMgr().deleteEmptyWorkingBranch();

+            refresh();

+         }

+      });

+

+      if (AtsPlugin.getInstance() != null) {

+         createBranch.setImage(AtsPlugin.getInstance().getImage("branch.gif"));

+      }

+      if (SkynetGuiPlugin.getInstance() != null) {

+         showArtifactExplorer.setImage(SkynetGuiPlugin.getInstance().getImage("artifact_explorer.gif"));

+         showChangeReport.setImage(SkynetGuiPlugin.getInstance().getImage("branch_change.gif"));

+         deleteBranch.setImage(SkynetGuiPlugin.getInstance().getImage("delete.gif"));

+      }

+      refresh();

+   }

+

+   private void setSMAMgr() {

+      if (artifact instanceof TeamWorkFlowArtifact) {

+         smaMgr = ((TeamWorkFlowArtifact) artifact).getSmaMgr();

+      }

+   }

+

+   private Branch getWorkingBranch() {

+      try {

+         return ((IBranchArtifact) artifact).getWorkingBranch();

+      } catch (OseeCoreException ex) {

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

+         return null;

+      }

+   }

+

+   private String getWorkingBranchShortName() {

+      if (getWorkingBranch() != null) {

+         return getWorkingBranch().getBranchShortName();

+      }

+      return "";

+   }

+

+   private String getStatus() {

+      try {

+         if (getWorkingBranch() == null) {

+            return "Not Started";

+         } else

+

+         if (smaMgr.getStateMgr().getCurrentStateName().equals("Promote")) {

+            return "Changes Not Permitted";

+         } else {

+            return "Changes In-Progress";

+         }

+      } catch (OseeCoreException ex) {

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

+         return "";

+      }

+   }

+

+   @Override

+   public void setFocus() {

+   }

+

+   /* (non-Javadoc)

+    * @see osee.skynet.gui.widgets.XWidget#dispose()

+    */

+   @Override

+   public void dispose() {

+   }

+

+   /* (non-Javadoc)

+    * @see osee.skynet.gui.widgets.XWidget#getControl()

+    */

+   @Override

+   public Control getControl() {

+      return labelWidget;

+   }

+

+   /* (non-Javadoc)

+    * @see osee.skynet.gui.widgets.XWidget#getData()

+    */

+   @Override

+   public Object getData() {

+      return null;

+   }

+

+   /* (non-Javadoc)

+    * @see osee.skynet.gui.widgets.XWidget#getReportData()

+    */

+   @Override

+   public String getReportData() {

+      return null;

+   }

+

+   /* (non-Javadoc)

+    * @see osee.skynet.gui.widgets.XWidget#getXmlData()

+    */

+   @Override

+   public String getXmlData() {

+      return null;

+   }

+

+   /* (non-Javadoc)

+    * @see osee.skynet.gui.widgets.XWidget#isValid()

+    */

+   @Override

+   public Result isValid() {

+      return Result.TrueResult;

+   }

+

+   /* (non-Javadoc)

+    * @see osee.skynet.gui.widgets.XWidget#refresh()

+    */

+   @Override

+   public void refresh() {

+      if (labelWidget != null) {

+         labelWidget.setText(label + ": " + getWorkingBranchShortName() + " " + getStatus());

+      }

+      if (createBranch != null) {

+         if (getWorkingBranch() != null)

+            createBranch.setEnabled(false);

+         else

+            createBranch.setEnabled(true);

+      }

+      if (showArtifactExplorer != null) {

+         if (getWorkingBranch() == null)

+            showArtifactExplorer.setEnabled(false);

+         else

+            showArtifactExplorer.setEnabled(true);

+      }

+      if (showChangeReport != null) {

+         if (getWorkingBranch() == null)

+            showChangeReport.setEnabled(false);

+         else

+            showChangeReport.setEnabled(true);

+      }

+      if (deleteBranch != null) {

+         if (getWorkingBranch() == null)

+            deleteBranch.setEnabled(false);

+         else

+            deleteBranch.setEnabled(true);

+      }

+   }

+

+   /* (non-Javadoc)

+    * @see osee.skynet.gui.widgets.XWidget#setXmlData(java.lang.String)

+    */

+   @Override

+   public void setXmlData(String str) {

+   }

+

+   /* (non-Javadoc)

+    * @see osee.skynet.gui.widgets.XWidget#toHTML(java.lang.String)

+    */

+   @Override

+   public String toHTML(String labelFont) {

+      return "";

+   }

+

+   /* (non-Javadoc)

+    * @see org.eclipse.osee.framework.ui.skynet.widgets.IArtifactWidget#isDirty()

+    */

+   @Override

+   public Result isDirty() throws OseeCoreException {

+      return Result.FalseResult;

+   }

+

+   /* (non-Javadoc)

+    * @see org.eclipse.osee.framework.ui.skynet.widgets.IArtifactWidget#revert()

+    */

+   @Override

+   public void revert() throws OseeCoreException {

+   }

+

+   /* (non-Javadoc)

+    * @see org.eclipse.osee.framework.ui.skynet.widgets.IArtifactWidget#saveToArtifact()

+    */

+   @Override

+   public void saveToArtifact() throws OseeCoreException {

+   }

+

+   /* (non-Javadoc)

+    * @see org.eclipse.osee.framework.ui.skynet.widgets.IArtifactWidget#setArtifact(org.eclipse.osee.framework.skynet.core.artifact.Artifact, java.lang.String)

+    */

+   @Override

+   public void setArtifact(Artifact artifact, String attrName) throws OseeCoreException {

+      this.artifact = artifact;

+   }

+

+}

diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/defect/DefectXViewer.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/defect/DefectXViewer.java
index e91a9d2bab0..5920fb6672a 100644
--- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/defect/DefectXViewer.java
+++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/defect/DefectXViewer.java
@@ -14,6 +14,7 @@ import java.util.ArrayList;
 import java.util.Collection;

 import java.util.Date;

 import java.util.List;

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

 import org.eclipse.jface.action.IMenuListener;

 import org.eclipse.jface.action.IMenuManager;

 import org.eclipse.jface.action.MenuManager;

@@ -29,7 +30,6 @@ import org.eclipse.osee.ats.util.widgets.defect.DefectItem.Disposition;
 import org.eclipse.osee.ats.util.widgets.defect.DefectItem.InjectionActivity;

 import org.eclipse.osee.ats.util.widgets.defect.DefectItem.Severity;

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

-import org.eclipse.osee.framework.db.connection.exception.OseeStateException;

 import org.eclipse.osee.framework.logging.OseeLevel;

 import org.eclipse.osee.framework.logging.OseeLog;

 import org.eclipse.osee.framework.skynet.core.User;

@@ -49,12 +49,21 @@ import org.eclipse.swt.widgets.TreeItem;
 public class DefectXViewer extends XViewer {

 

    private final XDefectViewer xDefectViewer;

+   private Action editSeverityAction;

+   private Action editDispositionAction;

+   private Action editClosedAction;

+   private Action editUserAction;

+   private Action editCreatedDateAction;

+   private Action editInjectionAction;

+   private Action editDescriptionAction;

+   private Action editLocationAction;

+   private Action editResolutionAction;

 

    /**

     * @param parent

     * @param style

     */

-   public DefectXViewer(Composite parent, int style, XDefectViewer xDefectViewer) {

+   DefectXViewer(Composite parent, int style, XDefectViewer xDefectViewer) {

       this(parent, style, new DefectXViewerFactory(), xDefectViewer);

    }

 

@@ -83,11 +92,165 @@ public class DefectXViewer extends XViewer {
             updateMenuActions();

          }

       });

+

+      editSeverityAction = new Action("Edit Severity", Action.AS_PUSH_BUTTON) {

+         @Override

+         public void run() {

+            boolean columnMultiEdit = false;

+            // grab the data, prompt change

+            ArrayList<DefectItem> defectItems = new ArrayList<DefectItem>();

+            defectItems = getSelectedDefectItems();

+            try {

+               promptChangeData(DefectXViewerFactory.Severity_Col, defectItems, columnMultiEdit);

+            } catch (OseeCoreException ex) {

+               OseeLog.log(DefectXViewer.class, OseeLevel.SEVERE_POPUP, ex.toString());

+            }

+         }

+      };

+

+      editClosedAction = new Action("Edit Closed ", Action.AS_PUSH_BUTTON) {

+         @Override

+         public void run() {

+            boolean columnMultiEdit = false;

+            // grab the data, prompt change

+            ArrayList<DefectItem> defectItems = new ArrayList<DefectItem>();

+            defectItems = getSelectedDefectItems();

+            try {

+               promptChangeData(DefectXViewerFactory.Closed_Col, defectItems, columnMultiEdit);

+            } catch (OseeCoreException ex) {

+               OseeLog.log(DefectXViewer.class, OseeLevel.SEVERE_POPUP, ex.toString());

+            }

+         }

+      };

+

+      editCreatedDateAction = new Action("Edit Created Date ", Action.AS_PUSH_BUTTON) {

+         @Override

+         public void run() {

+            boolean columnMultiEdit = false;

+            // grab the data, prompt change

+            ArrayList<DefectItem> defectItems = new ArrayList<DefectItem>();

+            defectItems = getSelectedDefectItems();

+            try {

+               promptChangeData(DefectXViewerFactory.Created_Date_Col, defectItems, columnMultiEdit);

+            } catch (OseeCoreException ex) {

+               OseeLog.log(DefectXViewer.class, OseeLevel.SEVERE_POPUP, ex.toString());

+            }

+         }

+      };

+

+      editDescriptionAction = new Action("Edit Description ", Action.AS_PUSH_BUTTON) {

+         @Override

+         public void run() {

+            boolean columnMultiEdit = false;

+            // grab the data, prompt change

+            ArrayList<DefectItem> defectItems = new ArrayList<DefectItem>();

+            defectItems = getSelectedDefectItems();

+            try {

+               promptChangeData(DefectXViewerFactory.Description_Col, defectItems, columnMultiEdit);

+            } catch (OseeCoreException ex) {

+               OseeLog.log(DefectXViewer.class, OseeLevel.SEVERE_POPUP, ex.toString());

+            }

+         }

+      };

+

+      editDispositionAction = new Action("Edit Disposition ", Action.AS_PUSH_BUTTON) {

+         @Override

+         public void run() {

+            boolean columnMultiEdit = false;

+            // grab the data, prompt change

+            ArrayList<DefectItem> defectItems = new ArrayList<DefectItem>();

+            defectItems = getSelectedDefectItems();

+            try {

+               promptChangeData(DefectXViewerFactory.Disposition_Col, defectItems, columnMultiEdit);

+            } catch (OseeCoreException ex) {

+               OseeLog.log(DefectXViewer.class, OseeLevel.SEVERE_POPUP, ex.toString());

+            }

+         }

+      };

+

+      editInjectionAction = new Action("Edit Injection ", Action.AS_PUSH_BUTTON) {

+         @Override

+         public void run() {

+            boolean columnMultiEdit = false;

+            // grab the data, prompt change

+            ArrayList<DefectItem> defectItems = new ArrayList<DefectItem>();

+            defectItems = getSelectedDefectItems();

+            try {

+               promptChangeData(DefectXViewerFactory.Injection_Activity_Col, defectItems, columnMultiEdit);

+            } catch (OseeCoreException ex) {

+               OseeLog.log(DefectXViewer.class, OseeLevel.SEVERE_POPUP, ex.toString());

+            }

+         }

+      };

+

+      editLocationAction = new Action("Edit Location ", Action.AS_PUSH_BUTTON) {

+         @Override

+         public void run() {

+            boolean columnMultiEdit = false;

+            // grab the data, prompt change

+            ArrayList<DefectItem> defectItems = new ArrayList<DefectItem>();

+            defectItems = getSelectedDefectItems();

+            try {

+               promptChangeData(DefectXViewerFactory.Location_Col, defectItems, columnMultiEdit);

+            } catch (OseeCoreException ex) {

+               OseeLog.log(DefectXViewer.class, OseeLevel.SEVERE_POPUP, ex.toString());

+            }

+         }

+      };

+

+      editResolutionAction = new Action("Edit Resolution ", Action.AS_PUSH_BUTTON) {

+         @Override

+         public void run() {

+            boolean columnMultiEdit = false;

+            // grab the data, prompt change

+            ArrayList<DefectItem> defectItems = new ArrayList<DefectItem>();

+            defectItems = getSelectedDefectItems();

+            try {

+               promptChangeData(DefectXViewerFactory.Resolution_Col, defectItems, columnMultiEdit);

+            } catch (OseeCoreException ex) {

+               OseeLog.log(DefectXViewer.class, OseeLevel.SEVERE_POPUP, ex.toString());

+            }

+         }

+      };

+

+      editUserAction = new Action("Edit User ", Action.AS_PUSH_BUTTON) {

+         @Override

+         public void run() {

+            boolean columnMultiEdit = false;

+            // grab the data, prompt change

+            ArrayList<DefectItem> defectItems = new ArrayList<DefectItem>();

+            defectItems = getSelectedDefectItems();

+            try {

+               promptChangeData(DefectXViewerFactory.User_Col, defectItems, columnMultiEdit);

+            } catch (OseeCoreException ex) {

+               OseeLog.log(DefectXViewer.class, OseeLevel.SEVERE_POPUP, ex.toString());

+            }

+         }

+      };

    }

 

    public void updateEditMenuActions() {

-      // MenuManager mm = getMenuManager();

+      MenuManager mm = getMenuManager();

       // EDIT MENU BLOCK

+      mm.insertBefore(MENU_GROUP_PRE, editSeverityAction);

+      editSeverityAction.setEnabled(true);

+      mm.insertBefore(MENU_GROUP_PRE, editClosedAction);

+      editClosedAction.setEnabled(true);

+      mm.insertBefore(MENU_GROUP_PRE, editCreatedDateAction);

+      editCreatedDateAction.setEnabled(true);

+      mm.insertBefore(MENU_GROUP_PRE, editDescriptionAction);

+      editDescriptionAction.setEnabled(true);

+      mm.insertBefore(MENU_GROUP_PRE, editDispositionAction);

+      editDispositionAction.setEnabled(true);

+      mm.insertBefore(MENU_GROUP_PRE, editInjectionAction);

+      editInjectionAction.setEnabled(true);

+      mm.insertBefore(MENU_GROUP_PRE, editLocationAction);

+      editLocationAction.setEnabled(true);

+      mm.insertBefore(MENU_GROUP_PRE, editResolutionAction);

+      editResolutionAction.setEnabled(true);

+      mm.insertBefore(MENU_GROUP_PRE, editUserAction);

+      editUserAction.setEnabled(true);

+

    }

 

    public void updateMenuActions() {

@@ -130,7 +293,6 @@ public class DefectXViewer extends XViewer {
       return arts;

    }

 

-   @Override

    public void handleColumnMultiEdit(TreeColumn treeColumn, Collection<TreeItem> treeItems) {

       if (!xDefectViewer.isEditable()) {

          return;

@@ -140,7 +302,7 @@ public class DefectXViewer extends XViewer {
          defectItems.add((DefectItem) item.getData());

       }

       try {

-         promptChangeDate((XViewerColumn) treeColumn.getData(), defectItems, isColumnMultiEditEnabled());

+         promptChangeData((XViewerColumn) treeColumn.getData(), defectItems, isColumnMultiEditEnabled());

       } catch (OseeCoreException ex) {

          OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex);

       }

@@ -152,34 +314,8 @@ public class DefectXViewer extends XViewer {
    @Override

    public boolean handleLeftClickInIconArea(TreeColumn treeColumn, TreeItem treeItem) {

       XViewerColumn xCol = (XViewerColumn) treeColumn.getData();

-      if (xCol.equals(DefectXViewerFactory.User_Col)) {

-         return handleLeftClick(treeColumn, treeItem);

-      } else if (xCol.equals(DefectXViewerFactory.Injection_Activity_Col)) {

-         return handleLeftClick(treeColumn, treeItem);

-      } else if (xCol.equals(DefectXViewerFactory.Closed_Col)) {

-         return handleLeftClick(treeColumn, treeItem);

-      }

-      return false;

-   }

-

-   /* (non-Javadoc)

-    * @see org.eclipse.osee.framework.ui.skynet.widgets.xviewer.XViewer#handleLeftClick(org.eclipse.swt.widgets.TreeColumn, org.eclipse.swt.widgets.TreeItem)

-    */

-   @Override

-   public boolean handleLeftClick(TreeColumn treeColumn, TreeItem treeItem) {

-      if (!xDefectViewer.isEditable()) {

-         return false;

-      }

-      try {

-         XViewerColumn xCol = (XViewerColumn) treeColumn.getData();

-         DefectItem defectItem = (DefectItem) treeItem.getData();

-         List<DefectItem> defectItems = new ArrayList<DefectItem>();

-         defectItems.add(defectItem);

-         if (xCol.equals(DefectXViewerFactory.Closed_Col) || xCol.equals(DefectXViewerFactory.Severity_Col) || xCol.equals(DefectXViewerFactory.Disposition_Col)) {

-            return promptChangeDate(xCol, defectItems, false);

-         }

-      } catch (Exception ex) {

-         OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex);

+      if (xCol.equals(DefectXViewerFactory.User_Col) || xCol.equals(DefectXViewerFactory.Injection_Activity_Col) || xCol.equals(DefectXViewerFactory.Closed_Col) || xCol.equals(DefectXViewerFactory.Severity_Col)) {

+         return handleAltLeftClick(treeColumn, treeItem);

       }

       return false;

    }

@@ -200,12 +336,8 @@ public class DefectXViewer extends XViewer {
          DefectItem defectItem = (DefectItem) treeItem.getData();

          List<DefectItem> defectItems = new ArrayList<DefectItem>();

          defectItems.add(defectItem);

-         if (xCol.equals(DefectXViewerFactory.Created_Date_Col) || xCol.equals(DefectXViewerFactory.Closed_Col) || xCol.equals(DefectXViewerFactory.Description_Col) || xCol.equals(DefectXViewerFactory.Resolution_Col) || xCol.equals(DefectXViewerFactory.Location_Col) || xCol.equals(DefectXViewerFactory.User_Col) || xCol.equals(DefectXViewerFactory.Injection_Activity_Col)) {

-            return promptChangeDate(xCol, defectItems, false);

-         } else {

-            if (!xCol.equals(DefectXViewerFactory.Severity_Col) && !xCol.equals(DefectXViewerFactory.Disposition_Col)) {

-               throw new OseeStateException("Unhandled defect column");

-            }

+         if (xCol.equals(DefectXViewerFactory.Severity_Col) || xCol.equals(DefectXViewerFactory.Disposition_Col) || xCol.equals(DefectXViewerFactory.Created_Date_Col) || xCol.equals(DefectXViewerFactory.Closed_Col) || xCol.equals(DefectXViewerFactory.Description_Col) || xCol.equals(DefectXViewerFactory.Resolution_Col) || xCol.equals(DefectXViewerFactory.Location_Col) || xCol.equals(DefectXViewerFactory.User_Col) || xCol.equals(DefectXViewerFactory.Injection_Activity_Col)) {

+            return promptChangeData(xCol, defectItems, false);

          }

       } catch (Exception ex) {

          OseeLog.log(SkynetGuiDebug.class, OseeLevel.SEVERE_POPUP, ex);

@@ -313,7 +445,7 @@ public class DefectXViewer extends XViewer {
       return modified;

    }

 

-   public boolean promptChangeDate(XViewerColumn xCol, Collection<DefectItem> defectItems, boolean columnMultiEdit) throws OseeCoreException {

+   public boolean promptChangeData(XViewerColumn xCol, Collection<DefectItem> defectItems, boolean columnMultiEdit) throws OseeCoreException {

       boolean modified = false;

       if (defectItems != null && !defectItems.isEmpty()) {

          DefectItem defectItem = (DefectItem) defectItems.toArray()[0];

diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/item/AtsWorkDefinitions.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/item/AtsWorkDefinitions.java
index cb51106d676..ed70e14edda 100644
--- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/item/AtsWorkDefinitions.java
+++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/item/AtsWorkDefinitions.java
@@ -130,6 +130,7 @@ public class AtsWorkDefinitions implements IWorkDefinitionProvider {
             XOption.FILL_VERTICALLY));

       workItems.add(new AtsAttributeXWidgetWorkItem(ATSAttributes.WORK_PACKAGE_ATTRIBUTE, "XTextDam",

             XOption.HORIZONTAL_LABEL));

+      workItems.add(new AtsAttributeXWidgetWorkItem(ATSAttributes.WORKING_BRANCH_WIDGET, "XWorkingBranch", XOption.NONE));

       workItems.add(new AtsAttributeXWidgetWorkItem("Question",

             AtsDecisionDecisionWorkPageDefinition.DECISION_QUESTION_LABEL, "Name", "XLabelDam"));

       workItems.add(new AtsAttributeXWidgetWorkItem("Decision",