XWidget Refactor

26 files changed, 155 insertions, 219 deletions

diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XBranchSelectComboWidget.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XBranchSelectComboWidget.java
index 70b85e2d140..389bdd29b3d 100644
--- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XBranchSelectComboWidget.java
+++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XBranchSelectComboWidget.java
@@ -76,7 +76,7 @@ public class XBranchSelectComboWidget extends XWidget implements Listener {
       // Create List Widgets

       if (displayLabel) {

          labelWidget = new Label(composite, SWT.NONE);

-         labelWidget.setText(label + ":");

+         labelWidget.setText(getLabel() + ":");

       }

       selectComposite = BranchSelectSimpleComposite.createBranchSelectComposite(composite, SWT.NONE);

       if (defaultBranch != -1) {

diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XBranchSelectWidget.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XBranchSelectWidget.java
index 8d9bd87649d..66ef70db82a 100644
--- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XBranchSelectWidget.java
+++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XBranchSelectWidget.java
@@ -18,7 +18,6 @@ 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.branch.BranchSelectComposite;

 import org.eclipse.swt.SWT;

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

 import org.eclipse.swt.layout.GridData;

 import org.eclipse.swt.layout.GridLayout;

 import org.eclipse.swt.widgets.Composite;

@@ -72,7 +71,7 @@ public class XBranchSelectWidget extends XWidget implements Listener {
       // Create List Widgets

       if (displayLabel) {

          labelWidget = new Label(composite, SWT.NONE);

-         labelWidget.setText(label + ":");

+         labelWidget.setText(getLabel() + ":");

       }

       selectComposite = BranchSelectComposite.createBranchSelectComposite(composite, SWT.NONE);

       if (defaultBranch != null) {

@@ -233,5 +232,5 @@ public class XBranchSelectWidget extends XWidget implements Listener {
       defaultBranch = branch;

       selectComposite.setSelected(branch);

    }

-   

+

 }
\ No newline at end of file
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XButton.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XButton.java
index 44e81f27ee3..3c778a4d9e6 100644
--- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XButton.java
+++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XButton.java
@@ -76,7 +76,7 @@ public class XButton extends XWidget {
       // Create Text Widgets
       if (!labelAfter) {
          labelWidget = new Label(bComp, SWT.NONE);
-         labelWidget.setText(label + ":");
+         labelWidget.setText(getLabel() + ":");
       }
 
       if (toolkit != null)
@@ -97,10 +97,10 @@ public class XButton extends XWidget {
 
       if (labelAfter) {
          labelWidget = new Label(bComp, SWT.NONE);
-         labelWidget.setText(label);
+         labelWidget.setText(getLabel());
       }
-      if (toolTip != null) {
-         button.setToolTipText(toolTip);
+      if (getToolTip() != null) {
+         button.setToolTipText(getToolTip());
       }
       button.setLayoutData(gd);
       updateCheckWidget();
@@ -155,7 +155,7 @@ public class XButton extends XWidget {
    }
 
    public String toHTML(String labelFont) {
-      return AHTML.getLabelStr(labelFont, label + ": ") + selected;
+      return AHTML.getLabelStr(labelFont, getLabel() + ": ") + selected;
    }
 
    /**
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XCheckBox.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XCheckBox.java
index a87ef52a6eb..4cd97ce4d7d 100644
--- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XCheckBox.java
+++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XCheckBox.java
@@ -63,7 +63,7 @@ public class XCheckBox extends XWidget {
       // Create Text Widgets
       if (!labelAfter) {
          labelWidget = new Label(parent, SWT.NONE);
-         labelWidget.setText(label + ":");
+         labelWidget.setText(getLabel() + ":");
       }
 
       checkButton = new Button(parent, SWT.CHECK);
@@ -82,10 +82,10 @@ public class XCheckBox extends XWidget {
 
       if (labelAfter) {
          labelWidget = new Label(parent, SWT.NONE);
-         labelWidget.setText(label);
+         labelWidget.setText(getLabel());
       }
-      if (toolTip != null) {
-         labelWidget.setToolTipText(toolTip);
+      if (getToolTip() != null) {
+         labelWidget.setToolTipText(getToolTip());
       }
       checkButton.setLayoutData(gd);
       updateCheckWidget();
@@ -152,7 +152,7 @@ public class XCheckBox extends XWidget {
    }
 
    public String toHTML(String labelFont) {
-      return AHTML.getLabelStr(labelFont, label + ": ") + selected;
+      return AHTML.getLabelStr(labelFont, getLabel() + ": ") + selected;
    }
 
    /**
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XCombo.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XCombo.java
index 64886c876d8..313e64d54ec 100644
--- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XCombo.java
+++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XCombo.java
@@ -91,11 +91,11 @@ public class XCombo extends XWidget {
       }

 

       // Create Data Widgets

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

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

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

-         labelWidget.setText(label + ":");

-         if (toolTip != null) {

-            labelWidget.setToolTipText(toolTip);

+         labelWidget.setText(getLabel() + ":");

+         if (getToolTip() != null) {

+            labelWidget.setToolTipText(getToolTip());

          }

       }

 

@@ -125,7 +125,7 @@ public class XCombo extends XWidget {
       dataCombo.addModifyListener(dataComboListener);

 

       refresh();

-      dataCombo.setEnabled(editable);

+      dataCombo.setEnabled(isEditable());

    }

 

    public int getDisplayPosition(String str) {

@@ -179,13 +179,14 @@ public class XCombo extends XWidget {
    @Override

    public void setFromXml(String xml) throws IllegalStateException {

       Matcher m;

-      if (xmlSubRoot.equals("")) {

+      if (getXmlSubRoot().equals("")) {

          m =

-               Pattern.compile("<" + xmlRoot + ">(.*?)</" + xmlRoot + ">", Pattern.MULTILINE | Pattern.DOTALL).matcher(

+               Pattern.compile("<" + getXmlRoot() + ">(.*?)</" + getXmlRoot() + ">", Pattern.MULTILINE | Pattern.DOTALL).matcher(

                      xml);

       } else {

          m =

-               Pattern.compile("<" + xmlRoot + "><" + xmlSubRoot + ">(.*?)</" + xmlSubRoot + "></" + xmlRoot + ">",

+               Pattern.compile(

+                     "<" + getXmlRoot() + "><" + getXmlSubRoot() + ">(.*?)</" + getXmlSubRoot() + "></" + getXmlRoot() + ">",

                      Pattern.MULTILINE | Pattern.DOTALL).matcher(xml);

       }

       while (m.find()) {

@@ -305,32 +306,32 @@ public class XCombo extends XWidget {
 

    @Override

    public Result isValid() {

-      if (requiredEntry && data.equals("")) {

+      if (isRequiredEntry() && data.equals("")) {

          return new Result(getLabel() + " must be selected.");

       }

       return Result.TrueResult;

    }

 

    @Override

-   public String toXml() {

-      return toXml(xmlRoot);

+   protected String toXml() {

+      return toXml(getXmlRoot());

    }

 

    @Override

-   public String toXml(String xmlRoot) {

+   protected String toXml(String xmlRoot) {

       String s;

       String dataStr = getXml();

-      if (xmlSubRoot == null || xmlSubRoot.equals("")) {

+      if (getXmlSubRoot() == null || getXmlSubRoot().equals("")) {

          s = "<" + xmlRoot + ">" + dataStr + "</" + xmlRoot + ">\n";

       } else {

-         s = "<" + xmlRoot + "><" + xmlSubRoot + ">" + dataStr + "</" + xmlSubRoot + "></" + xmlRoot + ">\n";

+         s = "<" + xmlRoot + "><" + getXmlSubRoot() + ">" + dataStr + "</" + getXmlSubRoot() + "></" + xmlRoot + ">\n";

       }

       return s;

    }

 

    @Override

    public String toHTML(String labelFont) {

-      return AHTML.getLabelStr(labelFont, label + ": ") + data;

+      return AHTML.getLabelStr(labelFont, getLabel() + ": ") + data;

    }

 

    public static void copy(XCombo from, XCombo to) throws IllegalStateException {

@@ -349,10 +350,10 @@ public class XCombo extends XWidget {
       return displayArray;

    }

 

-   public String[] getInDataStrings () {

-	   return inDataStrings;

+   public String[] getInDataStrings() {

+      return inDataStrings;

    }

-   

+

    @Override

    public Object getData() {

       return dataCombo.getText();

diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XComboViewer.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XComboViewer.java
index 0ff7d513364..894b8530f87 100644
--- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XComboViewer.java
+++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XComboViewer.java
@@ -71,7 +71,6 @@ public class XComboViewer extends XWidget {
 
    public XComboViewer(String displayLabel, String xmlRoot, String xmlSubRoot) {
       super(displayLabel, xmlRoot, xmlSubRoot);
-      setReportType(XWidget.RPT_SINGLE_LINE);
       contentProvider = new ArrayContentProvider();
       labelProvider = new ArtifactLabelProvider();
    }
@@ -143,9 +142,9 @@ public class XComboViewer extends XWidget {
       // Create List Widgets
       if (displayLabel) {
          labelWidget = new Label(composite, SWT.NONE);
-         labelWidget.setText(label + ":");
-         if (toolTip != null) {
-            labelWidget.setToolTipText(toolTip);
+         labelWidget.setText(getLabel() + ":");
+         if (getToolTip() != null) {
+            labelWidget.setToolTipText(getToolTip());
          }
       }
 
@@ -251,7 +250,7 @@ public class XComboViewer extends XWidget {
 
    @Override
    public Result isValid() {
-      if (!requiredEntry) return Result.TrueResult;
+      if (!isRequiredEntry()) return Result.TrueResult;
       Object selected = getSelected();
       if (selected == null && isRequiredEntry()) return new Result("Must select " + getLabel());
       return Result.TrueResult;
@@ -268,7 +267,7 @@ public class XComboViewer extends XWidget {
 
    @Override
    public String toXml() {
-      return toXml(xmlRoot, xmlSubRoot);
+      return toXml(getXmlRoot(), getXmlSubRoot());
    }
 
    @Override
@@ -278,7 +277,7 @@ public class XComboViewer extends XWidget {
 
    @Override
    public String toHTML(String labelFont) {
-      String s = "<dl><dt>" + AHTML.getLabelStr(labelFont, label + ": ") + "<dt><ul type=\"disc\">";
+      String s = "<dl><dt>" + AHTML.getLabelStr(labelFont, getLabel() + ": ") + "<dt><ul type=\"disc\">";
       Object xItem = getSelected();
       s += "<li>" + xItem;
       return s + "</ul></dl>";
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XDate.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XDate.java
index cea32942471..221cd242bd5 100644
--- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XDate.java
+++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XDate.java
@@ -139,7 +139,7 @@ public class XDate extends XWidget {
       if (horizontalSpan < 2) horizontalSpan = 2;

 

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

-      labelWidget.setText(label + ": ");

+      labelWidget.setText(getLabel() + ": ");

       dateCombo = new CalendarCombo(parent, SWT.BORDER);

       dateCombo.setEnabled(isEditable());

       GridData gd = new GridData();

@@ -173,7 +173,7 @@ public class XDate extends XWidget {
    @Override

    public void setFromXml(String xml) {

       Matcher m =

-            Pattern.compile("<" + xmlRoot + ">(\\d+)</" + xmlRoot + ">", Pattern.MULTILINE | Pattern.DOTALL).matcher(

+            Pattern.compile("<" + getXmlRoot() + ">(\\d+)</" + getXmlRoot() + ">", Pattern.MULTILINE | Pattern.DOTALL).matcher(

                   xml);

       if (m.find()) {

          try {

@@ -233,7 +233,7 @@ public class XDate extends XWidget {
       if (isRequireFutureDate()) {

          if (getDate().before(new Date())) return new Result(getLabel() + " must be in future.");

       }

-      if (requiredEntry) {

+      if (isRequiredEntry()) {

          if (get().equals("")) return new Result(getLabel() + " must be selected.");

       }

       return Result.TrueResult;

@@ -294,11 +294,11 @@ public class XDate extends XWidget {
 

    @Override

    public String toHTML(String labelFont) {

-      return AHTML.getLabelStr(labelFont, label + ": ") + get(defaultFormat);

+      return AHTML.getLabelStr(labelFont, getLabel() + ": ") + get(defaultFormat);

    }

 

    public String toHTML(String labelFont, String pattern) {

-      return AHTML.getLabelStr(labelFont, label + ": ") + get(pattern);

+      return AHTML.getLabelStr(labelFont, getLabel() + ": ") + get(pattern);

    }

 

    public boolean isRequireFutureDate() {

diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XFloat.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XFloat.java
index 42d7342c095..bbf977ebd31 100644
--- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XFloat.java
+++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XFloat.java
@@ -51,7 +51,7 @@ public class XFloat extends XText {
 
    @Override
    public Result isValid() {
-      if (super.requiredEntry() || (super.get().compareTo("") != 0)) {
+      if (isRequiredEntry() || (super.get().compareTo("") != 0)) {
          String name = getLabel();
          if (name.equals("")) name = "Value";
          Result result = super.isValid();
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XHyperlinkLabelSelection.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XHyperlinkLabelSelection.java
index d348498880d..a7cc93431d0 100644
--- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XHyperlinkLabelSelection.java
+++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XHyperlinkLabelSelection.java
@@ -84,11 +84,11 @@ public abstract class XHyperlinkLabelSelection extends XWidget {
       comp.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 
       // Create Text Widgets
-      if (displayLabel && !label.equals("")) {
+      if (displayLabel && !getLabel().equals("")) {
          labelWidget = new Label(comp, SWT.NONE);
-         labelWidget.setText(label + ":");
-         if (toolTip != null) {
-            labelWidget.setToolTipText(toolTip);
+         labelWidget.setText(getLabel() + ":");
+         if (getToolTip() != null) {
+            labelWidget.setToolTipText(getToolTip());
          }
       }
 
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XInteger.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XInteger.java
index f8e57e3820a..fb33e42e234 100644
--- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XInteger.java
+++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XInteger.java
@@ -40,7 +40,7 @@ public class XInteger extends XText {
    }
 
    public Result isValid() {
-      if (super.requiredEntry() || (super.get().compareTo("") != 0)) {
+      if (isRequiredEntry() || (super.get().compareTo("") != 0)) {
          Result result = super.isValid();
          if (result.isFalse()) {
             return result;
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XLabel.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XLabel.java
index 93598031ee3..83f5e2073f9 100644
--- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XLabel.java
+++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XLabel.java
@@ -42,11 +42,11 @@ public class XLabel extends XWidget {
    public void createWidgets(Composite parent, int horizontalSpan) {
       if (horizontalSpan < 2) horizontalSpan = 2;
       // Create Data Widgets
-      if (!label.equals("")) {
+      if (!getLabel().equals("")) {
          labelWidget = new Label(parent, SWT.NONE);
          labelWidget.setText(showString);
-         if (toolTip != null) {
-            labelWidget.setToolTipText(toolTip);
+         if (getToolTip() != null) {
+            labelWidget.setToolTipText(getToolTip());
          }
       }
    }
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XLabelDam.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XLabelDam.java
index 46b4ccc7840..1efe7f8cfc1 100644
--- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XLabelDam.java
+++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XLabelDam.java
@@ -48,11 +48,11 @@ public class XLabelDam extends XWidget implements IArtifactWidget {
       this.parent = parent;
       if (horizontalSpan < 2) horizontalSpan = 2;
       // Create Data Widgets
-      if (!label.equals("")) {
+      if (!getLabel().equals("")) {
          labelWidget = new Label(parent, SWT.NONE);
-         labelWidget.setText(label + ":");
-         if (toolTip != null) {
-            labelWidget.setToolTipText(toolTip);
+         labelWidget.setText(getLabel() + ":");
+         if (getToolTip() != null) {
+            labelWidget.setToolTipText(getToolTip());
          }
       }
       valueTextWidget = new Text(parent, SWT.NONE);
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XList.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XList.java
index 482b5ec8055..bf8170100fc 100644
--- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XList.java
+++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XList.java
@@ -117,7 +117,6 @@ public class XList extends XWidget {
 
    public XList(String displayLabel, String xmlRoot, String xmlSubRoot) {
       super(displayLabel, xmlRoot, xmlSubRoot);
-      setReportType(XWidget.RPT_SINGLE_LINE);
       listMenu = null;
    }
 
@@ -171,9 +170,9 @@ public class XList extends XWidget {
       // Create List Widgets
       if (displayLabel) {
          labelWidget = new Label(composite, SWT.NONE);
-         labelWidget.setText(label + ":");
-         if (toolTip != null) {
-            labelWidget.setToolTipText(toolTip);
+         labelWidget.setText(getLabel() + ":");
+         if (getToolTip() != null) {
+            labelWidget.setToolTipText(getToolTip());
          }
       }
 
@@ -262,10 +261,11 @@ public class XList extends XWidget {
       String outterXml;
       items.clear();
       outter =
-            Pattern.compile("<" + xmlRoot + ">(.*?)</" + xmlRoot + ">", Pattern.MULTILINE | Pattern.DOTALL).matcher(xml);
+            Pattern.compile("<" + getXmlRoot() + ">(.*?)</" + getXmlRoot() + ">", Pattern.MULTILINE | Pattern.DOTALL).matcher(
+                  xml);
       while (outter.find()) {
          outterXml = outter.group(1);
-         inner = Pattern.compile("<" + xmlSubRoot + ">(.*?)</" + xmlSubRoot + ">").matcher(outterXml);
+         inner = Pattern.compile("<" + getXmlSubRoot() + ">(.*?)</" + getXmlSubRoot() + ">").matcher(outterXml);
          while (inner.find()) {
             String str = inner.group(1);
             XListItem xItem = getByXmlName(str);
@@ -385,7 +385,7 @@ public class XList extends XWidget {
 
    @Override
    public Result isValid() {
-      if (!requiredEntry) return Result.TrueResult;
+      if (!isRequiredEntry()) return Result.TrueResult;
       int size = getSelected().size();
       if (requiredMaxSelected != 0) {
          if ((size >= requiredMinSelected) && (size <= requiredMaxSelected)) {
@@ -434,7 +434,7 @@ public class XList extends XWidget {
 
    @Override
    public String toXml() {
-      return toXml(xmlRoot, xmlSubRoot);
+      return toXml(getXmlRoot(), getXmlSubRoot());
    }
 
    @Override
@@ -455,7 +455,7 @@ public class XList extends XWidget {
 
    @Override
    public String toHTML(String labelFont) {
-      String s = "<dl><dt>" + AHTML.getLabelStr(labelFont, label + ": ") + "<dt><ul type=\"disc\">";
+      String s = "<dl><dt>" + AHTML.getLabelStr(labelFont, getLabel() + ": ") + "<dt><ul type=\"disc\">";
       for (XListItem xItem : getSelected()) {
          s += "<li>" + xItem;
       }
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XListViewer.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XListViewer.java
index 663f5121ed4..ad04f75221b 100644
--- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XListViewer.java
+++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XListViewer.java
@@ -77,7 +77,6 @@ public class XListViewer extends XWidget {
 

    public XListViewer(String displayLabel, String xmlRoot, String xmlSubRoot) {

       super(displayLabel, xmlRoot, xmlSubRoot);

-      setReportType(XWidget.RPT_SINGLE_LINE);

       listMenu = null;

    }

 

@@ -174,9 +173,9 @@ public class XListViewer extends XWidget {
       // Create List Widgets

       if (displayLabel) {

          labelWidget = new Label(composite, SWT.NONE);

-         labelWidget.setText(label + ":");

-         if (toolTip != null) {

-            labelWidget.setToolTipText(toolTip);

+         labelWidget.setText(getLabel() + ":");

+         if (getToolTip() != null) {

+            labelWidget.setToolTipText(getToolTip());

          }

       }

 

@@ -313,7 +312,7 @@ public class XListViewer extends XWidget {
    }

 

    public Result isValid() {

-      if (!requiredEntry) return Result.TrueResult;

+      if (!isRequiredEntry()) return Result.TrueResult;

       int size = getSelected().size();

       if (requiredMaxSelected != 0) {

          if ((size >= requiredMinSelected) && (size <= requiredMaxSelected)) {

@@ -361,7 +360,7 @@ public class XListViewer extends XWidget {
    }

 

    public String toXml() {

-      return toXml(xmlRoot, xmlSubRoot);

+      return toXml(getXmlRoot(), getXmlSubRoot());

    }

 

    public String toXml(String xmlRoot, String xmlSubRoot) {

@@ -369,7 +368,7 @@ public class XListViewer extends XWidget {
    }

 

    public String toHTML(String labelFont) {

-      String s = "<dl><dt>" + AHTML.getLabelStr(labelFont, label + ": ") + "<dt><ul type=\"disc\">";

+      String s = "<dl><dt>" + AHTML.getLabelStr(labelFont, getLabel() + ": ") + "<dt><ul type=\"disc\">";

       for (Object xItem : getSelected()) {

          s += "<li>" + xItem;

       }

diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XMembersCombo.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XMembersCombo.java
index 8b8ca7e1194..c3862b15c04 100644
--- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XMembersCombo.java
+++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XMembersCombo.java
@@ -89,7 +89,7 @@ public class XMembersCombo extends XWidget {
 
    @Override
    public String toString() {
-      return label + ": *" + get() + "*";
+      return getLabel() + ": *" + get() + "*";
    }
 
    /**
@@ -103,11 +103,11 @@ public class XMembersCombo extends XWidget {
       if (horizontalSpan < 2) horizontalSpan = 2;
 
       // Create Data Widgets
-      if (!label.equals("")) {
+      if (!getLabel().equals("")) {
          labelWidget = new Label(composite, SWT.NONE);
-         labelWidget.setText(label + ":");
-         if (toolTip != null) {
-            labelWidget.setToolTipText(toolTip);
+         labelWidget.setText(getLabel() + ":");
+         if (getToolTip() != null) {
+            labelWidget.setToolTipText(getToolTip());
          }
       }
 
@@ -162,7 +162,7 @@ public class XMembersCombo extends XWidget {
       });
 
       refresh();
-      dataCombo.setEnabled(editable);
+      dataCombo.setEnabled(isEditable());
    }
 
    private void resetSelectionList() {
@@ -202,13 +202,14 @@ public class XMembersCombo extends XWidget {
    @Override
    public void setFromXml(String xml) {
       Matcher matcher;
-      if (xmlSubRoot.equals("")) {
+      if (getXmlSubRoot().equals("")) {
          matcher =
-               Pattern.compile("<" + xmlRoot + ">(.*?)</" + xmlRoot + ">", Pattern.MULTILINE | Pattern.DOTALL).matcher(
+               Pattern.compile("<" + getXmlRoot() + ">(.*?)</" + getXmlRoot() + ">", Pattern.MULTILINE | Pattern.DOTALL).matcher(
                      xml);
       } else {
          matcher =
-               Pattern.compile("<" + xmlRoot + "><" + xmlSubRoot + ">(.*?)</" + xmlSubRoot + "></" + xmlRoot + ">",
+               Pattern.compile(
+                     "<" + getXmlRoot() + "><" + getXmlSubRoot() + ">(.*?)</" + getXmlSubRoot() + "></" + getXmlRoot() + ">",
                      Pattern.MULTILINE | Pattern.DOTALL).matcher(xml);
       }
       while (matcher.find()) {
@@ -280,30 +281,30 @@ public class XMembersCombo extends XWidget {
 
    @Override
    public Result isValid() {
-      if (requiredEntry && !isAssigned()) return new Result("Must select " + getLabel());
+      if (isRequiredEntry() && !isAssigned()) return new Result("Must select " + getLabel());
       return Result.TrueResult;
    }
 
    @Override
-   public String toXml() throws Exception {
-      return toXml(xmlRoot);
+   protected String toXml() throws Exception {
+      return toXml(getXmlRoot());
    }
 
    @Override
-   public String toXml(String xmlRoot) throws Exception {
+   protected String toXml(String xmlRoot) throws Exception {
       String s;
       String dataStr = selectedUser.getUserId();
-      if (xmlSubRoot == null || xmlSubRoot.equals("")) {
+      if (getXmlSubRoot() == null || getXmlSubRoot().equals("")) {
          s = "<" + xmlRoot + ">" + dataStr + "</" + xmlRoot + ">\n";
       } else {
-         s = "<" + xmlRoot + "><" + xmlSubRoot + ">" + dataStr + "</" + xmlSubRoot + "></" + xmlRoot + ">\n";
+         s = "<" + xmlRoot + "><" + getXmlSubRoot() + ">" + dataStr + "</" + getXmlSubRoot() + "></" + xmlRoot + ">\n";
       }
       return s;
    }
 
    @Override
    public String toHTML(String labelFont) {
-      return AHTML.getLabelStr(labelFont, label + ": ") + get();
+      return AHTML.getLabelStr(labelFont, getLabel() + ": ") + get();
    }
 
    protected void keyReleaseOccured(KeyEvent keyEvent) {
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XPercent.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XPercent.java
index e8dc17989af..940dadd5913 100644
--- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XPercent.java
+++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XPercent.java
@@ -26,7 +26,7 @@ public class XPercent extends XText {
    }
 
    public Result isValid() {
-      if (super.requiredEntry()) {
+      if (isRequiredEntry()) {
          Result result = super.isValid();
          if (result.isFalse()) {
             return result;
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XPercentDam.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XPercentDam.java
index 32cd7adc0d9..49675f8b225 100644
--- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XPercentDam.java
+++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XPercentDam.java
@@ -23,7 +23,7 @@ public class XPercentDam extends XIntegerDam {
     */
    @Override
    public Result isValid() {
-      if (super.requiredEntry()) {
+      if (isRequiredEntry()) {
          Result result = super.isValid();
          if (result.isFalse()) {
             return result;
@@ -35,5 +35,4 @@ public class XPercentDam extends XIntegerDam {
       }
       return Result.TrueResult;
    }
-
 }
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XRadioButton.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XRadioButton.java
index 53da6196a37..8b7ad0b07c1 100644
--- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XRadioButton.java
+++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XRadioButton.java
@@ -109,7 +109,7 @@ public class XRadioButton extends XWidget {
       if (!isLabelAfter() && isDisplayLabel()) createLabel(parent);
 
       button = new Button(parent, (buttonType == ButtonType.Check) ? SWT.CHECK : SWT.RADIO);
-      if (toolTip != null && !toolTip.equals("")) button.setToolTipText(toolTip);
+      if (getToolTip() != null && !getToolTip().equals("")) button.setToolTipText(getToolTip());
       if (getToolTip() != null && !getToolTip().equals("")) button.setToolTipText(getToolTip());
       GridData gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
       button.setLayoutData(gd);
@@ -127,10 +127,10 @@ public class XRadioButton extends XWidget {
 
    public void createLabel(Composite parent) {
       labelWidget = new Label(parent, SWT.NONE);
-      String str = label;
+      String str = getLabel();
       if (!isLabelAfter()) str += ":";
       labelWidget.setText(str);
-      if (toolTip != null && !toolTip.equals("")) labelWidget.setToolTipText(toolTip);
+      if (getToolTip() != null && !getToolTip().equals("")) labelWidget.setToolTipText(getToolTip());
    }
 
    public void dispose() {
@@ -167,7 +167,7 @@ public class XRadioButton extends XWidget {
    }
 
    public String toHTML(String labelFont) {
-      return AHTML.getLabelStr(labelFont, label + ": ") + getDisplayStr();
+      return AHTML.getLabelStr(labelFont, getLabel() + ": ") + getDisplayStr();
    }
 
    public boolean isLabelAfter() {
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XRadioButtons.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XRadioButtons.java
index 22c2dda61a0..ea1a94ecccf 100644
--- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XRadioButtons.java
+++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XRadioButtons.java
@@ -129,7 +129,7 @@ public class XRadioButtons extends XWidget {
       else {
          Matcher m;
          m =
-               Pattern.compile("<" + xmlRoot + ">(.*?)</" + xmlRoot + ">", Pattern.MULTILINE | Pattern.DOTALL).matcher(
+               Pattern.compile("<" + getXmlRoot() + ">(.*?)</" + getXmlRoot() + ">", Pattern.MULTILINE | Pattern.DOTALL).matcher(
                      xml);
          if (m.find()) {
             String str = m.group(1);
@@ -189,10 +189,10 @@ public class XRadioButtons extends XWidget {
       // Create Text Widgets
       if (displayLabel) {
          labelWidget = new Label(comp, SWT.NONE);
-         labelWidget.setText(label + ":");
+         labelWidget.setText(getLabel() + ":");
       }
-      if (toolTip != null && displayLabel) {
-         labelWidget.setToolTipText(toolTip);
+      if (getToolTip() != null && displayLabel) {
+         labelWidget.setToolTipText(getToolTip());
       }
 
       if (sortNames) Arrays.sort(names);
@@ -264,7 +264,7 @@ public class XRadioButtons extends XWidget {
    public Set<String> getSelectedNames() {
       Set<String> names = new HashSet<String>();
       for (XRadioButton rb : xButtons) {
-         if (rb.isSelected()) names.add(rb.label);
+         if (rb.isSelected()) names.add(rb.getLabel());
       }
       return names;
    }
@@ -291,7 +291,7 @@ public class XRadioButtons extends XWidget {
    }
 
    public Result isValid() {
-      if (requiredEntry && getSelectedNames().size() == 0) {
+      if (isRequiredEntry() && getSelectedNames().size() == 0) {
          return new Result(getLabel() + " must have at least one selection.");
       }
       return Result.TrueResult;
@@ -302,7 +302,7 @@ public class XRadioButtons extends XWidget {
    }
 
    public String toHTML(String labelFont) {
-      return AHTML.getLabelStr(labelFont, label + ": ") + getDisplayStr();
+      return AHTML.getLabelStr(labelFont, getLabel() + ": ") + getDisplayStr();
    }
 
    public boolean isMultiSelect() {
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XText.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XText.java
index c449e7b4d30..942cfb82610 100644
--- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XText.java
+++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XText.java
@@ -87,7 +87,7 @@ public class XText extends XWidget {
 
    @Override
    public String toString() {
-      return label + ": *" + text + "*";
+      return getLabel() + ": *" + text + "*";
    }
 
    /*
@@ -148,11 +148,11 @@ public class XText extends XWidget {
       // composite = parent;
 
       // Create Text Widgets
-      if (displayLabel && !label.equals("")) {
+      if (displayLabel && !getLabel().equals("")) {
          labelWidget = new Label(composite, SWT.NONE);
-         labelWidget.setText(label + ":");
-         if (toolTip != null) {
-            labelWidget.setToolTipText(toolTip);
+         labelWidget.setText(getLabel() + ":");
+         if (getToolTip() != null) {
+            labelWidget.setToolTipText(getToolTip());
          }
       }
 
@@ -189,7 +189,7 @@ public class XText extends XWidget {
       }
       if (fillText) updateTextWidget();
       setLabelError();
-      sText.setEditable(editable);
+      sText.setEditable(isEditable());
       if (font != null) sText.setFont(font);
       parent.layout();
    }
@@ -360,10 +360,6 @@ public class XText extends XWidget {
       setLabelError();
    }
 
-   public boolean requiredEntry() {
-      return requiredEntry;
-   }
-
    public void addModifyListener(ModifyListener modifyListener) {
       if (sText != null) sText.addModifyListener(modifyListener);
    }
@@ -386,11 +382,11 @@ public class XText extends XWidget {
    }
 
    @Override
-   public String toXml() {
-      if (xmlSubRoot.equals("")) {
-         return toXml(xmlRoot);
+   protected String toXml() {
+      if (getXmlSubRoot().equals("")) {
+         return toXml(getXmlRoot());
       } else {
-         return toXml(xmlRoot, xmlSubRoot);
+         return toXml(getXmlRoot(), getXmlSubRoot());
       }
    }
 
@@ -416,7 +412,9 @@ public class XText extends XWidget {
    @Override
    public void setFromXml(String xml) {
       Matcher m;
-      m = Pattern.compile("<" + xmlRoot + ">(.*?)</" + xmlRoot + ">", Pattern.MULTILINE | Pattern.DOTALL).matcher(xml);
+      m =
+            Pattern.compile("<" + getXmlRoot() + ">(.*?)</" + getXmlRoot() + ">", Pattern.MULTILINE | Pattern.DOTALL).matcher(
+                  xml);
 
       if (m.find()) {
          String xmlStr = m.group(1);
@@ -483,7 +481,7 @@ public class XText extends XWidget {
    }
 
    public String toHTML(String labelFont, boolean newLineText) {
-      String s = AHTML.getLabelStr(labelFont, label + ": ");
+      String s = AHTML.getLabelStr(labelFont, getLabel() + ": ");
       if (newLineText) s = "<dl><dt>" + s + "<dd>";
       s += text;
       if (newLineText) s += "</dl>";
@@ -516,7 +514,7 @@ public class XText extends XWidget {
    @Override
    public Result isValid() {
       if (isRequiredEntry() && get().equals("")) {
-         return new Result(String.format("Must enter \"%s\"", label));
+         return new Result(String.format("Must enter \"%s\"", getLabel()));
       }
       return Result.TrueResult;
    }
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XWidget.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XWidget.java
index ddef097d5f2..648dbe2bd84 100644
--- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XWidget.java
+++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XWidget.java
@@ -43,12 +43,13 @@ public abstract class XWidget {
    private IManagedForm managedForm;
 
    protected Label labelWidget = null;
-   protected String label = "";
-   protected String xmlRoot = "";
-   protected String xmlSubRoot = "";
-   protected String toolTip = null;
-   protected boolean requiredEntry = false;
-   protected boolean editable = true;
+   private String label = "";
+   private String xmlRoot = "";
+   private String xmlSubRoot = "";
+   private String toolTip = null;
+   private boolean requiredEntry = false;
+   private boolean editable = true;
+
    protected boolean verticalLabel = false;
    protected boolean fillVertically = false;
    protected boolean fillHorizontally = false;
@@ -63,20 +64,6 @@ public abstract class XWidget {
    protected boolean displayLabel = true;
    private final Set<XModifiedListener> modifiedListeners = new LinkedHashSet<XModifiedListener>();
    private MouseListener mouseLabelListener;
-
-   /**
-    * Display "label: data"
-    */
-   public final static int RPT_NONE = 0;
-   /**
-    * Display "label: data\n\n" Default of AAtribute
-    */
-   public final static int RPT_SINGLE_LINE = 1;
-   /**
-    * Display "label:\n data\n\n"
-    */
-   public final static int RPT_MULTI_LINE = 2;
-   protected int reportType = RPT_SINGLE_LINE;
    protected FormToolkit toolkit;
 
    public XWidget(String label) {
@@ -245,11 +232,11 @@ public abstract class XWidget {
     * 
     * @return Return Xml data string.
     */
-   public abstract String getXmlData();
+   protected abstract String getXmlData();
 
    public abstract String toHTML(String labelFont);
 
-   public String toXml() throws Exception {
+   protected String toXml() throws Exception {
       if (xmlSubRoot.equals("")) {
          return toXml(xmlRoot);
       } else {
@@ -257,7 +244,7 @@ public abstract class XWidget {
       }
    }
 
-   public String toXml(String xmlRoot) throws Exception {
+   protected String toXml(String xmlRoot) throws Exception {
       String s = "<" + xmlRoot + ">" + AXml.textToXml(getXmlData()) + "</" + xmlRoot + ">\n";
       return s;
    }
@@ -391,7 +378,7 @@ public abstract class XWidget {
    /**
     * @param labelWidget The labelWidget to set.
     */
-   public void setLabelWidget(Label labelWidget) {
+   protected void setLabelWidget(Label labelWidget) {
       this.labelWidget = labelWidget;
    }
 
@@ -410,56 +397,15 @@ public abstract class XWidget {
    }
 
    /**
-    * @return Returns the reportType.
-    */
-   public int getReportType() {
-      return reportType;
-   }
-
-   /**
-    * @param reportType The reportType to set.
-    */
-   public void setReportType(int reportType) {
-      this.reportType = reportType;
-   }
-
-   /**
     * Return data for display in Report (without label) NOTE: There should be no newlines at end of String
     * 
     * @return Return string.
     */
-   public abstract String getReportData();
+   protected abstract String getReportData();
 
    @Override
    public String toString() {
-      return toReport();
-   }
-
-   public String toReport() {
-      return toReport(reportType);
-   }
-
-   /**
-    * RPT_NONE (label: data), RPT_SINGLE_LINE (label: data\n\n), RPT_MULTI_LINE (label:\n data\n\n)
-    * 
-    * @return String report
-    */
-   public String toReport(int rptType) {
-      String s = label + ": ";
-      switch (rptType) {
-         case RPT_SINGLE_LINE:
-            s += getReportData() + "\n\n";
-            break;
-         case RPT_MULTI_LINE:
-            String data = getReportData();
-            data = data.replaceAll("\n", "\n   ");
-            s += "\n" + data + "\n\n";
-            break;
-         default:
-            s += getReportData();
-            break;
-      }
-      return s;
+      return String.format("%s: %s\n\n", getLabel(), getReportData());
    }
 
    /**
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/XBranchWidget.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/XBranchWidget.java
index 5a86e48f2d3..539d14ff8aa 100644
--- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/XBranchWidget.java
+++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/XBranchWidget.java
@@ -108,11 +108,11 @@ public class XBranchWidget extends XWidget implements IActionable {
    @Override

    public void createWidgets(Composite parent, int horizontalSpan) {

       // Create Text Widgets

-      if (displayLabel && !label.equals("")) {

+      if (displayLabel && !getLabel().equals("")) {

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

-         labelWidget.setText(label + ":");

-         if (toolTip != null) {

-            labelWidget.setToolTipText(toolTip);

+         labelWidget.setText(getLabel() + ":");

+         if (getToolTip() != null) {

+            labelWidget.setToolTipText(getToolTip());

          }

       }

 

diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xHistory/XHistoryWidget.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xHistory/XHistoryWidget.java
index 43d2685fda1..f1fa04e164e 100644
--- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xHistory/XHistoryWidget.java
+++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xHistory/XHistoryWidget.java
@@ -81,11 +81,11 @@ public class XHistoryWidget extends XWidget implements IActionable {
    @Override

    public void createWidgets(Composite parent, int horizontalSpan) {

       // Create Text Widgets

-      if (displayLabel && !label.equals("")) {

+      if (displayLabel && !getLabel().equals("")) {

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

-         labelWidget.setText(label + ":");

-         if (toolTip != null) {

-            labelWidget.setToolTipText(toolTip);

+         labelWidget.setText(getLabel() + ":");

+         if (getToolTip() != null) {

+            labelWidget.setToolTipText(getToolTip());

          }

       }

 

@@ -244,8 +244,10 @@ public class XHistoryWidget extends XWidget implements IActionable {
 

             try {

                if (loadHistory) {

-                  for(TransactionData transactionData : RevisionManager.getInstance().getTransactionsPerArtifact(artifact, true)){

-                     for(RevisionChange revisionChange : RevisionManager.getInstance().getTransactionChanges(transactionData)){

+                  for (TransactionData transactionData : RevisionManager.getInstance().getTransactionsPerArtifact(

+                        artifact, true)) {

+                     for (RevisionChange revisionChange : RevisionManager.getInstance().getTransactionChanges(

+                           transactionData)) {

                         historyItems.add(new HistoryTransactionItem(transactionData, revisionChange));

                      }

                   }

@@ -258,7 +260,9 @@ public class XHistoryWidget extends XWidget implements IActionable {
                            extraInfoLabel.setText(NO_HISTORY);

                            xHistoryViewer.setInput(historyItems);

                         } else {

-                           String infoLabel = String.format("History: %s on branch: %s", artifact.getDescriptiveName(), artifact.getBranch().getBranchShortName());

+                           String infoLabel =

+                                 String.format("History: %s on branch: %s", artifact.getDescriptiveName(),

+                                       artifact.getBranch().getBranchShortName());

                            extraInfoLabel.setText(infoLabel);

                            xHistoryViewer.setInput(historyItems);

                         }

diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xbargraph/XBarGraphTable.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xbargraph/XBarGraphTable.java
index ac8b72cd509..72f571cd94a 100644
--- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xbargraph/XBarGraphTable.java
+++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xbargraph/XBarGraphTable.java
@@ -57,7 +57,7 @@ public class XBarGraphTable extends XWidget {
    @Override

    public void createWidgets(Composite parent, int horizontalSpan) {

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

-      labelWidget.setText(label + ": ");

+      labelWidget.setText(getLabel() + ": ");

 

       table = new Table(parent, SWT.BORDER);

       table.setHeaderVisible(isHeaderVisible);

diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xchange/XChangeWidget.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xchange/XChangeWidget.java
index de8169477b0..7509985f606 100644
--- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xchange/XChangeWidget.java
+++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xchange/XChangeWidget.java
@@ -90,11 +90,11 @@ public class XChangeWidget extends XWidget implements IActionable {
    @Override

    public void createWidgets(Composite parent, int horizontalSpan) {

       // Create Text Widgets

-      if (displayLabel && !label.equals("")) {

+      if (displayLabel && !getLabel().equals("")) {

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

-         labelWidget.setText(label + ":");

-         if (toolTip != null) {

-            labelWidget.setToolTipText(toolTip);

+         labelWidget.setText(getLabel() + ":");

+         if (getToolTip() != null) {

+            labelWidget.setToolTipText(getToolTip());

          }

       }

 

@@ -425,11 +425,11 @@ public class XChangeWidget extends XWidget implements IActionable {
     * @param showDocOrder

     */

    public void setShowDocumentOrder(boolean showDocOrder) {

-      if(contentProvider != null){

+      if (contentProvider != null) {

          contentProvider.setShowDocOrder(showDocOrder);

          refresh();

       }

-      

+

    }

 

 }

diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/XMergeViewer.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/XMergeViewer.java
index 273ad2c40a5..d2262900aba 100644
--- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/XMergeViewer.java
+++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/XMergeViewer.java
@@ -102,11 +102,11 @@ public class XMergeViewer extends XWidget implements IActionable {
    public void createWidgets(Composite parent, int horizontalSpan) {

 

       // Create Text Widgets

-      if (displayLabel && !label.equals("")) {

+      if (displayLabel && !getLabel().equals("")) {

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

-         labelWidget.setText(label + ":");

-         if (toolTip != null) {

-            labelWidget.setToolTipText(toolTip);

+         labelWidget.setText(getLabel() + ":");

+         if (getToolTip() != null) {

+            labelWidget.setToolTipText(getToolTip());

          }

       }

 

@@ -487,16 +487,6 @@ public class XMergeViewer extends XWidget implements IActionable {
       this.editor = editor;

    }

 

-   @Override

-   public boolean isEditable() {

-      return editable;

-   }

-

-   @Override

-   public void setEditable(boolean editable) {

-      this.editable = editable;

-   }

-

    public void setInputData(final Branch sourceBranch, final Branch destBranch, final TransactionId tranId, final MergeView mergeView, final TransactionId commitTrans, boolean showConflicts) {

       setInputData(sourceBranch, destBranch, tranId, mergeView, commitTrans, "", showConflicts);

    }