3 files changed, 20 insertions, 9 deletions

diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/vue/VueDiagram.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/vue/VueDiagram.java
index b5bb6739300..99f2a396899 100644
--- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/vue/VueDiagram.java
+++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/vue/VueDiagram.java
@@ -19,9 +19,9 @@ import java.util.regex.Pattern;
  */
 public class VueDiagram {
 
-   private ArrayList<VueLink> links = new ArrayList<VueLink>();
-   private ArrayList<VueNode> vuePages = new ArrayList<VueNode>();
-   private Diagram workflow;
+   private final ArrayList<VueLink> links = new ArrayList<VueLink>();
+   private final ArrayList<VueNode> vuePages = new ArrayList<VueNode>();
+   private final Diagram workflow;
    private static Pattern childPattern =
          Pattern.compile("<child(.*?)>(.*?)</child>", Pattern.DOTALL | Pattern.MULTILINE);
 
@@ -48,15 +48,20 @@ public class VueDiagram {
             VueNode vuePage = new VueNode(matchStr);
             vuePages.add(vuePage);
             workflow.addPage(vuePage.getWorkPage());
-         } else
+         } else {
             throw new IllegalArgumentException("Unhandled xsi:type");
+         }
       }
       for (VueLink link : links) {
          VueNode fromVuePage = getPageFromVueId(link.getFromVueId());
-         if (fromVuePage == null) throw new IllegalArgumentException("Can't retrieve from page");
+         if (fromVuePage == null) {
+            throw new IllegalArgumentException("Can't retrieve fromVuePage with id " + link.getFromVueId());
+         }
          VueNode toVuePage = getPageFromVueId(link.getToVueId());
-         if (toVuePage == null) throw new IllegalArgumentException(
-               "Can't retrieve to page " + link.getToVueId() + " from page " + link.getFromVueId() + " named \"" + fromVuePage.getWorkPage().getName() + "\"");
+         if (toVuePage == null) {
+            throw new IllegalArgumentException(
+                  "Can't retrieve toVuePage " + link.getToVueId() + " fromVuePage " + link.getFromVueId() + " named \"" + fromVuePage.getWorkPage().getName() + "\"");
+         }
          fromVuePage.getWorkPage().addToPage(toVuePage.getWorkPage(), link.getName().equals("return"));
          toVuePage.getWorkPage().addFromPage(fromVuePage.getWorkPage());
          if (link.isMultiDirectional()) {
diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/vue/VueLink.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/vue/VueLink.java
index dcbe7499e11..b1d9eff7ee8 100644
--- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/vue/VueLink.java
+++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/vue/VueLink.java
@@ -25,6 +25,11 @@ public class VueLink {
    private String fromVueId;
    private String toVueId;
 
+   @Override
+   public String toString() {
+      return "[" + vueId + " - " + name + " - " + fromVueId + " --> " + toVueId + " - " + (multiDirectional ? "multiDirectional]" : "singleDirection]");
+   }
+
    /**
     * 
     */
diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/vue/VueNode.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/vue/VueNode.java
index a6d826e1501..0017c4aa529 100644
--- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/vue/VueNode.java
+++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/vue/VueNode.java
@@ -23,7 +23,7 @@ public class VueNode {
 
    private final String vueXml;
    private String vueId;
-   private DiagramNode workPage;
+   private final DiagramNode workPage;
    public static enum Shape {
       ellipse, rectangle, hexagon;
       public static Shape getShape(String shape) {
@@ -35,8 +35,9 @@ public class VueNode {
    };
    private Shape shape;
 
+   @Override
    public String toString() {
-      return workPage.getPageType() + ": " + workPage.getName();
+      return "[" + workPage.getPageType() + " (" + vueId + ") " + workPage.getName() + "]";
    }
 
    /**