PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs

@@ -665,12 +665,10 @@ namespace VEPROMS.CSLA.Library
 						{
 							TranFixCount++;
 							itemInfo.MyContent.FixTransitionText(traninfo, itemInfo, "Reason for Change:  Transition to Non-Editable Step");
-							using (Content content = Content.Get(itemInfo.MyContent.ContentID)) //B2024-006 free up content memory when done
+							Content content = Content.Get(itemInfo.MyContent.ContentID);
-							{
+							content.FixTransitionText(traninfo, true);
-								content.FixTransitionText(traninfo, true);
+							content.Save();
-								content.Save();
+						}
-							}
- 						}
 					}
 
 					if (!forceConvertToText)
@@ -684,12 +682,10 @@ namespace VEPROMS.CSLA.Library
 									forceConvertToText = true;
 									TranFixCount++;
 									itemInfo.MyContent.FixTransitionText(traninfo, itemInfo, "Reason for Change:  Transition to External Procedure using Internal Format");
-									using (Content content = Content.Get(itemInfo.MyContent.ContentID)) //B2024-006 free up content memory when done
+									Content content = Content.Get(itemInfo.MyContent.ContentID);
-									{
+									content.FixTransitionText(traninfo, true);
-										content.FixTransitionText(traninfo, true);
+									content.Save();
-										content.Save();
+								}
-									}
- 								}
 							}
 						}
 					}
@@ -705,11 +701,9 @@ namespace VEPROMS.CSLA.Library
 									forceConvertToText = true;
 									TranFixCount++;
 									itemInfo.MyContent.FixTransitionText(traninfo, itemInfo, "Reason for Change:  Transition to Outside Procedure using Internal Format");
-									using (Content content = Content.Get(itemInfo.MyContent.ContentID)) //B2024-006 free up content memory when done
+									Content content = Content.Get(itemInfo.MyContent.ContentID);
-									{
+									content.FixTransitionText(traninfo, true);
-										content.FixTransitionText(traninfo, true);
+									content.Save();
-										content.Save();
-									}
 								}
 							}
 						}
@@ -725,11 +719,9 @@ namespace VEPROMS.CSLA.Library
 						if (newText != oldText || newValue == "?")
 						{
 							TranFixCount++;
-							using (Content content = Content.Get(itemInfo.MyContent.ContentID)) //B2024-006 free up content memory when done
+							Content content = Content.Get(itemInfo.MyContent.ContentID);
-							{
+							content.FixTransitionText(traninfo);
-								content.FixTransitionText(traninfo);
+							content.Save();
-								content.Save();
-							}
 						}
 					}
 				}
@@ -974,26 +966,24 @@ namespace VEPROMS.CSLA.Library
 						{
 							//ShowDifference(oldText, newText); // debug - display in Visual Studio Output window
 							ROFixCount++;
-							using (Content content = Content.Get(itemInfo.MyContent.ContentID)) //B2024-006 free up content memory when done
+							Content content = Content.Get(itemInfo.MyContent.ContentID);
+							if (roval == "?")
 							{
-								if (roval == "?")
+								oldText = content.ConvertROToText(rousage, roval, roch.type, origROFst);
+								using (Item myitem = content.ContentItems[0].MyItem) // so that myitem does not stay in cache  B2016-153
 								{
-									oldText = content.ConvertROToText(rousage, roval, roch.type, origROFst);
+									myitem.DisposeOfContent = false; // don't dispose of the contents may be needed if more than one RO needs processed  - part of B2017-060
-									using (Item myitem = content.ContentItems[0].MyItem) // so that myitem does not stay in cache  B2016-153
+									// B2016-225 (follow through) added more descriptive Annotation Type when RO is converted to text
-									{
+									Annotation.MakeAnnotation(myitem, AnnotationType.GetByNameOrCreate("Link Converted To Text"), "", string.Format("RO value ({0}) converted to text", ItemInfo.ConvertToDisplayText(oldText)), null);
-										myitem.DisposeOfContent = false; // don't dispose of the contents may be needed if more than one RO needs processed  - part of B2017-060
-																		 // B2016-225 (follow through) added more descriptive Annotation Type when RO is converted to text
-										Annotation.MakeAnnotation(myitem, AnnotationType.GetByNameOrCreate("Link Converted To Text"), "", string.Format("RO value ({0}) converted to text", ItemInfo.ConvertToDisplayText(oldText)), null);
-									}
 								}
-								else
-								{
-									content.FixContentText(rousage, roval, roch.type, origROFst);
-								}
-								content.UserID = Volian.Base.Library.VlnSettings.UserID;
-								content.DTS = DateTime.Now;
-								content.Save();
 							}
+							else
+							{
+								content.FixContentText(rousage, roval, roch.type, origROFst);
+							}
+							content.UserID = Volian.Base.Library.VlnSettings.UserID;
+							content.DTS = DateTime.Now;
+							content.Save();
 						}
 					}
 				}