From 69b14e912c06ba85d6af9f21f4400f3cc14cf9bb Mon Sep 17 00:00:00 2001
From: Kathy <kruffing@volian.com>
Date: Fri, 5 Apr 2013 11:24:53 +0000
Subject: [PATCH] =?UTF-8?q?B2013-076:=20Fixed=20a=20few=20bugs=20in=20reso?=
 =?UTF-8?q?lving=20transitions=20text=20(sometimes=20leaving=20off=20?=
 =?UTF-8?q?=E2=80=98(=E2=80=98=20or=20=E2=80=98)=E2=80=99)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 PROMS/VEPROMS User Interface/frmVEPROMS.cs            |  2 +-
 PROMS/VEPROMS.CSLA.Library/Extension/TransitionExt.cs | 11 ++++++++---
 PROMS/Volian.Controls.Library/DisplayLibDocs.cs       |  8 ++++++++
 3 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/PROMS/VEPROMS User Interface/frmVEPROMS.cs b/PROMS/VEPROMS User Interface/frmVEPROMS.cs
index c6f660d8..8cfb7ed5 100644
--- a/PROMS/VEPROMS User Interface/frmVEPROMS.cs	
+++ b/PROMS/VEPROMS User Interface/frmVEPROMS.cs	
@@ -1003,7 +1003,7 @@ namespace VEPROMS
 					if (dr == DialogResult.OK && displayLibDocs.LibDocList != null)
 					{
 						displayLibDocs.LibDocListFillIn(tc);
-
+						displayLibDocs.SetSelectedLibDoc();
 					}
 				}
 			}
diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/TransitionExt.cs b/PROMS/VEPROMS.CSLA.Library/Extension/TransitionExt.cs
index ff56396b..069c865e 100644
--- a/PROMS/VEPROMS.CSLA.Library/Extension/TransitionExt.cs
+++ b/PROMS/VEPROMS.CSLA.Library/Extension/TransitionExt.cs
@@ -405,9 +405,14 @@ namespace VEPROMS.CSLA.Library
 			{
 				_Results.Append(Prefix);
 				_Prefix = null;
+			}
+			// If the prefix contains an open paren, we want to add the open paren regardless
+			// of whether there already is text in the resulting string.
+			else if (!HasText && Prefix != null && Prefix.Contains("("))
+			{
+				_Results.Append(Prefix.TrimStart(" ".ToCharArray()));   // since no text in result, trim starting space.
+			}
 		}
-		}
-
 		
 		public string OverridePrefix
 		{
@@ -541,7 +546,7 @@ namespace VEPROMS.CSLA.Library
 				prevToken = token;
 				if (startIndex >= tb._TransFormat.Length) break;
 			}
-			if (startIndex < tb._TransFormat.Length) tb.Append(tb._TransFormat.Substring(startIndex, tb._TransFormat.Length - startIndex - 1));
+			if ((startIndex < tb._TransFormat.Length) && lastAdded) tb.Append(tb._TransFormat.Substring(startIndex, tb._TransFormat.Length - startIndex));
 			return (tb.ToString());		
 		}
 		
diff --git a/PROMS/Volian.Controls.Library/DisplayLibDocs.cs b/PROMS/Volian.Controls.Library/DisplayLibDocs.cs
index 9808c2de..af7abc7f 100644
--- a/PROMS/Volian.Controls.Library/DisplayLibDocs.cs
+++ b/PROMS/Volian.Controls.Library/DisplayLibDocs.cs
@@ -61,6 +61,14 @@ namespace Volian.Controls.Library
 			listBoxUsages.Items.Clear();
             _InitializingLibDocList = false;
 		}
+		public void SetSelectedLibDoc()
+		{
+			if (_SelectedLibDoc >= 0)
+			{
+				if (_SelectedLibDoc > listBoxLibDocs.Items.Count) return;
+				listBoxLibDocs.SelectedIndex = _SelectedLibDoc;
+			}
+		}
 		#endregion
 		#region Events
 		public event DisplayLibDocEvent PrintRequest;