PROMS/VEPROMS User Interface/dlgExportImport.cs

@@ -155,9 +155,7 @@ namespace VEPROMS
 			if (MyFolder != null)
 			{
 				sfd.FileName = string.Format("{0}-{1}.expx", Database.ActiveDatabase, MyFolder.Name);
-				if (sfd.ShowDialog(this) == DialogResult.OK)
+                if (sfd.ShowDialog(this) == DialogResult.OK && sfd.FileName != string.Empty)
-				{
-					if (sfd.FileName != string.Empty)
                 {
                     txtExport.Text = sfd.FileName;
                     if (File.Exists(txtExport.Text))
@@ -166,7 +164,6 @@ namespace VEPROMS
                     MyExpxZipFile.Save();
                 }
             }
-			}
 			else if (MyProcedure != null)
 			{
 				txtExport.Enabled = true;
@@ -1330,11 +1327,7 @@ namespace VEPROMS
 					txtImport.Text = ofd.FileName;
 				return;
 			}
-			if (MyFolder != null)
+            if (MyFolder != null && ofd.ShowDialog(this) == DialogResult.OK && ofd.FileName != string.Empty)
-			{
-				if (ofd.ShowDialog(this) == DialogResult.OK)
-				{
-					if (ofd.FileName != string.Empty)
             {
                 Old2NewItem = new Dictionary<int, int>();
                 Old2NewContent = new Dictionary<int, int>();
@@ -1397,8 +1390,6 @@ namespace VEPROMS
                     File.Delete(fn);
                 }
             }
-				}
-			}
             if (MyDocVersion != null)
 			{
 				ofd.Filter = "PROMS Procedure Export Files|*.pxml";
@@ -2223,16 +2214,9 @@ namespace VEPROMS
 			xe.Attributes.SetNamedItem(AddAttribute(xe.OwnerDocument, "rodbid", ri.RODbID.ToString()));
 			if (_ExportBothConvertedandNot) SetROLocation(ref xe, ri.ROID, ri.RODbID);
 
-			//rousage audits
-			ExportROUsageAudits(xe, ri);
 			xn.AppendChild(xe);
 		}
 
-		private void ExportROUsageAudits(XmlElement xe, RoUsageInfo ri)
-		{
-			if (cbxExportAudits.Checked) { };
-		}
-
 		private void ExportPart(XmlElement xn, PartInfo pi, string nodename)
 		{
 			/*
@@ -2309,16 +2293,9 @@ namespace VEPROMS
 			xe.Attributes.SetNamedItem(AddAttribute(xe.OwnerDocument, "dts", ti.DTS.ToString("MM/dd/yyyy HH:mm:ss.fff")));
 			xe.Attributes.SetNamedItem(AddAttribute(xe.OwnerDocument, "userid", ti.UserID.ToString()));
 			
-			//transition audits
-			ExportTransitionAudits(xe, ti);
 			xn.AppendChild(xe);
 		}
 
-		private void ExportTransitionAudits(XmlElement xe, TransitionInfo ti)
-		{
-			if (cbxExportAudits.Checked) { };
-		}
-
 		private void ExportAnnotation(XmlElement xn, AnnotationInfo ai, string nodename)
 		{
 			/*
@@ -2813,15 +2790,11 @@ namespace VEPROMS
 			{
 				// create a list of the RO databases currently in the database
 				List<string> roDbNameList = new List<string>();
-				RODbInfoList rolist = RODbInfoList.Get();
+				using (RODbInfoList rolist = RODbInfoList.Get())
-
-				foreach (RODbInfo rodbinfo in rolist)
                 {
-					if (!roDbNameList.Contains(rodbinfo.ROName))
+                    roDbNameList.AddRange(rolist.Where(rodbinfo => !roDbNameList.Contains(rodbinfo.ROName)).Select(rodbinfo => rodbinfo.ROName));
-						roDbNameList.Add(rodbinfo.ROName);
                 }
 
-				rolist.Dispose();
 				int cnt = 0;
 				string roNameNew = roname;