2 files changed, 54 insertions, 1 deletions

diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/DynamicXWidgetComposite.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/DynamicXWidgetComposite.java
new file mode 100644
index 00000000000..d18eca2963c
--- /dev/null
+++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/DynamicXWidgetComposite.java
@@ -0,0 +1,46 @@
+/*

+ * Created on Nov 7, 2008

+ *

+ * PLACE_YOUR_DISTRIBUTION_STATEMENT_RIGHT_HERE

+ */

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

+

+import java.io.IOException;

+import java.util.LinkedList;

+import java.util.List;

+import javax.xml.parsers.ParserConfigurationException;

+import org.eclipse.core.runtime.CoreException;

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

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

+import org.eclipse.osee.framework.ui.skynet.widgets.workflow.DynamicXWidgetLayout;

+import org.eclipse.osee.framework.ui.skynet.widgets.workflow.DynamicXWidgetLayoutData;

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

+import org.xml.sax.SAXException;

+

+/**

+ * @author Donald G. Dunne

+ */

+public class DynamicXWidgetComposite extends Composite {

+

+   private final String xWidgetsXml;

+   private List<DynamicXWidgetLayoutData> layoutDatas;

+   private final DynamicXWidgetLayout dynamicXWidgetLayout;

+   private final XWidgetParser xWidgetParser;

+

+   public DynamicXWidgetComposite(String xWidgetsXml, Composite parent, int style) {

+      super(parent, style);

+      this.xWidgetsXml = xWidgetsXml;

+      this.xWidgetParser = new XWidgetParser();

+      this.dynamicXWidgetLayout = new DynamicXWidgetLayout();

+      this.layoutDatas = new LinkedList<DynamicXWidgetLayoutData>();

+

+   }

+

+   public List<DynamicXWidgetLayoutData> getLayoutDatas() throws IllegalArgumentException, OseeCoreException, ParserConfigurationException, SAXException, IOException, CoreException {

+      if (layoutDatas.isEmpty()) {

+         layoutDatas = XWidgetParser.extractWorkAttributes(dynamicXWidgetLayout, xWidgetsXml);

+      }

+      return layoutDatas;

+   }

+

+}

diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/task/TaskComposite.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/task/TaskComposite.java
index 9e50cbbccd9..99418c8e614 100644
--- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/task/TaskComposite.java
+++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/task/TaskComposite.java
@@ -114,9 +114,12 @@ public class TaskComposite extends Composite implements IActionable {
       headerComp.setLayout(ALayout.getZeroMarginLayout(3, false));
       GridData gd = new GridData(GridData.FILL_HORIZONTAL);
       headerComp.setLayoutData(gd);
+      headerComp.setBackground(Display.getCurrent().getSystemColor(SWT.COLOR_CYAN));
 
       warningLabel = new Label(headerComp, SWT.NONE);
+      //      warningLabel.setBackground(Display.getCurrent().getSystemColor(SWT.COLOR_YELLOW));
       searchNameLabel = new Label(headerComp, SWT.NONE);
+      //      searchNameLabel.setBackground(Display.getCurrent().getSystemColor(SWT.COLOR_GREEN));
 
       if (!DbConnectionExceptionComposite.dbConnectionIsOk(this)) {
          return;
@@ -129,6 +132,7 @@ public class TaskComposite extends Composite implements IActionable {
          gd = new GridData(GridData.FILL_HORIZONTAL);
          gd.horizontalSpan = 3;
          extraInfoLabel.setLayoutData(gd);
+         //         extraInfoLabel.setBackground(Display.getCurrent().getSystemColor(SWT.COLOR_RED));
 
          taskXViewer =
                new TaskXViewer(this, SWT.MULTI | SWT.BORDER | SWT.FULL_SELECTION, iXTaskViewer.getEditor(), this);
@@ -230,8 +234,11 @@ public class TaskComposite extends Composite implements IActionable {
       // Button composite for state transitions, etc
       Composite bComp = new Composite(parent, SWT.NONE);
       // bComp.setBackground(mainSComp.getDisplay().getSystemColor(SWT.COLOR_CYAN));
-      bComp.setLayout(new GridLayout(2, false));
       bComp.setLayoutData(new GridData(SWT.RIGHT, SWT.NONE, false, false, 1, 1));
+      GridLayout layout = new GridLayout(2, false);
+      layout.marginHeight = 0;
+      layout.marginWidth = 0;
+      bComp.setLayout(layout);
 
       ToolBar toolBar = new ToolBar(bComp, SWT.FLAT | SWT.RIGHT);
       GridData gd = new GridData(GridData.FILL_HORIZONTAL);