diff --git a/PROMS/VEPROMS User Interface/frmFolderProperties.cs b/PROMS/VEPROMS User Interface/frmFolderProperties.cs index 10c01b2a..9ccdb078 100644 --- a/PROMS/VEPROMS User Interface/frmFolderProperties.cs +++ b/PROMS/VEPROMS User Interface/frmFolderProperties.cs @@ -355,7 +355,7 @@ namespace VEPROMS stg.IsApproved = found.IsApproved; stg.UserID = Volian.Base.Library.VlnSettings.UserID; stg.DTS = DateTime.Now; - stg.Save().Dispose(); + stg.Save(); } } myLocalStageInfoList.Remove(found); @@ -365,7 +365,7 @@ namespace VEPROMS using (Stage stg = si.Get()) { stg.Delete(); - stg.Save().Dispose(); + stg.Save(); } } } @@ -373,7 +373,7 @@ namespace VEPROMS foreach (LocalStageInfo lsi in myLocalStageInfoList) { using (Stage stg = Stage.MakeStage(lsi.Name, "", lsi.IsApproved, DateTime.Now, Volian.Base.Library.VlnSettings.UserID)) - stg.Save().Dispose(); + stg.Save(); } StageInfoList.Refresh(); } @@ -396,7 +396,7 @@ namespace VEPROMS at.Name = found.Name; at.UserID = Volian.Base.Library.VlnSettings.UserID; at.DTS = DateTime.Now; - at.Save().Dispose(); + at.Save(); } } myLocalAnnotationTypeInfoList.Remove(found); @@ -406,7 +406,7 @@ namespace VEPROMS using (AnnotationType at = ai.Get()) { at.Delete(); - at.Save().Dispose(); + at.Save(); } } @@ -414,7 +414,7 @@ namespace VEPROMS foreach (LocalAnnotationTypeInfo lai in myLocalAnnotationTypeInfoList) { using (AnnotationType at = AnnotationType.New(lai.Name, "", DateTime.Now, Volian.Base.Library.VlnSettings.UserID)) - at.Save().Dispose(); + at.Save(); } AnnotationTypeInfoList.Refresh(); } diff --git a/PROMS/VEPROMS User Interface/frmSectionProperties.cs b/PROMS/VEPROMS User Interface/frmSectionProperties.cs index 9e80bec1..af2d2e8d 100644 --- a/PROMS/VEPROMS User Interface/frmSectionProperties.cs +++ b/PROMS/VEPROMS User Interface/frmSectionProperties.cs @@ -140,12 +140,14 @@ namespace VEPROMS } if (isWordSect && !sectinfo.HasWordContent && !sectinfo.IsAutoTOCSection) { - Content cont = Content.Get(sectinfo.MyContent.ContentID); - Byte[] tstbyte = System.Text.Encoding.Default.GetBytes(""); - Document doc = Document.MakeDocument(null, tstbyte, null, null); // tstbyte, null, null, null); - Entry entry = cont.MyEntry; - entry.MyDocument = Document.Get(doc.DocID); - cont.Save().Dispose(); + using (Content cont = Content.Get(sectinfo.MyContent.ContentID)) + { + Byte[] tstbyte = System.Text.Encoding.Default.GetBytes(""); + Document doc = Document.MakeDocument(null, tstbyte, null, null); // tstbyte, null, null, null); + Entry entry = cont.MyEntry; + entry.MyDocument = Document.Get(doc.DocID); + cont.Save(); + } } } private void btnSectPropCancel_Click(object sender, EventArgs e) diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs b/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs index e895d3a9..e2116841 100644 --- a/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs +++ b/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs @@ -152,7 +152,7 @@ namespace VEPROMS.CSLA.Library using (Item newNextItem = newNextInfo.Get()) { newNextItem.MyPrevious = this; - newNextItem.Save().Dispose(); + newNextItem.Save(); } } @@ -182,7 +182,7 @@ namespace VEPROMS.CSLA.Library } else parentItem.MyContent.ContentParts[(int)partType].MyItem = this; - parentItem.Save().Dispose(); + parentItem.Save(); } } else if (parentInfoDV != null) // Moving Item (Procedure) within DocVersion @@ -191,13 +191,13 @@ namespace VEPROMS.CSLA.Library { ItemInfo firstinfo = parentInfoDV.FirstChild(); parentItemDV.MyItem = wasfirstchild?parentInfoDV.Procedures[1].Get():this; - parentItemDV.Save().Dispose(); + parentItemDV.Save(); if (!wasfirstchild && firstinfo != null) { using (Item firstchild = firstinfo.Get()) { firstchild.MyPrevious = this; - firstchild.Save().Dispose(); + firstchild.Save(); } } } @@ -237,7 +237,7 @@ namespace VEPROMS.CSLA.Library using (Item nextItem = nextInfo.Get()) { nextItem.MyPrevious = itm;// Aim the next item back at the new item. - nextItem.Save().Dispose(); + nextItem.Save(); } } if (fromitem == null) @@ -252,15 +252,15 @@ namespace VEPROMS.CSLA.Library using (Item firstchild = firstinfo.Get()) { parentItem.MyContent.ContentParts[(int)partType].MyItem = itm;// First update the parent to point to the new first child - parentItem.Save().Dispose(); + parentItem.Save(); firstchild.MyPrevious = itm;// Aim the old first child to point to the new first child. - firstchild.Save().Dispose(); + firstchild.Save(); } } else { parentItem.MyContent.ContentParts.Add((int)partType, itm);// update the parent to point to the new first child - parentItem.Save().Dispose(); + parentItem.Save(); } } } @@ -270,13 +270,13 @@ namespace VEPROMS.CSLA.Library { ItemInfo firstinfo = parentInfoDV.FirstChild(); parentItemDV.MyItem = itm;// First update the parent to point to the new first child - parentItemDV.Save().Dispose(); + parentItemDV.Save(); if (firstinfo != null) { using (Item firstchild = firstinfo.Get()) { firstchild.MyPrevious = itm;// Aim the old first child to point to the new first child. - firstchild.Save().Dispose(); + firstchild.Save(); } } } diff --git a/PROMS/VEPROMS.CSLA.Library/Generated/Annotation.cs b/PROMS/VEPROMS.CSLA.Library/Generated/Annotation.cs index 0f8ade7e..d06b07e0 100644 --- a/PROMS/VEPROMS.CSLA.Library/Generated/Annotation.cs +++ b/PROMS/VEPROMS.CSLA.Library/Generated/Annotation.cs @@ -555,11 +555,7 @@ namespace VEPROMS.CSLA.Library { Annotation tmp = Annotation.New(myItem, myAnnotationType, rtfText, searchText, config, dts, userID); if (tmp.IsSavable) - { - Annotation tmp2 = tmp; - tmp = tmp2.Save(); - tmp2.Dispose(); - } + tmp = tmp.Save(); else { Csla.Validation.BrokenRulesCollection brc = tmp.ValidationRules.GetBrokenRules(); @@ -585,11 +581,7 @@ namespace VEPROMS.CSLA.Library { Annotation tmp = Annotation.New(myItem, myAnnotationType, rtfText, searchText, config); if (tmp.IsSavable) - { - Annotation tmp2 = tmp; - tmp = tmp2.Save(); - tmp2.Dispose(); - } + tmp = tmp.Save(); else { Csla.Validation.BrokenRulesCollection brc = tmp.ValidationRules.GetBrokenRules(); diff --git a/PROMS/VEPROMS.CSLA.Library/Generated/AnnotationAudit.cs b/PROMS/VEPROMS.CSLA.Library/Generated/AnnotationAudit.cs index 19c48ac3..9e9d8750 100644 --- a/PROMS/VEPROMS.CSLA.Library/Generated/AnnotationAudit.cs +++ b/PROMS/VEPROMS.CSLA.Library/Generated/AnnotationAudit.cs @@ -543,11 +543,7 @@ namespace VEPROMS.CSLA.Library { AnnotationAudit tmp = AnnotationAudit.New(annotationID, itemID, typeID, rtfText, searchText, config, dts, userID, deleteStatus); if (tmp.IsSavable) - { - AnnotationAudit tmp2 = tmp; - tmp = tmp2.Save(); - tmp2.Dispose(); - } + tmp = tmp.Save(); else { Csla.Validation.BrokenRulesCollection brc = tmp.ValidationRules.GetBrokenRules(); diff --git a/PROMS/VEPROMS.CSLA.Library/Generated/AnnotationInfo.cs b/PROMS/VEPROMS.CSLA.Library/Generated/AnnotationInfo.cs index 6ac80721..d978f04b 100644 --- a/PROMS/VEPROMS.CSLA.Library/Generated/AnnotationInfo.cs +++ b/PROMS/VEPROMS.CSLA.Library/Generated/AnnotationInfo.cs @@ -300,22 +300,6 @@ namespace VEPROMS.CSLA.Library _DTS = tmp.DTS; _UserID = tmp.UserID; _AnnotationInfoExtension.Refresh(this); -//RHM Removed 20090724 - Duplicates function of code above. -// - Dispose caused error when a new step was added. -// - Resequence of transitions did not work properly. -// if(_MyItem != null) -// { -// _MyItem.Dispose();// Dispose related value -// _MyItem = null;// Reset related value -// } -//RHM Removed 20090724 - Duplicates function of code above. -// - Dispose caused error when a new step was added. -// - Resequence of transitions did not work properly. -// if(_MyAnnotationType != null) -// { -// _MyAnnotationType.Dispose();// Dispose related value -// _MyAnnotationType = null;// Reset related value -// } OnChange();// raise an event } public static void Refresh(AnnotationTypeAnnotation tmp) @@ -341,22 +325,6 @@ namespace VEPROMS.CSLA.Library _DTS = tmp.DTS; _UserID = tmp.UserID; _AnnotationInfoExtension.Refresh(this); -//RHM Removed 20090724 - Duplicates function of code above. -// - Dispose caused error when a new step was added. -// - Resequence of transitions did not work properly. -// if(_MyItem != null) -// { -// _MyItem.Dispose();// Dispose related value -// _MyItem = null;// Reset related value -// } -//RHM Removed 20090724 - Duplicates function of code above. -// - Dispose caused error when a new step was added. -// - Resequence of transitions did not work properly. -// if(_MyAnnotationType != null) -// { -// _MyAnnotationType.Dispose();// Dispose related value -// _MyAnnotationType = null;// Reset related value -// } OnChange();// raise an event } public static void Refresh(ItemAnnotation tmp) @@ -382,22 +350,6 @@ namespace VEPROMS.CSLA.Library _DTS = tmp.DTS; _UserID = tmp.UserID; _AnnotationInfoExtension.Refresh(this); -//RHM Removed 20090724 - Duplicates function of code above. -// - Dispose caused error when a new step was added. -// - Resequence of transitions did not work properly. -// if(_MyItem != null) -// { -// _MyItem.Dispose();// Dispose related value -// _MyItem = null;// Reset related value -// } -//RHM Removed 20090724 - Duplicates function of code above. -// - Dispose caused error when a new step was added. -// - Resequence of transitions did not work properly. -// if(_MyAnnotationType != null) -// { -// _MyAnnotationType.Dispose();// Dispose related value -// _MyAnnotationType = null;// Reset related value -// } OnChange();// raise an event } public static AnnotationInfo Get(int annotationID) diff --git a/PROMS/VEPROMS.CSLA.Library/Generated/AnnotationType.cs b/PROMS/VEPROMS.CSLA.Library/Generated/AnnotationType.cs index 1a2f23b2..4368fbde 100644 --- a/PROMS/VEPROMS.CSLA.Library/Generated/AnnotationType.cs +++ b/PROMS/VEPROMS.CSLA.Library/Generated/AnnotationType.cs @@ -519,11 +519,7 @@ namespace VEPROMS.CSLA.Library { AnnotationType tmp = AnnotationType.New(name, config, dts, userID); if (tmp.IsSavable) - { - AnnotationType tmp2 = tmp; - tmp = tmp2.Save(); - tmp2.Dispose(); - } + tmp = tmp.Save(); else { Csla.Validation.BrokenRulesCollection brc = tmp.ValidationRules.GetBrokenRules(); @@ -546,11 +542,7 @@ namespace VEPROMS.CSLA.Library { AnnotationType tmp = AnnotationType.New(name, config); if (tmp.IsSavable) - { - AnnotationType tmp2 = tmp; - tmp = tmp2.Save(); - tmp2.Dispose(); - } + tmp = tmp.Save(); else { Csla.Validation.BrokenRulesCollection brc = tmp.ValidationRules.GetBrokenRules(); diff --git a/PROMS/VEPROMS.CSLA.Library/Generated/Assignment.cs b/PROMS/VEPROMS.CSLA.Library/Generated/Assignment.cs index 32b11e51..3d7075a7 100644 --- a/PROMS/VEPROMS.CSLA.Library/Generated/Assignment.cs +++ b/PROMS/VEPROMS.CSLA.Library/Generated/Assignment.cs @@ -619,11 +619,7 @@ namespace VEPROMS.CSLA.Library { Assignment tmp = Assignment.New(myGroup, myRole, myFolder, startDate, endDate, dts, usrID); if (tmp.IsSavable) - { - Assignment tmp2 = tmp; - tmp = tmp2.Save(); - tmp2.Dispose(); - } + tmp = tmp.Save(); else { Csla.Validation.BrokenRulesCollection brc = tmp.ValidationRules.GetBrokenRules(); @@ -648,11 +644,7 @@ namespace VEPROMS.CSLA.Library { Assignment tmp = Assignment.New(myGroup, myRole, myFolder, endDate); if (tmp.IsSavable) - { - Assignment tmp2 = tmp; - tmp = tmp2.Save(); - tmp2.Dispose(); - } + tmp = tmp.Save(); else { Csla.Validation.BrokenRulesCollection brc = tmp.ValidationRules.GetBrokenRules(); diff --git a/PROMS/VEPROMS.CSLA.Library/Generated/AssignmentInfo.cs b/PROMS/VEPROMS.CSLA.Library/Generated/AssignmentInfo.cs index f97291b2..de532ac9 100644 --- a/PROMS/VEPROMS.CSLA.Library/Generated/AssignmentInfo.cs +++ b/PROMS/VEPROMS.CSLA.Library/Generated/AssignmentInfo.cs @@ -305,30 +305,6 @@ namespace VEPROMS.CSLA.Library _DTS = tmp.DTS; _UsrID = tmp.UsrID; _AssignmentInfoExtension.Refresh(this); -//RHM Removed 20090724 - Duplicates function of code above. -// - Dispose caused error when a new step was added. -// - Resequence of transitions did not work properly. -// if(_MyGroup != null) -// { -// _MyGroup.Dispose();// Dispose related value -// _MyGroup = null;// Reset related value -// } -//RHM Removed 20090724 - Duplicates function of code above. -// - Dispose caused error when a new step was added. -// - Resequence of transitions did not work properly. -// if(_MyRole != null) -// { -// _MyRole.Dispose();// Dispose related value -// _MyRole = null;// Reset related value -// } -//RHM Removed 20090724 - Duplicates function of code above. -// - Dispose caused error when a new step was added. -// - Resequence of transitions did not work properly. -// if(_MyFolder != null) -// { -// _MyFolder.Dispose();// Dispose related value -// _MyFolder = null;// Reset related value -// } OnChange();// raise an event } public static void Refresh(FolderAssignment tmp) @@ -360,30 +336,6 @@ namespace VEPROMS.CSLA.Library _DTS = tmp.DTS; _UsrID = tmp.UsrID; _AssignmentInfoExtension.Refresh(this); -//RHM Removed 20090724 - Duplicates function of code above. -// - Dispose caused error when a new step was added. -// - Resequence of transitions did not work properly. -// if(_MyGroup != null) -// { -// _MyGroup.Dispose();// Dispose related value -// _MyGroup = null;// Reset related value -// } -//RHM Removed 20090724 - Duplicates function of code above. -// - Dispose caused error when a new step was added. -// - Resequence of transitions did not work properly. -// if(_MyRole != null) -// { -// _MyRole.Dispose();// Dispose related value -// _MyRole = null;// Reset related value -// } -//RHM Removed 20090724 - Duplicates function of code above. -// - Dispose caused error when a new step was added. -// - Resequence of transitions did not work properly. -// if(_MyFolder != null) -// { -// _MyFolder.Dispose();// Dispose related value -// _MyFolder = null;// Reset related value -// } OnChange();// raise an event } public static void Refresh(GroupAssignment tmp) @@ -415,30 +367,6 @@ namespace VEPROMS.CSLA.Library _DTS = tmp.DTS; _UsrID = tmp.UsrID; _AssignmentInfoExtension.Refresh(this); -//RHM Removed 20090724 - Duplicates function of code above. -// - Dispose caused error when a new step was added. -// - Resequence of transitions did not work properly. -// if(_MyGroup != null) -// { -// _MyGroup.Dispose();// Dispose related value -// _MyGroup = null;// Reset related value -// } -//RHM Removed 20090724 - Duplicates function of code above. -// - Dispose caused error when a new step was added. -// - Resequence of transitions did not work properly. -// if(_MyRole != null) -// { -// _MyRole.Dispose();// Dispose related value -// _MyRole = null;// Reset related value -// } -//RHM Removed 20090724 - Duplicates function of code above. -// - Dispose caused error when a new step was added. -// - Resequence of transitions did not work properly. -// if(_MyFolder != null) -// { -// _MyFolder.Dispose();// Dispose related value -// _MyFolder = null;// Reset related value -// } OnChange();// raise an event } public static void Refresh(RoleAssignment tmp) @@ -470,30 +398,6 @@ namespace VEPROMS.CSLA.Library _DTS = tmp.DTS; _UsrID = tmp.UsrID; _AssignmentInfoExtension.Refresh(this); -//RHM Removed 20090724 - Duplicates function of code above. -// - Dispose caused error when a new step was added. -// - Resequence of transitions did not work properly. -// if(_MyGroup != null) -// { -// _MyGroup.Dispose();// Dispose related value -// _MyGroup = null;// Reset related value -// } -//RHM Removed 20090724 - Duplicates function of code above. -// - Dispose caused error when a new step was added. -// - Resequence of transitions did not work properly. -// if(_MyRole != null) -// { -// _MyRole.Dispose();// Dispose related value -// _MyRole = null;// Reset related value -// } -//RHM Removed 20090724 - Duplicates function of code above. -// - Dispose caused error when a new step was added. -// - Resequence of transitions did not work properly. -// if(_MyFolder != null) -// { -// _MyFolder.Dispose();// Dispose related value -// _MyFolder = null;// Reset related value -// } OnChange();// raise an event } public static AssignmentInfo Get(int aid) diff --git a/PROMS/VEPROMS.CSLA.Library/Generated/Association.cs b/PROMS/VEPROMS.CSLA.Library/Generated/Association.cs index 205a5467..c036382e 100644 --- a/PROMS/VEPROMS.CSLA.Library/Generated/Association.cs +++ b/PROMS/VEPROMS.CSLA.Library/Generated/Association.cs @@ -523,11 +523,7 @@ namespace VEPROMS.CSLA.Library { Association tmp = Association.New(myDocVersion, myROFst, config, dts, userID); if (tmp.IsSavable) - { - Association tmp2 = tmp; - tmp = tmp2.Save(); - tmp2.Dispose(); - } + tmp = tmp.Save(); else { Csla.Validation.BrokenRulesCollection brc = tmp.ValidationRules.GetBrokenRules(); @@ -551,11 +547,7 @@ namespace VEPROMS.CSLA.Library { Association tmp = Association.New(myDocVersion, myROFst, config); if (tmp.IsSavable) - { - Association tmp2 = tmp; - tmp = tmp2.Save(); - tmp2.Dispose(); - } + tmp = tmp.Save(); else { Csla.Validation.BrokenRulesCollection brc = tmp.ValidationRules.GetBrokenRules(); diff --git a/PROMS/VEPROMS.CSLA.Library/Generated/AssociationInfo.cs b/PROMS/VEPROMS.CSLA.Library/Generated/AssociationInfo.cs index 11cdda1b..d6fee2f5 100644 --- a/PROMS/VEPROMS.CSLA.Library/Generated/AssociationInfo.cs +++ b/PROMS/VEPROMS.CSLA.Library/Generated/AssociationInfo.cs @@ -266,22 +266,6 @@ namespace VEPROMS.CSLA.Library _DTS = tmp.DTS; _UserID = tmp.UserID; _AssociationInfoExtension.Refresh(this); -//RHM Removed 20090724 - Duplicates function of code above. -// - Dispose caused error when a new step was added. -// - Resequence of transitions did not work properly. -// if(_MyDocVersion != null) -// { -// _MyDocVersion.Dispose();// Dispose related value -// _MyDocVersion = null;// Reset related value -// } -//RHM Removed 20090724 - Duplicates function of code above. -// - Dispose caused error when a new step was added. -// - Resequence of transitions did not work properly. -// if(_MyROFst != null) -// { -// _MyROFst.Dispose();// Dispose related value -// _MyROFst = null;// Reset related value -// } OnChange();// raise an event } public static void Refresh(DocVersionAssociation tmp) @@ -305,22 +289,6 @@ namespace VEPROMS.CSLA.Library _DTS = tmp.DTS; _UserID = tmp.UserID; _AssociationInfoExtension.Refresh(this); -//RHM Removed 20090724 - Duplicates function of code above. -// - Dispose caused error when a new step was added. -// - Resequence of transitions did not work properly. -// if(_MyDocVersion != null) -// { -// _MyDocVersion.Dispose();// Dispose related value -// _MyDocVersion = null;// Reset related value -// } -//RHM Removed 20090724 - Duplicates function of code above. -// - Dispose caused error when a new step was added. -// - Resequence of transitions did not work properly. -// if(_MyROFst != null) -// { -// _MyROFst.Dispose();// Dispose related value -// _MyROFst = null;// Reset related value -// } OnChange();// raise an event } public static void Refresh(ROFstAssociation tmp) @@ -344,22 +312,6 @@ namespace VEPROMS.CSLA.Library _DTS = tmp.DTS; _UserID = tmp.UserID; _AssociationInfoExtension.Refresh(this); -//RHM Removed 20090724 - Duplicates function of code above. -// - Dispose caused error when a new step was added. -// - Resequence of transitions did not work properly. -// if(_MyDocVersion != null) -// { -// _MyDocVersion.Dispose();// Dispose related value -// _MyDocVersion = null;// Reset related value -// } -//RHM Removed 20090724 - Duplicates function of code above. -// - Dispose caused error when a new step was added. -// - Resequence of transitions did not work properly. -// if(_MyROFst != null) -// { -// _MyROFst.Dispose();// Dispose related value -// _MyROFst = null;// Reset related value -// } OnChange();// raise an event } public static AssociationInfo Get(int associationID) diff --git a/PROMS/VEPROMS.CSLA.Library/Generated/Check.cs b/PROMS/VEPROMS.CSLA.Library/Generated/Check.cs index 5a6d7c14..f0b5e79a 100644 --- a/PROMS/VEPROMS.CSLA.Library/Generated/Check.cs +++ b/PROMS/VEPROMS.CSLA.Library/Generated/Check.cs @@ -501,11 +501,7 @@ namespace VEPROMS.CSLA.Library { Check tmp = Check.New(myRevision, myStage, consistencyChecks, dts, userID); if (tmp.IsSavable) - { - Check tmp2 = tmp; - tmp = tmp2.Save(); - tmp2.Dispose(); - } + tmp = tmp.Save(); else { Csla.Validation.BrokenRulesCollection brc = tmp.ValidationRules.GetBrokenRules(); @@ -529,11 +525,7 @@ namespace VEPROMS.CSLA.Library { Check tmp = Check.New(myRevision, myStage, consistencyChecks); if (tmp.IsSavable) - { - Check tmp2 = tmp; - tmp = tmp2.Save(); - tmp2.Dispose(); - } + tmp = tmp.Save(); else { Csla.Validation.BrokenRulesCollection brc = tmp.ValidationRules.GetBrokenRules(); diff --git a/PROMS/VEPROMS.CSLA.Library/Generated/CheckInfo.cs b/PROMS/VEPROMS.CSLA.Library/Generated/CheckInfo.cs index de49e974..3ed56be9 100644 --- a/PROMS/VEPROMS.CSLA.Library/Generated/CheckInfo.cs +++ b/PROMS/VEPROMS.CSLA.Library/Generated/CheckInfo.cs @@ -265,22 +265,6 @@ namespace VEPROMS.CSLA.Library _DTS = tmp.DTS; _UserID = tmp.UserID; _CheckInfoExtension.Refresh(this); -//RHM Removed 20090724 - Duplicates function of code above. -// - Dispose caused error when a new step was added. -// - Resequence of transitions did not work properly. -// if(_MyRevision != null) -// { -// _MyRevision.Dispose();// Dispose related value -// _MyRevision = null;// Reset related value -// } -//RHM Removed 20090724 - Duplicates function of code above. -// - Dispose caused error when a new step was added. -// - Resequence of transitions did not work properly. -// if(_MyStage != null) -// { -// _MyStage.Dispose();// Dispose related value -// _MyStage = null;// Reset related value -// } OnChange();// raise an event } public static void Refresh(RevisionCheck tmp) @@ -304,22 +288,6 @@ namespace VEPROMS.CSLA.Library _DTS = tmp.DTS; _UserID = tmp.UserID; _CheckInfoExtension.Refresh(this); -//RHM Removed 20090724 - Duplicates function of code above. -// - Dispose caused error when a new step was added. -// - Resequence of transitions did not work properly. -// if(_MyRevision != null) -// { -// _MyRevision.Dispose();// Dispose related value -// _MyRevision = null;// Reset related value -// } -//RHM Removed 20090724 - Duplicates function of code above. -// - Dispose caused error when a new step was added. -// - Resequence of transitions did not work properly. -// if(_MyStage != null) -// { -// _MyStage.Dispose();// Dispose related value -// _MyStage = null;// Reset related value -// } OnChange();// raise an event } public static void Refresh(StageCheck tmp) @@ -343,22 +311,6 @@ namespace VEPROMS.CSLA.Library _DTS = tmp.DTS; _UserID = tmp.UserID; _CheckInfoExtension.Refresh(this); -//RHM Removed 20090724 - Duplicates function of code above. -// - Dispose caused error when a new step was added. -// - Resequence of transitions did not work properly. -// if(_MyRevision != null) -// { -// _MyRevision.Dispose();// Dispose related value -// _MyRevision = null;// Reset related value -// } -//RHM Removed 20090724 - Duplicates function of code above. -// - Dispose caused error when a new step was added. -// - Resequence of transitions did not work properly. -// if(_MyStage != null) -// { -// _MyStage.Dispose();// Dispose related value -// _MyStage = null;// Reset related value -// } OnChange();// raise an event } public static CheckInfo Get(int checkID) diff --git a/PROMS/VEPROMS.CSLA.Library/Generated/Connection.cs b/PROMS/VEPROMS.CSLA.Library/Generated/Connection.cs index ed11c54c..bd64f7c1 100644 --- a/PROMS/VEPROMS.CSLA.Library/Generated/Connection.cs +++ b/PROMS/VEPROMS.CSLA.Library/Generated/Connection.cs @@ -591,11 +591,7 @@ namespace VEPROMS.CSLA.Library { Connection tmp = Connection.New(name, title, connectionString, serverType, config, dts, usrID); if (tmp.IsSavable) - { - Connection tmp2 = tmp; - tmp = tmp2.Save(); - tmp2.Dispose(); - } + tmp = tmp.Save(); else { Csla.Validation.BrokenRulesCollection brc = tmp.ValidationRules.GetBrokenRules(); @@ -620,11 +616,7 @@ namespace VEPROMS.CSLA.Library { Connection tmp = Connection.New(name, title, connectionString, config); if (tmp.IsSavable) - { - Connection tmp2 = tmp; - tmp = tmp2.Save(); - tmp2.Dispose(); - } + tmp = tmp.Save(); else { Csla.Validation.BrokenRulesCollection brc = tmp.ValidationRules.GetBrokenRules(); diff --git a/PROMS/VEPROMS.CSLA.Library/Generated/Content.cs b/PROMS/VEPROMS.CSLA.Library/Generated/Content.cs index 874c7e36..6767f926 100644 --- a/PROMS/VEPROMS.CSLA.Library/Generated/Content.cs +++ b/PROMS/VEPROMS.CSLA.Library/Generated/Content.cs @@ -969,11 +969,7 @@ namespace VEPROMS.CSLA.Library { Content tmp = Content.New(number, text, type, myFormat, config, dts, userID); if (tmp.IsSavable) - { - Content tmp2 = tmp; - tmp = tmp2.Save(); - tmp2.Dispose(); - } + tmp = tmp.Save(); else { Csla.Validation.BrokenRulesCollection brc = tmp.ValidationRules.GetBrokenRules(); @@ -999,11 +995,7 @@ namespace VEPROMS.CSLA.Library { Content tmp = Content.New(number, text, type, myFormat, config); if (tmp.IsSavable) - { - Content tmp2 = tmp; - tmp = tmp2.Save(); - tmp2.Dispose(); - } + tmp = tmp.Save(); else { Csla.Validation.BrokenRulesCollection brc = tmp.ValidationRules.GetBrokenRules(); diff --git a/PROMS/VEPROMS.CSLA.Library/Generated/ContentAudit.cs b/PROMS/VEPROMS.CSLA.Library/Generated/ContentAudit.cs index 7638c610..e0993b42 100644 --- a/PROMS/VEPROMS.CSLA.Library/Generated/ContentAudit.cs +++ b/PROMS/VEPROMS.CSLA.Library/Generated/ContentAudit.cs @@ -541,11 +541,7 @@ namespace VEPROMS.CSLA.Library { ContentAudit tmp = ContentAudit.New(contentID, number, text, type, formatID, config, dts, userID, deleteStatus); if (tmp.IsSavable) - { - ContentAudit tmp2 = tmp; - tmp = tmp2.Save(); - tmp2.Dispose(); - } + tmp = tmp.Save(); else { Csla.Validation.BrokenRulesCollection brc = tmp.ValidationRules.GetBrokenRules(); diff --git a/PROMS/VEPROMS.CSLA.Library/Generated/ContentInfo.cs b/PROMS/VEPROMS.CSLA.Library/Generated/ContentInfo.cs index e0c8d162..93368b27 100644 --- a/PROMS/VEPROMS.CSLA.Library/Generated/ContentInfo.cs +++ b/PROMS/VEPROMS.CSLA.Library/Generated/ContentInfo.cs @@ -627,50 +627,9 @@ namespace VEPROMS.CSLA.Library _DTS = tmp.DTS; _UserID = tmp.UserID; _ContentInfoExtension.Refresh(this); -//RHM Removed 20090724 - Duplicates function of code above. -// - Dispose caused error when a new step was added. -// - Resequence of transitions did not work properly. -// if(_MyFormat != null) -// { -// _MyFormat.Dispose();// Dispose related value -// _MyFormat = null;// Reset related value -// } -//RHM Removed 20090724 - Duplicates function of code above. -// - Dispose caused error when a new step was added. -// - Resequence of transitions did not work properly. -// if(_MyEntry != null) -// { -// _MyEntry.Dispose();// Dispose related value -// _MyEntry = null;// Reset related value -// } _ContentEntryCount = -1;// Reset Count -//RHM Removed 20090724 - Duplicates function of code above. -// - Dispose caused error when a new step was added. -// - Resequence of transitions did not work properly. -// if(_MyGrid != null) -// { -// _MyGrid.Dispose();// Dispose related value -// _MyGrid = null;// Reset related value -// } - if (_MyGrid != null && tmp.MyGrid != null) _MyGrid.ResetContent(tmp.MyGrid); _ContentGridCount = -1;// Reset Count -//RHM Removed 20090724 - Duplicates function of code above. -// - Dispose caused error when a new step was added. -// - Resequence of transitions did not work properly. -// if(_MyImage != null) -// { -// _MyImage.Dispose();// Dispose related value -// _MyImage = null;// Reset related value -// } _ContentImageCount = -1;// Reset Count -//RHM Removed 20090724 - Duplicates function of code above. -// - Dispose caused error when a new step was added. -// - Resequence of transitions did not work properly. -// if(_MyZContent != null) -// { -// _MyZContent.Dispose();// Dispose related value -// _MyZContent = null;// Reset related value -// } _ContentZContentCount = -1;// Reset Count OnChange(this);// raise an event only for this instance } @@ -691,49 +650,9 @@ namespace VEPROMS.CSLA.Library _DTS = tmp.DTS; _UserID = tmp.UserID; _ContentInfoExtension.Refresh(this); -//RHM Removed 20090724 - Duplicates function of code above. -// - Dispose caused error when a new step was added. -// - Resequence of transitions did not work properly. -// if(_MyFormat != null) -// { -// _MyFormat.Dispose();// Dispose related value -// _MyFormat = null;// Reset related value -// } -//RHM Removed 20090724 - Duplicates function of code above. -// - Dispose caused error when a new step was added. -// - Resequence of transitions did not work properly. -// if(_MyEntry != null) -// { -// _MyEntry.Dispose();// Dispose related value -// _MyEntry = null;// Reset related value -// } _ContentEntryCount = -1;// Reset Count -//RHM Removed 20090724 - Duplicates function of code above. -// - Dispose caused error when a new step was added. -// - Resequence of transitions did not work properly. -// if(_MyGrid != null) -// { -// _MyGrid.Dispose();// Dispose related value -// _MyGrid = null;// Reset related value -// } _ContentGridCount = -1;// Reset Count -//RHM Removed 20090724 - Duplicates function of code above. -// - Dispose caused error when a new step was added. -// - Resequence of transitions did not work properly. -// if(_MyImage != null) -// { -// _MyImage.Dispose();// Dispose related value -// _MyImage = null;// Reset related value -// } _ContentImageCount = -1;// Reset Count -//RHM Removed 20090724 - Duplicates function of code above. -// - Dispose caused error when a new step was added. -// - Resequence of transitions did not work properly. -// if(_MyZContent != null) -// { -// _MyZContent.Dispose();// Dispose related value -// _MyZContent = null;// Reset related value -// } _ContentZContentCount = -1;// Reset Count OnChange(this);// raise an event only for this instance } diff --git a/PROMS/VEPROMS.CSLA.Library/Generated/DROUsage.cs b/PROMS/VEPROMS.CSLA.Library/Generated/DROUsage.cs index cac0d87e..b0bb0985 100644 --- a/PROMS/VEPROMS.CSLA.Library/Generated/DROUsage.cs +++ b/PROMS/VEPROMS.CSLA.Library/Generated/DROUsage.cs @@ -530,11 +530,7 @@ namespace VEPROMS.CSLA.Library { DROUsage tmp = DROUsage.New(myDocument, roid, config, dts, userID, myRODb); if (tmp.IsSavable) - { - DROUsage tmp2 = tmp; - tmp = tmp2.Save(); - tmp2.Dispose(); - } + tmp = tmp.Save(); else { Csla.Validation.BrokenRulesCollection brc = tmp.ValidationRules.GetBrokenRules(); @@ -559,11 +555,7 @@ namespace VEPROMS.CSLA.Library { DROUsage tmp = DROUsage.New(myDocument, roid, config, myRODb); if (tmp.IsSavable) - { - DROUsage tmp2 = tmp; - tmp = tmp2.Save(); - tmp2.Dispose(); - } + tmp = tmp.Save(); else { Csla.Validation.BrokenRulesCollection brc = tmp.ValidationRules.GetBrokenRules(); diff --git a/PROMS/VEPROMS.CSLA.Library/Generated/DROUsageInfo.cs b/PROMS/VEPROMS.CSLA.Library/Generated/DROUsageInfo.cs index 85c96dd5..3fcb0e2c 100644 --- a/PROMS/VEPROMS.CSLA.Library/Generated/DROUsageInfo.cs +++ b/PROMS/VEPROMS.CSLA.Library/Generated/DROUsageInfo.cs @@ -276,22 +276,6 @@ namespace VEPROMS.CSLA.Library _MyRODb = null; // Reset list so that the next line gets a new list if (MyRODb != null) MyRODb.RefreshRODbDROUsages(); // Update List for new value _DROUsageInfoExtension.Refresh(this); -//RHM Removed 20090724 - Duplicates function of code above. -// - Dispose caused error when a new step was added. -// - Resequence of transitions did not work properly. -// if(_MyDocument != null) -// { -// _MyDocument.Dispose();// Dispose related value -// _MyDocument = null;// Reset related value -// } -//RHM Removed 20090724 - Duplicates function of code above. -// - Dispose caused error when a new step was added. -// - Resequence of transitions did not work properly. -// if(_MyRODb != null) -// { -// _MyRODb.Dispose();// Dispose related value -// _MyRODb = null;// Reset related value -// } OnChange();// raise an event } public static void Refresh(DocumentDROUsage tmp) @@ -316,22 +300,6 @@ namespace VEPROMS.CSLA.Library _MyRODb = null; // Reset list so that the next line gets a new list if (MyRODb != null) MyRODb.RefreshRODbDROUsages(); // Update List for new value _DROUsageInfoExtension.Refresh(this); -//RHM Removed 20090724 - Duplicates function of code above. -// - Dispose caused error when a new step was added. -// - Resequence of transitions did not work properly. -// if(_MyDocument != null) -// { -// _MyDocument.Dispose();// Dispose related value -// _MyDocument = null;// Reset related value -// } -//RHM Removed 20090724 - Duplicates function of code above. -// - Dispose caused error when a new step was added. -// - Resequence of transitions did not work properly. -// if(_MyRODb != null) -// { -// _MyRODb.Dispose();// Dispose related value -// _MyRODb = null;// Reset related value -// } OnChange();// raise an event } public static void Refresh(RODbDROUsage tmp) @@ -356,22 +324,6 @@ namespace VEPROMS.CSLA.Library _DTS = tmp.DTS; _UserID = tmp.UserID; _DROUsageInfoExtension.Refresh(this); -//RHM Removed 20090724 - Duplicates function of code above. -// - Dispose caused error when a new step was added. -// - Resequence of transitions did not work properly. -// if(_MyDocument != null) -// { -// _MyDocument.Dispose();// Dispose related value -// _MyDocument = null;// Reset related value -// } -//RHM Removed 20090724 - Duplicates function of code above. -// - Dispose caused error when a new step was added. -// - Resequence of transitions did not work properly. -// if(_MyRODb != null) -// { -// _MyRODb.Dispose();// Dispose related value -// _MyRODb = null;// Reset related value -// } OnChange();// raise an event } public static DROUsageInfo Get(int dROUsageID) diff --git a/PROMS/VEPROMS.CSLA.Library/Generated/Detail.cs b/PROMS/VEPROMS.CSLA.Library/Generated/Detail.cs index d337d783..3e7f9904 100644 --- a/PROMS/VEPROMS.CSLA.Library/Generated/Detail.cs +++ b/PROMS/VEPROMS.CSLA.Library/Generated/Detail.cs @@ -506,11 +506,7 @@ namespace VEPROMS.CSLA.Library { Detail tmp = Detail.New(myContent, itemType, text, config, dts, userID); if (tmp.IsSavable) - { - Detail tmp2 = tmp; - tmp = tmp2.Save(); - tmp2.Dispose(); - } + tmp = tmp.Save(); else { Csla.Validation.BrokenRulesCollection brc = tmp.ValidationRules.GetBrokenRules(); @@ -535,11 +531,7 @@ namespace VEPROMS.CSLA.Library { Detail tmp = Detail.New(myContent, itemType, text, config); if (tmp.IsSavable) - { - Detail tmp2 = tmp; - tmp = tmp2.Save(); - tmp2.Dispose(); - } + tmp = tmp.Save(); else { Csla.Validation.BrokenRulesCollection brc = tmp.ValidationRules.GetBrokenRules(); diff --git a/PROMS/VEPROMS.CSLA.Library/Generated/DetailInfo.cs b/PROMS/VEPROMS.CSLA.Library/Generated/DetailInfo.cs index 7efd7c4d..d3a5ae0e 100644 --- a/PROMS/VEPROMS.CSLA.Library/Generated/DetailInfo.cs +++ b/PROMS/VEPROMS.CSLA.Library/Generated/DetailInfo.cs @@ -258,14 +258,6 @@ namespace VEPROMS.CSLA.Library _DTS = tmp.DTS; _UserID = tmp.UserID; _DetailInfoExtension.Refresh(this); -//RHM Removed 20090724 - Duplicates function of code above. -// - Dispose caused error when a new step was added. -// - Resequence of transitions did not work properly. -// if(_MyContent != null) -// { -// _MyContent.Dispose();// Dispose related value -// _MyContent = null;// Reset related value -// } OnChange();// raise an event } public static void Refresh(ContentDetail tmp) @@ -284,14 +276,6 @@ namespace VEPROMS.CSLA.Library _DTS = tmp.DTS; _UserID = tmp.UserID; _DetailInfoExtension.Refresh(this); -//RHM Removed 20090724 - Duplicates function of code above. -// - Dispose caused error when a new step was added. -// - Resequence of transitions did not work properly. -// if(_MyContent != null) -// { -// _MyContent.Dispose();// Dispose related value -// _MyContent = null;// Reset related value -// } OnChange();// raise an event } public static DetailInfo Get(int detailID) diff --git a/PROMS/VEPROMS.CSLA.Library/Generated/DocVersion.cs b/PROMS/VEPROMS.CSLA.Library/Generated/DocVersion.cs index c43d5336..cda0188e 100644 --- a/PROMS/VEPROMS.CSLA.Library/Generated/DocVersion.cs +++ b/PROMS/VEPROMS.CSLA.Library/Generated/DocVersion.cs @@ -675,11 +675,7 @@ namespace VEPROMS.CSLA.Library { DocVersion tmp = DocVersion.New(myFolder, versionType, name, title, myItem, myFormat, config, dts, userID); if (tmp.IsSavable) - { - DocVersion tmp2 = tmp; - tmp = tmp2.Save(); - tmp2.Dispose(); - } + tmp = tmp.Save(); else { Csla.Validation.BrokenRulesCollection brc = tmp.ValidationRules.GetBrokenRules(); @@ -706,11 +702,7 @@ namespace VEPROMS.CSLA.Library { DocVersion tmp = DocVersion.New(myFolder, name, title, myItem, myFormat, config); if (tmp.IsSavable) - { - DocVersion tmp2 = tmp; - tmp = tmp2.Save(); - tmp2.Dispose(); - } + tmp = tmp.Save(); else { Csla.Validation.BrokenRulesCollection brc = tmp.ValidationRules.GetBrokenRules(); diff --git a/PROMS/VEPROMS.CSLA.Library/Generated/DocVersionInfo.cs b/PROMS/VEPROMS.CSLA.Library/Generated/DocVersionInfo.cs index 04e5bd41..a5153c69 100644 --- a/PROMS/VEPROMS.CSLA.Library/Generated/DocVersionInfo.cs +++ b/PROMS/VEPROMS.CSLA.Library/Generated/DocVersionInfo.cs @@ -368,30 +368,6 @@ namespace VEPROMS.CSLA.Library _DTS = tmp.DTS; _UserID = tmp.UserID; _DocVersionInfoExtension.Refresh(this); -//RHM Removed 20090724 - Duplicates function of code above. -// - Dispose caused error when a new step was added. -// - Resequence of transitions did not work properly. -// if(_MyFolder != null) -// { -// _MyFolder.Dispose();// Dispose related value -// _MyFolder = null;// Reset related value -// } -//RHM Removed 20090724 - Duplicates function of code above. -// - Dispose caused error when a new step was added. -// - Resequence of transitions did not work properly. -// if(_MyItem != null) -// { -// _MyItem.Dispose();// Dispose related value -// _MyItem = null;// Reset related value -// } -//RHM Removed 20090724 - Duplicates function of code above. -// - Dispose caused error when a new step was added. -// - Resequence of transitions did not work properly. -// if(_MyFormat != null) -// { -// _MyFormat.Dispose();// Dispose related value -// _MyFormat = null;// Reset related value -// } OnChange();// raise an event } public static void Refresh(FolderDocVersion tmp) @@ -425,30 +401,6 @@ namespace VEPROMS.CSLA.Library _DTS = tmp.DTS; _UserID = tmp.UserID; _DocVersionInfoExtension.Refresh(this); -//RHM Removed 20090724 - Duplicates function of code above. -// - Dispose caused error when a new step was added. -// - Resequence of transitions did not work properly. -// if(_MyFolder != null) -// { -// _MyFolder.Dispose();// Dispose related value -// _MyFolder = null;// Reset related value -// } -//RHM Removed 20090724 - Duplicates function of code above. -// - Dispose caused error when a new step was added. -// - Resequence of transitions did not work properly. -// if(_MyItem != null) -// { -// _MyItem.Dispose();// Dispose related value -// _MyItem = null;// Reset related value -// } -//RHM Removed 20090724 - Duplicates function of code above. -// - Dispose caused error when a new step was added. -// - Resequence of transitions did not work properly. -// if(_MyFormat != null) -// { -// _MyFormat.Dispose();// Dispose related value -// _MyFormat = null;// Reset related value -// } OnChange();// raise an event } public static void Refresh(FormatDocVersion tmp) @@ -482,30 +434,6 @@ namespace VEPROMS.CSLA.Library _DTS = tmp.DTS; _UserID = tmp.UserID; _DocVersionInfoExtension.Refresh(this); -//RHM Removed 20090724 - Duplicates function of code above. -// - Dispose caused error when a new step was added. -// - Resequence of transitions did not work properly. -// if(_MyFolder != null) -// { -// _MyFolder.Dispose();// Dispose related value -// _MyFolder = null;// Reset related value -// } -//RHM Removed 20090724 - Duplicates function of code above. -// - Dispose caused error when a new step was added. -// - Resequence of transitions did not work properly. -// if(_MyItem != null) -// { -// _MyItem.Dispose();// Dispose related value -// _MyItem = null;// Reset related value -// } -//RHM Removed 20090724 - Duplicates function of code above. -// - Dispose caused error when a new step was added. -// - Resequence of transitions did not work properly. -// if(_MyFormat != null) -// { -// _MyFormat.Dispose();// Dispose related value -// _MyFormat = null;// Reset related value -// } OnChange();// raise an event } public static void Refresh(ItemDocVersion tmp) @@ -539,30 +467,6 @@ namespace VEPROMS.CSLA.Library _DTS = tmp.DTS; _UserID = tmp.UserID; _DocVersionInfoExtension.Refresh(this); -//RHM Removed 20090724 - Duplicates function of code above. -// - Dispose caused error when a new step was added. -// - Resequence of transitions did not work properly. -// if(_MyFolder != null) -// { -// _MyFolder.Dispose();// Dispose related value -// _MyFolder = null;// Reset related value -// } -//RHM Removed 20090724 - Duplicates function of code above. -// - Dispose caused error when a new step was added. -// - Resequence of transitions did not work properly. -// if(_MyItem != null) -// { -// _MyItem.Dispose();// Dispose related value -// _MyItem = null;// Reset related value -// } -//RHM Removed 20090724 - Duplicates function of code above. -// - Dispose caused error when a new step was added. -// - Resequence of transitions did not work properly. -// if(_MyFormat != null) -// { -// _MyFormat.Dispose();// Dispose related value -// _MyFormat = null;// Reset related value -// } OnChange();// raise an event } public static DocVersionInfo Get(int versionID) diff --git a/PROMS/VEPROMS.CSLA.Library/Generated/Document.cs b/PROMS/VEPROMS.CSLA.Library/Generated/Document.cs index 74e1b4a6..9a099f1c 100644 --- a/PROMS/VEPROMS.CSLA.Library/Generated/Document.cs +++ b/PROMS/VEPROMS.CSLA.Library/Generated/Document.cs @@ -678,11 +678,7 @@ namespace VEPROMS.CSLA.Library { Document tmp = Document.New(libTitle, docContent, docAscii, config, dts, userID, fileExtension); if (tmp.IsSavable) - { - Document tmp2 = tmp; - tmp = tmp2.Save(); - tmp2.Dispose(); - } + tmp = tmp.Save(); else { Csla.Validation.BrokenRulesCollection brc = tmp.ValidationRules.GetBrokenRules(); @@ -707,11 +703,7 @@ namespace VEPROMS.CSLA.Library { Document tmp = Document.New(libTitle, docContent, docAscii, config); if (tmp.IsSavable) - { - Document tmp2 = tmp; - tmp = tmp2.Save(); - tmp2.Dispose(); - } + tmp = tmp.Save(); else { Csla.Validation.BrokenRulesCollection brc = tmp.ValidationRules.GetBrokenRules(); diff --git a/PROMS/VEPROMS.CSLA.Library/Generated/DocumentAudit.cs b/PROMS/VEPROMS.CSLA.Library/Generated/DocumentAudit.cs index 0c6c8e02..f1cbe765 100644 --- a/PROMS/VEPROMS.CSLA.Library/Generated/DocumentAudit.cs +++ b/PROMS/VEPROMS.CSLA.Library/Generated/DocumentAudit.cs @@ -571,11 +571,7 @@ namespace VEPROMS.CSLA.Library { DocumentAudit tmp = DocumentAudit.New(docID, libTitle, docContent, docAscii, config, dts, userID, fileExtension, docPdf, deleteStatus); if (tmp.IsSavable) - { - DocumentAudit tmp2 = tmp; - tmp = tmp2.Save(); - tmp2.Dispose(); - } + tmp = tmp.Save(); else { Csla.Validation.BrokenRulesCollection brc = tmp.ValidationRules.GetBrokenRules(); diff --git a/PROMS/VEPROMS.CSLA.Library/Generated/Entry.cs b/PROMS/VEPROMS.CSLA.Library/Generated/Entry.cs index 532c95d5..1828d6d6 100644 --- a/PROMS/VEPROMS.CSLA.Library/Generated/Entry.cs +++ b/PROMS/VEPROMS.CSLA.Library/Generated/Entry.cs @@ -426,11 +426,7 @@ namespace VEPROMS.CSLA.Library { Entry tmp = Entry.New(myContent, myDocument); if (tmp.IsSavable) - { - Entry tmp2 = tmp; - tmp = tmp2.Save(); - tmp2.Dispose(); - } + tmp = tmp.Save(); else { Csla.Validation.BrokenRulesCollection brc = tmp.ValidationRules.GetBrokenRules(); @@ -455,11 +451,7 @@ namespace VEPROMS.CSLA.Library { Entry tmp = Entry.New(myContent, myDocument, dts, userID); if (tmp.IsSavable) - { - Entry tmp2 = tmp; - tmp = tmp2.Save(); - tmp2.Dispose(); - } + tmp = tmp.Save(); else { Csla.Validation.BrokenRulesCollection brc = tmp.ValidationRules.GetBrokenRules(); diff --git a/PROMS/VEPROMS.CSLA.Library/Generated/EntryAudit.cs b/PROMS/VEPROMS.CSLA.Library/Generated/EntryAudit.cs index c077ef00..e66482f7 100644 --- a/PROMS/VEPROMS.CSLA.Library/Generated/EntryAudit.cs +++ b/PROMS/VEPROMS.CSLA.Library/Generated/EntryAudit.cs @@ -428,11 +428,7 @@ namespace VEPROMS.CSLA.Library { EntryAudit tmp = EntryAudit.New(contentID, docID, dts, userID, deleteStatus); if (tmp.IsSavable) - { - EntryAudit tmp2 = tmp; - tmp = tmp2.Save(); - tmp2.Dispose(); - } + tmp = tmp.Save(); else { Csla.Validation.BrokenRulesCollection brc = tmp.ValidationRules.GetBrokenRules(); diff --git a/PROMS/VEPROMS.CSLA.Library/Generated/EntryInfo.cs b/PROMS/VEPROMS.CSLA.Library/Generated/EntryInfo.cs index 5d8e65c7..b07d62b9 100644 --- a/PROMS/VEPROMS.CSLA.Library/Generated/EntryInfo.cs +++ b/PROMS/VEPROMS.CSLA.Library/Generated/EntryInfo.cs @@ -238,22 +238,6 @@ namespace VEPROMS.CSLA.Library _DTS = tmp.DTS; _UserID = tmp.UserID; _EntryInfoExtension.Refresh(this); -//RHM Removed 20090724 - Duplicates function of code above. -// - Dispose caused error when a new step was added. -// - Resequence of transitions did not work properly. -// if(_MyContent != null) -// { -// _MyContent.Dispose();// Dispose related value -// _MyContent = null;// Reset related value -// } -//RHM Removed 20090724 - Duplicates function of code above. -// - Dispose caused error when a new step was added. -// - Resequence of transitions did not work properly. -// if(_MyDocument != null) -// { -// _MyDocument.Dispose();// Dispose related value -// _MyDocument = null;// Reset related value -// } OnChange();// raise an event } public static void Refresh(DocumentEntry tmp) @@ -269,22 +253,6 @@ namespace VEPROMS.CSLA.Library _DTS = tmp.DTS; _UserID = tmp.UserID; _EntryInfoExtension.Refresh(this); -//RHM Removed 20090724 - Duplicates function of code above. -// - Dispose caused error when a new step was added. -// - Resequence of transitions did not work properly. -// if(_MyContent != null) -// { -// _MyContent.Dispose();// Dispose related value -// _MyContent = null;// Reset related value -// } -//RHM Removed 20090724 - Duplicates function of code above. -// - Dispose caused error when a new step was added. -// - Resequence of transitions did not work properly. -// if(_MyDocument != null) -// { -// _MyDocument.Dispose();// Dispose related value -// _MyDocument = null;// Reset related value -// } OnChange();// raise an event } public static EntryInfo Get(int contentID) diff --git a/PROMS/VEPROMS.CSLA.Library/Generated/Figure.cs b/PROMS/VEPROMS.CSLA.Library/Generated/Figure.cs index 828d91d5..b32aa775 100644 --- a/PROMS/VEPROMS.CSLA.Library/Generated/Figure.cs +++ b/PROMS/VEPROMS.CSLA.Library/Generated/Figure.cs @@ -523,11 +523,7 @@ namespace VEPROMS.CSLA.Library { Figure tmp = Figure.New(myROFst, myROImage, config, dts, userID); if (tmp.IsSavable) - { - Figure tmp2 = tmp; - tmp = tmp2.Save(); - tmp2.Dispose(); - } + tmp = tmp.Save(); else { Csla.Validation.BrokenRulesCollection brc = tmp.ValidationRules.GetBrokenRules(); @@ -551,11 +547,7 @@ namespace VEPROMS.CSLA.Library { Figure tmp = Figure.New(myROFst, myROImage, config); if (tmp.IsSavable) - { - Figure tmp2 = tmp; - tmp = tmp2.Save(); - tmp2.Dispose(); - } + tmp = tmp.Save(); else { Csla.Validation.BrokenRulesCollection brc = tmp.ValidationRules.GetBrokenRules(); diff --git a/PROMS/VEPROMS.CSLA.Library/Generated/FigureInfo.cs b/PROMS/VEPROMS.CSLA.Library/Generated/FigureInfo.cs index 79f30c85..939cd841 100644 --- a/PROMS/VEPROMS.CSLA.Library/Generated/FigureInfo.cs +++ b/PROMS/VEPROMS.CSLA.Library/Generated/FigureInfo.cs @@ -265,22 +265,6 @@ namespace VEPROMS.CSLA.Library _DTS = tmp.DTS; _UserID = tmp.UserID; _FigureInfoExtension.Refresh(this); -//RHM Removed 20090724 - Duplicates function of code above. -// - Dispose caused error when a new step was added. -// - Resequence of transitions did not work properly. -// if(_MyROFst != null) -// { -// _MyROFst.Dispose();// Dispose related value -// _MyROFst = null;// Reset related value -// } -//RHM Removed 20090724 - Duplicates function of code above. -// - Dispose caused error when a new step was added. -// - Resequence of transitions did not work properly. -// if(_MyROImage != null) -// { -// _MyROImage.Dispose();// Dispose related value -// _MyROImage = null;// Reset related value -// } OnChange();// raise an event } public static void Refresh(ROFstFigure tmp) @@ -304,22 +288,6 @@ namespace VEPROMS.CSLA.Library _DTS = tmp.DTS; _UserID = tmp.UserID; _FigureInfoExtension.Refresh(this); -//RHM Removed 20090724 - Duplicates function of code above. -// - Dispose caused error when a new step was added. -// - Resequence of transitions did not work properly. -// if(_MyROFst != null) -// { -// _MyROFst.Dispose();// Dispose related value -// _MyROFst = null;// Reset related value -// } -//RHM Removed 20090724 - Duplicates function of code above. -// - Dispose caused error when a new step was added. -// - Resequence of transitions did not work properly. -// if(_MyROImage != null) -// { -// _MyROImage.Dispose();// Dispose related value -// _MyROImage = null;// Reset related value -// } OnChange();// raise an event } public static void Refresh(ROImageFigure tmp) @@ -343,22 +311,6 @@ namespace VEPROMS.CSLA.Library _DTS = tmp.DTS; _UserID = tmp.UserID; _FigureInfoExtension.Refresh(this); -//RHM Removed 20090724 - Duplicates function of code above. -// - Dispose caused error when a new step was added. -// - Resequence of transitions did not work properly. -// if(_MyROFst != null) -// { -// _MyROFst.Dispose();// Dispose related value -// _MyROFst = null;// Reset related value -// } -//RHM Removed 20090724 - Duplicates function of code above. -// - Dispose caused error when a new step was added. -// - Resequence of transitions did not work properly. -// if(_MyROImage != null) -// { -// _MyROImage.Dispose();// Dispose related value -// _MyROImage = null;// Reset related value -// } OnChange();// raise an event } public static FigureInfo Get(int figureID) diff --git a/PROMS/VEPROMS.CSLA.Library/Generated/Folder.cs b/PROMS/VEPROMS.CSLA.Library/Generated/Folder.cs index 76a0fb16..b4fa8283 100644 --- a/PROMS/VEPROMS.CSLA.Library/Generated/Folder.cs +++ b/PROMS/VEPROMS.CSLA.Library/Generated/Folder.cs @@ -820,11 +820,7 @@ namespace VEPROMS.CSLA.Library { Folder tmp = Folder.New(myParent, myConnection, name, title, shortName, myFormat, manualOrder, config, dts, usrID); if (tmp.IsSavable) - { - Folder tmp2 = tmp; - tmp = tmp2.Save(); - tmp2.Dispose(); - } + tmp = tmp.Save(); else { Csla.Validation.BrokenRulesCollection brc = tmp.ValidationRules.GetBrokenRules(); @@ -853,11 +849,7 @@ namespace VEPROMS.CSLA.Library { Folder tmp = Folder.New(myParent, myConnection, name, title, shortName, myFormat, manualOrder, config); if (tmp.IsSavable) - { - Folder tmp2 = tmp; - tmp = tmp2.Save(); - tmp2.Dispose(); - } + tmp = tmp.Save(); else { Csla.Validation.BrokenRulesCollection brc = tmp.ValidationRules.GetBrokenRules(); diff --git a/PROMS/VEPROMS.CSLA.Library/Generated/FolderInfo.cs b/PROMS/VEPROMS.CSLA.Library/Generated/FolderInfo.cs index a4497b17..f758914b 100644 --- a/PROMS/VEPROMS.CSLA.Library/Generated/FolderInfo.cs +++ b/PROMS/VEPROMS.CSLA.Library/Generated/FolderInfo.cs @@ -452,30 +452,6 @@ namespace VEPROMS.CSLA.Library _DTS = tmp.DTS; _UsrID = tmp.UsrID; _FolderInfoExtension.Refresh(this); -//RHM Removed 20090724 - Duplicates function of code above. -// - Dispose caused error when a new step was added. -// - Resequence of transitions did not work properly. -// if(_MyParent != null) -// { -// _MyParent.Dispose();// Dispose related value -// _MyParent = null;// Reset related value -// } -//RHM Removed 20090724 - Duplicates function of code above. -// - Dispose caused error when a new step was added. -// - Resequence of transitions did not work properly. -// if(_MyConnection != null) -// { -// _MyConnection.Dispose();// Dispose related value -// _MyConnection = null;// Reset related value -// } -//RHM Removed 20090724 - Duplicates function of code above. -// - Dispose caused error when a new step was added. -// - Resequence of transitions did not work properly. -// if(_MyFormat != null) -// { -// _MyFormat.Dispose();// Dispose related value -// _MyFormat = null;// Reset related value -// } OnChange();// raise an event } public static void Refresh(ConnectionFolder tmp) @@ -510,30 +486,6 @@ namespace VEPROMS.CSLA.Library _DTS = tmp.DTS; _UsrID = tmp.UsrID; _FolderInfoExtension.Refresh(this); -//RHM Removed 20090724 - Duplicates function of code above. -// - Dispose caused error when a new step was added. -// - Resequence of transitions did not work properly. -// if(_MyParent != null) -// { -// _MyParent.Dispose();// Dispose related value -// _MyParent = null;// Reset related value -// } -//RHM Removed 20090724 - Duplicates function of code above. -// - Dispose caused error when a new step was added. -// - Resequence of transitions did not work properly. -// if(_MyConnection != null) -// { -// _MyConnection.Dispose();// Dispose related value -// _MyConnection = null;// Reset related value -// } -//RHM Removed 20090724 - Duplicates function of code above. -// - Dispose caused error when a new step was added. -// - Resequence of transitions did not work properly. -// if(_MyFormat != null) -// { -// _MyFormat.Dispose();// Dispose related value -// _MyFormat = null;// Reset related value -// } OnChange();// raise an event } public static void Refresh(FormatFolder tmp) @@ -568,30 +520,6 @@ namespace VEPROMS.CSLA.Library _DTS = tmp.DTS; _UsrID = tmp.UsrID; _FolderInfoExtension.Refresh(this); -//RHM Removed 20090724 - Duplicates function of code above. -// - Dispose caused error when a new step was added. -// - Resequence of transitions did not work properly. -// if(_MyParent != null) -// { -// _MyParent.Dispose();// Dispose related value -// _MyParent = null;// Reset related value -// } -//RHM Removed 20090724 - Duplicates function of code above. -// - Dispose caused error when a new step was added. -// - Resequence of transitions did not work properly. -// if(_MyConnection != null) -// { -// _MyConnection.Dispose();// Dispose related value -// _MyConnection = null;// Reset related value -// } -//RHM Removed 20090724 - Duplicates function of code above. -// - Dispose caused error when a new step was added. -// - Resequence of transitions did not work properly. -// if(_MyFormat != null) -// { -// _MyFormat.Dispose();// Dispose related value -// _MyFormat = null;// Reset related value -// } OnChange();// raise an event } public static FolderInfo Get(int folderID) diff --git a/PROMS/VEPROMS.CSLA.Library/Generated/Format.cs b/PROMS/VEPROMS.CSLA.Library/Generated/Format.cs index e7da3d71..5fcc96c2 100644 --- a/PROMS/VEPROMS.CSLA.Library/Generated/Format.cs +++ b/PROMS/VEPROMS.CSLA.Library/Generated/Format.cs @@ -763,11 +763,7 @@ namespace VEPROMS.CSLA.Library { Format tmp = Format.New(myParent, name, description, data, genMac, dts, userID); if (tmp.IsSavable) - { - Format tmp2 = tmp; - tmp = tmp2.Save(); - tmp2.Dispose(); - } + tmp = tmp.Save(); else { Csla.Validation.BrokenRulesCollection brc = tmp.ValidationRules.GetBrokenRules(); @@ -793,11 +789,7 @@ namespace VEPROMS.CSLA.Library { Format tmp = Format.New(myParent, name, description, data, genMac); if (tmp.IsSavable) - { - Format tmp2 = tmp; - tmp = tmp2.Save(); - tmp2.Dispose(); - } + tmp = tmp.Save(); else { Csla.Validation.BrokenRulesCollection brc = tmp.ValidationRules.GetBrokenRules(); diff --git a/PROMS/VEPROMS.CSLA.Library/Generated/FormatInfo.cs b/PROMS/VEPROMS.CSLA.Library/Generated/FormatInfo.cs index 00645bc5..62e25aea 100644 --- a/PROMS/VEPROMS.CSLA.Library/Generated/FormatInfo.cs +++ b/PROMS/VEPROMS.CSLA.Library/Generated/FormatInfo.cs @@ -421,14 +421,6 @@ namespace VEPROMS.CSLA.Library _DTS = tmp.DTS; _UserID = tmp.UserID; _FormatInfoExtension.Refresh(this); -//RHM Removed 20090724 - Duplicates function of code above. -// - Dispose caused error when a new step was added. -// - Resequence of transitions did not work properly. -// if(_MyParent != null) -// { -// _MyParent.Dispose();// Dispose related value -// _MyParent = null;// Reset related value -// } OnChange();// raise an event } public static FormatInfo Get(int formatID) diff --git a/PROMS/VEPROMS.CSLA.Library/Generated/Grid.cs b/PROMS/VEPROMS.CSLA.Library/Generated/Grid.cs index 0eb427a5..fda28c96 100644 --- a/PROMS/VEPROMS.CSLA.Library/Generated/Grid.cs +++ b/PROMS/VEPROMS.CSLA.Library/Generated/Grid.cs @@ -432,11 +432,7 @@ namespace VEPROMS.CSLA.Library { Grid tmp = Grid.New(myContent, data, config, dts, userID); if (tmp.IsSavable) - { - Grid tmp2 = tmp; - tmp = tmp2.Save(); - tmp2.Dispose(); - } + tmp = tmp.Save(); else { Csla.Validation.BrokenRulesCollection brc = tmp.ValidationRules.GetBrokenRules(); @@ -460,11 +456,7 @@ namespace VEPROMS.CSLA.Library { Grid tmp = Grid.New(myContent, data, config); if (tmp.IsSavable) - { - Grid tmp2 = tmp; - tmp = tmp2.Save(); - tmp2.Dispose(); - } + tmp = tmp.Save(); else { Csla.Validation.BrokenRulesCollection brc = tmp.ValidationRules.GetBrokenRules(); diff --git a/PROMS/VEPROMS.CSLA.Library/Generated/GridAudit.cs b/PROMS/VEPROMS.CSLA.Library/Generated/GridAudit.cs index d9997f9b..765e15ed 100644 --- a/PROMS/VEPROMS.CSLA.Library/Generated/GridAudit.cs +++ b/PROMS/VEPROMS.CSLA.Library/Generated/GridAudit.cs @@ -494,11 +494,7 @@ namespace VEPROMS.CSLA.Library { GridAudit tmp = GridAudit.New(contentID, data, config, dts, userID, deleteStatus, contentAuditID); if (tmp.IsSavable) - { - GridAudit tmp2 = tmp; - tmp = tmp2.Save(); - tmp2.Dispose(); - } + tmp = tmp.Save(); else { Csla.Validation.BrokenRulesCollection brc = tmp.ValidationRules.GetBrokenRules(); @@ -525,11 +521,7 @@ namespace VEPROMS.CSLA.Library { GridAudit tmp = GridAudit.New(contentID, data, config, dts, userID, deleteStatus); if (tmp.IsSavable) - { - GridAudit tmp2 = tmp; - tmp = tmp2.Save(); - tmp2.Dispose(); - } + tmp = tmp.Save(); else { Csla.Validation.BrokenRulesCollection brc = tmp.ValidationRules.GetBrokenRules(); diff --git a/PROMS/VEPROMS.CSLA.Library/Generated/GridInfo.cs b/PROMS/VEPROMS.CSLA.Library/Generated/GridInfo.cs index e2fa6f82..515d7d0c 100644 --- a/PROMS/VEPROMS.CSLA.Library/Generated/GridInfo.cs +++ b/PROMS/VEPROMS.CSLA.Library/Generated/GridInfo.cs @@ -227,14 +227,6 @@ namespace VEPROMS.CSLA.Library _DTS = tmp.DTS; _UserID = tmp.UserID; _GridInfoExtension.Refresh(this); -//RHM Removed 20090724 - Duplicates function of code above. -// - Dispose caused error when a new step was added. -// - Resequence of transitions did not work properly. -// if(_MyContent != null) -// { -// _MyContent.Dispose();// Dispose related value -// _MyContent = null;// Reset related value -// } OnChange();// raise an event } public static GridInfo Get(int contentID) diff --git a/PROMS/VEPROMS.CSLA.Library/Generated/Group.cs b/PROMS/VEPROMS.CSLA.Library/Generated/Group.cs index 7f610e63..de16ee03 100644 --- a/PROMS/VEPROMS.CSLA.Library/Generated/Group.cs +++ b/PROMS/VEPROMS.CSLA.Library/Generated/Group.cs @@ -594,11 +594,7 @@ namespace VEPROMS.CSLA.Library { Group tmp = Group.New(groupName, groupType, config, dts, usrID); if (tmp.IsSavable) - { - Group tmp2 = tmp; - tmp = tmp2.Save(); - tmp2.Dispose(); - } + tmp = tmp.Save(); else { Csla.Validation.BrokenRulesCollection brc = tmp.ValidationRules.GetBrokenRules(); @@ -622,11 +618,7 @@ namespace VEPROMS.CSLA.Library { Group tmp = Group.New(groupName, groupType, config); if (tmp.IsSavable) - { - Group tmp2 = tmp; - tmp = tmp2.Save(); - tmp2.Dispose(); - } + tmp = tmp.Save(); else { Csla.Validation.BrokenRulesCollection brc = tmp.ValidationRules.GetBrokenRules(); diff --git a/PROMS/VEPROMS.CSLA.Library/Generated/Image.cs b/PROMS/VEPROMS.CSLA.Library/Generated/Image.cs index acbb5a3a..73b81776 100644 --- a/PROMS/VEPROMS.CSLA.Library/Generated/Image.cs +++ b/PROMS/VEPROMS.CSLA.Library/Generated/Image.cs @@ -482,11 +482,7 @@ namespace VEPROMS.CSLA.Library { Image tmp = Image.New(myContent, imageType, fileName, data, config, dts, userID); if (tmp.IsSavable) - { - Image tmp2 = tmp; - tmp = tmp2.Save(); - tmp2.Dispose(); - } + tmp = tmp.Save(); else { Csla.Validation.BrokenRulesCollection brc = tmp.ValidationRules.GetBrokenRules(); @@ -511,11 +507,7 @@ namespace VEPROMS.CSLA.Library { Image tmp = Image.New(myContent, fileName, data, config); if (tmp.IsSavable) - { - Image tmp2 = tmp; - tmp = tmp2.Save(); - tmp2.Dispose(); - } + tmp = tmp.Save(); else { Csla.Validation.BrokenRulesCollection brc = tmp.ValidationRules.GetBrokenRules(); diff --git a/PROMS/VEPROMS.CSLA.Library/Generated/ImageAudit.cs b/PROMS/VEPROMS.CSLA.Library/Generated/ImageAudit.cs index c2d5cd0c..b3f457e0 100644 --- a/PROMS/VEPROMS.CSLA.Library/Generated/ImageAudit.cs +++ b/PROMS/VEPROMS.CSLA.Library/Generated/ImageAudit.cs @@ -519,11 +519,7 @@ namespace VEPROMS.CSLA.Library { ImageAudit tmp = ImageAudit.New(contentID, imageType, fileName, data, config, dts, userID, deleteStatus); if (tmp.IsSavable) - { - ImageAudit tmp2 = tmp; - tmp = tmp2.Save(); - tmp2.Dispose(); - } + tmp = tmp.Save(); else { Csla.Validation.BrokenRulesCollection brc = tmp.ValidationRules.GetBrokenRules(); diff --git a/PROMS/VEPROMS.CSLA.Library/Generated/Item.cs b/PROMS/VEPROMS.CSLA.Library/Generated/Item.cs index daad6266..bf578723 100644 --- a/PROMS/VEPROMS.CSLA.Library/Generated/Item.cs +++ b/PROMS/VEPROMS.CSLA.Library/Generated/Item.cs @@ -798,11 +798,7 @@ namespace VEPROMS.CSLA.Library { Item tmp = Item.New(myPrevious, myContent, dts, userID); if (tmp.IsSavable) - { - Item tmp2 = tmp; - tmp = tmp2.Save(); - //tmp2.Dispose(); - } + tmp = tmp.Save(); else { Csla.Validation.BrokenRulesCollection brc = tmp.ValidationRules.GetBrokenRules(); @@ -825,11 +821,7 @@ namespace VEPROMS.CSLA.Library { Item tmp = Item.New(myPrevious, myContent); if (tmp.IsSavable) - { - Item tmp2 = tmp; - tmp = tmp2.Save(); - tmp2.Dispose(); - } + tmp = tmp.Save(); else { Csla.Validation.BrokenRulesCollection brc = tmp.ValidationRules.GetBrokenRules(); diff --git a/PROMS/VEPROMS.CSLA.Library/Generated/ItemAudit.cs b/PROMS/VEPROMS.CSLA.Library/Generated/ItemAudit.cs index 75f9cc96..6b8a945e 100644 --- a/PROMS/VEPROMS.CSLA.Library/Generated/ItemAudit.cs +++ b/PROMS/VEPROMS.CSLA.Library/Generated/ItemAudit.cs @@ -461,11 +461,7 @@ namespace VEPROMS.CSLA.Library { ItemAudit tmp = ItemAudit.New(itemID, previousID, contentID, dts, userID, deleteStatus); if (tmp.IsSavable) - { - ItemAudit tmp2 = tmp; - tmp = tmp2.Save(); - tmp2.Dispose(); - } + tmp = tmp.Save(); else { Csla.Validation.BrokenRulesCollection brc = tmp.ValidationRules.GetBrokenRules(); diff --git a/PROMS/VEPROMS.CSLA.Library/Generated/ItemInfo.cs b/PROMS/VEPROMS.CSLA.Library/Generated/ItemInfo.cs index 49d5760b..b3d5688a 100644 --- a/PROMS/VEPROMS.CSLA.Library/Generated/ItemInfo.cs +++ b/PROMS/VEPROMS.CSLA.Library/Generated/ItemInfo.cs @@ -496,22 +496,6 @@ namespace VEPROMS.CSLA.Library _DTS = tmp.DTS; _UserID = tmp.UserID; _ItemInfoExtension.Refresh(this); -//RHM Removed 20090724 - Duplicates function of code above. -// - Dispose caused error when a new step was added. -// - Resequence of transitions did not work properly. -// if(_MyPrevious != null) -// { -// _MyPrevious.Dispose();// Dispose related value -// _MyPrevious = null;// Reset related value -// } -//RHM Removed 20090724 - Duplicates function of code above. -// - Dispose caused error when a new step was added. -// - Resequence of transitions did not work properly. -// if(_MyContent != null) -// { -// _MyContent.Dispose();// Dispose related value -// _MyContent = null;// Reset related value -// } OnChange();// raise an event } public static void Refresh(ContentItem tmp) @@ -534,22 +518,6 @@ namespace VEPROMS.CSLA.Library _DTS = tmp.DTS; _UserID = tmp.UserID; _ItemInfoExtension.Refresh(this); -//RHM Removed 20090724 - Duplicates function of code above. -// - Dispose caused error when a new step was added. -// - Resequence of transitions did not work properly. -// if(_MyPrevious != null) -// { -// _MyPrevious.Dispose();// Dispose related value -// _MyPrevious = null;// Reset related value -// } -//RHM Removed 20090724 - Duplicates function of code above. -// - Dispose caused error when a new step was added. -// - Resequence of transitions did not work properly. -// if(_MyContent != null) -// { -// _MyContent.Dispose();// Dispose related value -// _MyContent = null;// Reset related value -// } OnChange();// raise an event } public static ItemInfo Get(int itemID) diff --git a/PROMS/VEPROMS.CSLA.Library/Generated/Membership.cs b/PROMS/VEPROMS.CSLA.Library/Generated/Membership.cs index 72776e8f..8e99ca54 100644 --- a/PROMS/VEPROMS.CSLA.Library/Generated/Membership.cs +++ b/PROMS/VEPROMS.CSLA.Library/Generated/Membership.cs @@ -597,11 +597,7 @@ namespace VEPROMS.CSLA.Library { Membership tmp = Membership.New(myUser, myGroup, startDate, endDate, config, dts, usrID); if (tmp.IsSavable) - { - Membership tmp2 = tmp; - tmp = tmp2.Save(); - tmp2.Dispose(); - } + tmp = tmp.Save(); else { Csla.Validation.BrokenRulesCollection brc = tmp.ValidationRules.GetBrokenRules(); @@ -626,11 +622,7 @@ namespace VEPROMS.CSLA.Library { Membership tmp = Membership.New(myUser, myGroup, endDate, config); if (tmp.IsSavable) - { - Membership tmp2 = tmp; - tmp = tmp2.Save(); - tmp2.Dispose(); - } + tmp = tmp.Save(); else { Csla.Validation.BrokenRulesCollection brc = tmp.ValidationRules.GetBrokenRules(); diff --git a/PROMS/VEPROMS.CSLA.Library/Generated/MembershipInfo.cs b/PROMS/VEPROMS.CSLA.Library/Generated/MembershipInfo.cs index 4ff41f22..ae936951 100644 --- a/PROMS/VEPROMS.CSLA.Library/Generated/MembershipInfo.cs +++ b/PROMS/VEPROMS.CSLA.Library/Generated/MembershipInfo.cs @@ -287,22 +287,6 @@ namespace VEPROMS.CSLA.Library _DTS = tmp.DTS; _UsrID = tmp.UsrID; _MembershipInfoExtension.Refresh(this); -//RHM Removed 20090724 - Duplicates function of code above. -// - Dispose caused error when a new step was added. -// - Resequence of transitions did not work properly. -// if(_MyUser != null) -// { -// _MyUser.Dispose();// Dispose related value -// _MyUser = null;// Reset related value -// } -//RHM Removed 20090724 - Duplicates function of code above. -// - Dispose caused error when a new step was added. -// - Resequence of transitions did not work properly. -// if(_MyGroup != null) -// { -// _MyGroup.Dispose();// Dispose related value -// _MyGroup = null;// Reset related value -// } OnChange();// raise an event } public static void Refresh(GroupMembership tmp) @@ -328,22 +312,6 @@ namespace VEPROMS.CSLA.Library _DTS = tmp.DTS; _UsrID = tmp.UsrID; _MembershipInfoExtension.Refresh(this); -//RHM Removed 20090724 - Duplicates function of code above. -// - Dispose caused error when a new step was added. -// - Resequence of transitions did not work properly. -// if(_MyUser != null) -// { -// _MyUser.Dispose();// Dispose related value -// _MyUser = null;// Reset related value -// } -//RHM Removed 20090724 - Duplicates function of code above. -// - Dispose caused error when a new step was added. -// - Resequence of transitions did not work properly. -// if(_MyGroup != null) -// { -// _MyGroup.Dispose();// Dispose related value -// _MyGroup = null;// Reset related value -// } OnChange();// raise an event } public static void Refresh(UserMembership tmp) @@ -369,22 +337,6 @@ namespace VEPROMS.CSLA.Library _DTS = tmp.DTS; _UsrID = tmp.UsrID; _MembershipInfoExtension.Refresh(this); -//RHM Removed 20090724 - Duplicates function of code above. -// - Dispose caused error when a new step was added. -// - Resequence of transitions did not work properly. -// if(_MyUser != null) -// { -// _MyUser.Dispose();// Dispose related value -// _MyUser = null;// Reset related value -// } -//RHM Removed 20090724 - Duplicates function of code above. -// - Dispose caused error when a new step was added. -// - Resequence of transitions did not work properly. -// if(_MyGroup != null) -// { -// _MyGroup.Dispose();// Dispose related value -// _MyGroup = null;// Reset related value -// } OnChange();// raise an event } public static MembershipInfo Get(int ugid) diff --git a/PROMS/VEPROMS.CSLA.Library/Generated/Part.cs b/PROMS/VEPROMS.CSLA.Library/Generated/Part.cs index 9e796d26..1a22cfd5 100644 --- a/PROMS/VEPROMS.CSLA.Library/Generated/Part.cs +++ b/PROMS/VEPROMS.CSLA.Library/Generated/Part.cs @@ -440,11 +440,7 @@ namespace VEPROMS.CSLA.Library { Part tmp = Part.New(myContent, fromType, myItem); if (tmp.IsSavable) - { - Part tmp2 = tmp; - tmp = tmp2.Save(); - tmp2.Dispose(); - } + tmp = tmp.Save(); else { Csla.Validation.BrokenRulesCollection brc = tmp.ValidationRules.GetBrokenRules(); @@ -470,11 +466,7 @@ namespace VEPROMS.CSLA.Library { Part tmp = Part.New(myContent, fromType, myItem, dts, userID); if (tmp.IsSavable) - { - Part tmp2 = tmp; - tmp = tmp2.Save(); - tmp2.Dispose(); - } + tmp = tmp.Save(); else { Csla.Validation.BrokenRulesCollection brc = tmp.ValidationRules.GetBrokenRules(); diff --git a/PROMS/VEPROMS.CSLA.Library/Generated/PartAudit.cs b/PROMS/VEPROMS.CSLA.Library/Generated/PartAudit.cs index 58ffbcff..d3755caf 100644 --- a/PROMS/VEPROMS.CSLA.Library/Generated/PartAudit.cs +++ b/PROMS/VEPROMS.CSLA.Library/Generated/PartAudit.cs @@ -451,11 +451,7 @@ namespace VEPROMS.CSLA.Library { PartAudit tmp = PartAudit.New(contentID, fromType, itemID, dts, userID, deleteStatus); if (tmp.IsSavable) - { - PartAudit tmp2 = tmp; - tmp = tmp2.Save(); - tmp2.Dispose(); - } + tmp = tmp.Save(); else { Csla.Validation.BrokenRulesCollection brc = tmp.ValidationRules.GetBrokenRules(); diff --git a/PROMS/VEPROMS.CSLA.Library/Generated/PartInfo.cs b/PROMS/VEPROMS.CSLA.Library/Generated/PartInfo.cs index ac14de3b..ffb6bd6f 100644 --- a/PROMS/VEPROMS.CSLA.Library/Generated/PartInfo.cs +++ b/PROMS/VEPROMS.CSLA.Library/Generated/PartInfo.cs @@ -249,22 +249,6 @@ namespace VEPROMS.CSLA.Library _DTS = tmp.DTS; _UserID = tmp.UserID; _PartInfoExtension.Refresh(this); -//RHM Removed 20090724 - Duplicates function of code above. -// - Dispose caused error when a new step was added. -// - Resequence of transitions did not work properly. -// if(_MyContent != null) -// { -// _MyContent.Dispose();// Dispose related value -// _MyContent = null;// Reset related value -// } -//RHM Removed 20090724 - Duplicates function of code above. -// - Dispose caused error when a new step was added. -// - Resequence of transitions did not work properly. -// if(_MyItem != null) -// { -// _MyItem.Dispose();// Dispose related value -// _MyItem = null;// Reset related value -// } OnChange();// raise an event } public static void Refresh(Content myContent, ContentPart tmp) @@ -287,22 +271,6 @@ namespace VEPROMS.CSLA.Library _DTS = tmp.DTS; _UserID = tmp.UserID; _PartInfoExtension.Refresh(this); -//RHM Removed 20090724 - Duplicates function of code above. -// - Dispose caused error when a new step was added. -// - Resequence of transitions did not work properly. -// if(_MyContent != null) -// { -// _MyContent.Dispose();// Dispose related value -// _MyContent = null;// Reset related value -// } -//RHM Removed 20090724 - Duplicates function of code above. -// - Dispose caused error when a new step was added. -// - Resequence of transitions did not work properly. -// if(_MyItem != null) -// { -// _MyItem.Dispose();// Dispose related value -// _MyItem = null;// Reset related value -// } OnChange();// raise an event } public static void Refresh(ItemPart tmp) @@ -318,22 +286,6 @@ namespace VEPROMS.CSLA.Library _DTS = tmp.DTS; _UserID = tmp.UserID; _PartInfoExtension.Refresh(this); -//RHM Removed 20090724 - Duplicates function of code above. -// - Dispose caused error when a new step was added. -// - Resequence of transitions did not work properly. -// if(_MyContent != null) -// { -// _MyContent.Dispose();// Dispose related value -// _MyContent = null;// Reset related value -// } -//RHM Removed 20090724 - Duplicates function of code above. -// - Dispose caused error when a new step was added. -// - Resequence of transitions did not work properly. -// if(_MyItem != null) -// { -// _MyItem.Dispose();// Dispose related value -// _MyItem = null;// Reset related value -// } OnChange();// raise an event } public static PartInfo Get(int contentID, int fromType) diff --git a/PROMS/VEPROMS.CSLA.Library/Generated/Pdf.cs b/PROMS/VEPROMS.CSLA.Library/Generated/Pdf.cs index f08fa535..3e70739e 100644 --- a/PROMS/VEPROMS.CSLA.Library/Generated/Pdf.cs +++ b/PROMS/VEPROMS.CSLA.Library/Generated/Pdf.cs @@ -510,11 +510,7 @@ namespace VEPROMS.CSLA.Library { Pdf tmp = Pdf.New(myDocument, debugStatus, topRow, pageLength, leftMargin, pageWidth, pageCount, docPdf, dts, userID); if (tmp.IsSavable) - { - Pdf tmp2 = tmp; - tmp = tmp2.Save(); - tmp2.Dispose(); - } + tmp = tmp.Save(); else { Csla.Validation.BrokenRulesCollection brc = tmp.ValidationRules.GetBrokenRules(); @@ -543,11 +539,7 @@ namespace VEPROMS.CSLA.Library { Pdf tmp = Pdf.New(myDocument, debugStatus, topRow, pageLength, leftMargin, pageWidth, pageCount, docPdf); if (tmp.IsSavable) - { - Pdf tmp2 = tmp; - tmp = tmp2.Save(); - tmp2.Dispose(); - } + tmp = tmp.Save(); else { Csla.Validation.BrokenRulesCollection brc = tmp.ValidationRules.GetBrokenRules(); diff --git a/PROMS/VEPROMS.CSLA.Library/Generated/PdfInfo.cs b/PROMS/VEPROMS.CSLA.Library/Generated/PdfInfo.cs index fcdf1c4b..ba455bca 100644 --- a/PROMS/VEPROMS.CSLA.Library/Generated/PdfInfo.cs +++ b/PROMS/VEPROMS.CSLA.Library/Generated/PdfInfo.cs @@ -292,14 +292,6 @@ namespace VEPROMS.CSLA.Library _DTS = tmp.DTS; _UserID = tmp.UserID; _PdfInfoExtension.Refresh(this); -//RHM Removed 20090724 - Duplicates function of code above. -// - Dispose caused error when a new step was added. -// - Resequence of transitions did not work properly. -// if(_MyDocument != null) -// { -// _MyDocument.Dispose();// Dispose related value -// _MyDocument = null;// Reset related value -// } OnChange();// raise an event } public static void Refresh(Document myDocument, DocumentPdf tmp) @@ -317,14 +309,6 @@ namespace VEPROMS.CSLA.Library _DTS = tmp.DTS; _UserID = tmp.UserID; _PdfInfoExtension.Refresh(this); -//RHM Removed 20090724 - Duplicates function of code above. -// - Dispose caused error when a new step was added. -// - Resequence of transitions did not work properly. -// if(_MyDocument != null) -// { -// _MyDocument.Dispose();// Dispose related value -// _MyDocument = null;// Reset related value -// } OnChange();// raise an event } public static PdfInfo Get(int docID, int debugStatus, int topRow, int pageLength, int leftMargin, int pageWidth) diff --git a/PROMS/VEPROMS.CSLA.Library/Generated/Permission.cs b/PROMS/VEPROMS.CSLA.Library/Generated/Permission.cs index 15fc3b66..42dd6433 100644 --- a/PROMS/VEPROMS.CSLA.Library/Generated/Permission.cs +++ b/PROMS/VEPROMS.CSLA.Library/Generated/Permission.cs @@ -655,11 +655,7 @@ namespace VEPROMS.CSLA.Library { Permission tmp = Permission.New(myRole, permLevel, versionType, permValue, permAD, startDate, endDate, config, dts, usrID); if (tmp.IsSavable) - { - Permission tmp2 = tmp; - tmp = tmp2.Save(); - tmp2.Dispose(); - } + tmp = tmp.Save(); else { Csla.Validation.BrokenRulesCollection brc = tmp.ValidationRules.GetBrokenRules(); @@ -686,11 +682,7 @@ namespace VEPROMS.CSLA.Library { Permission tmp = Permission.New(myRole, permLevel, versionType, permValue, endDate, config); if (tmp.IsSavable) - { - Permission tmp2 = tmp; - tmp = tmp2.Save(); - tmp2.Dispose(); - } + tmp = tmp.Save(); else { Csla.Validation.BrokenRulesCollection brc = tmp.ValidationRules.GetBrokenRules(); diff --git a/PROMS/VEPROMS.CSLA.Library/Generated/PermissionInfo.cs b/PROMS/VEPROMS.CSLA.Library/Generated/PermissionInfo.cs index 1d664104..c9f4d879 100644 --- a/PROMS/VEPROMS.CSLA.Library/Generated/PermissionInfo.cs +++ b/PROMS/VEPROMS.CSLA.Library/Generated/PermissionInfo.cs @@ -314,14 +314,6 @@ namespace VEPROMS.CSLA.Library _DTS = tmp.DTS; _UsrID = tmp.UsrID; _PermissionInfoExtension.Refresh(this); -//RHM Removed 20090724 - Duplicates function of code above. -// - Dispose caused error when a new step was added. -// - Resequence of transitions did not work properly. -// if(_MyRole != null) -// { -// _MyRole.Dispose();// Dispose related value -// _MyRole = null;// Reset related value -// } OnChange();// raise an event } public static void Refresh(RolePermission tmp) @@ -344,14 +336,6 @@ namespace VEPROMS.CSLA.Library _DTS = tmp.DTS; _UsrID = tmp.UsrID; _PermissionInfoExtension.Refresh(this); -//RHM Removed 20090724 - Duplicates function of code above. -// - Dispose caused error when a new step was added. -// - Resequence of transitions did not work properly. -// if(_MyRole != null) -// { -// _MyRole.Dispose();// Dispose related value -// _MyRole = null;// Reset related value -// } OnChange();// raise an event } public static PermissionInfo Get(int pid) diff --git a/PROMS/VEPROMS.CSLA.Library/Generated/RODb.cs b/PROMS/VEPROMS.CSLA.Library/Generated/RODb.cs index 086e624a..d95a7969 100644 --- a/PROMS/VEPROMS.CSLA.Library/Generated/RODb.cs +++ b/PROMS/VEPROMS.CSLA.Library/Generated/RODb.cs @@ -744,11 +744,7 @@ namespace VEPROMS.CSLA.Library { RODb tmp = RODb.New(rOName, folderPath, dBConnectionString, config, dts, userID); if (tmp.IsSavable) - { - RODb tmp2 = tmp; - tmp = tmp2.Save(); - tmp2.Dispose(); - } + tmp = tmp.Save(); else { Csla.Validation.BrokenRulesCollection brc = tmp.ValidationRules.GetBrokenRules(); @@ -773,11 +769,7 @@ namespace VEPROMS.CSLA.Library { RODb tmp = RODb.New(rOName, folderPath, dBConnectionString, config); if (tmp.IsSavable) - { - RODb tmp2 = tmp; - tmp = tmp2.Save(); - tmp2.Dispose(); - } + tmp = tmp.Save(); else { Csla.Validation.BrokenRulesCollection brc = tmp.ValidationRules.GetBrokenRules(); diff --git a/PROMS/VEPROMS.CSLA.Library/Generated/ROFst.cs b/PROMS/VEPROMS.CSLA.Library/Generated/ROFst.cs index 29a01261..8d3c2a64 100644 --- a/PROMS/VEPROMS.CSLA.Library/Generated/ROFst.cs +++ b/PROMS/VEPROMS.CSLA.Library/Generated/ROFst.cs @@ -614,11 +614,7 @@ namespace VEPROMS.CSLA.Library { ROFst tmp = ROFst.New(myRODb, rOLookup, config, dts, userID); if (tmp.IsSavable) - { - ROFst tmp2 = tmp; - tmp = tmp2.Save(); - tmp2.Dispose(); - } + tmp = tmp.Save(); else { Csla.Validation.BrokenRulesCollection brc = tmp.ValidationRules.GetBrokenRules(); @@ -642,11 +638,7 @@ namespace VEPROMS.CSLA.Library { ROFst tmp = ROFst.New(myRODb, rOLookup, config); if (tmp.IsSavable) - { - ROFst tmp2 = tmp; - tmp = tmp2.Save(); - tmp2.Dispose(); - } + tmp = tmp.Save(); else { Csla.Validation.BrokenRulesCollection brc = tmp.ValidationRules.GetBrokenRules(); diff --git a/PROMS/VEPROMS.CSLA.Library/Generated/ROFstInfo.cs b/PROMS/VEPROMS.CSLA.Library/Generated/ROFstInfo.cs index 2c4464ab..57b4bb6a 100644 --- a/PROMS/VEPROMS.CSLA.Library/Generated/ROFstInfo.cs +++ b/PROMS/VEPROMS.CSLA.Library/Generated/ROFstInfo.cs @@ -323,14 +323,6 @@ namespace VEPROMS.CSLA.Library _DTS = tmp.DTS; _UserID = tmp.UserID; _ROFstInfoExtension.Refresh(this); -//RHM Removed 20090724 - Duplicates function of code above. -// - Dispose caused error when a new step was added. -// - Resequence of transitions did not work properly. -// if(_MyRODb != null) -// { -// _MyRODb.Dispose();// Dispose related value -// _MyRODb = null;// Reset related value -// } OnChange();// raise an event } public static void Refresh(RODbROFst tmp) @@ -348,14 +340,6 @@ namespace VEPROMS.CSLA.Library _DTS = tmp.DTS; _UserID = tmp.UserID; _ROFstInfoExtension.Refresh(this); -//RHM Removed 20090724 - Duplicates function of code above. -// - Dispose caused error when a new step was added. -// - Resequence of transitions did not work properly. -// if(_MyRODb != null) -// { -// _MyRODb.Dispose();// Dispose related value -// _MyRODb = null;// Reset related value -// } OnChange();// raise an event } public static ROFstInfo Get(int rOFstID) diff --git a/PROMS/VEPROMS.CSLA.Library/Generated/ROImage.cs b/PROMS/VEPROMS.CSLA.Library/Generated/ROImage.cs index dc4c817a..75a37b7a 100644 --- a/PROMS/VEPROMS.CSLA.Library/Generated/ROImage.cs +++ b/PROMS/VEPROMS.CSLA.Library/Generated/ROImage.cs @@ -592,11 +592,7 @@ namespace VEPROMS.CSLA.Library { ROImage tmp = ROImage.New(myRODb, fileName, content, config, dts, userID); if (tmp.IsSavable) - { - ROImage tmp2 = tmp; - tmp = tmp2.Save(); - tmp2.Dispose(); - } + tmp = tmp.Save(); else { Csla.Validation.BrokenRulesCollection brc = tmp.ValidationRules.GetBrokenRules(); @@ -621,11 +617,7 @@ namespace VEPROMS.CSLA.Library { ROImage tmp = ROImage.New(myRODb, fileName, content, config); if (tmp.IsSavable) - { - ROImage tmp2 = tmp; - tmp = tmp2.Save(); - tmp2.Dispose(); - } + tmp = tmp.Save(); else { Csla.Validation.BrokenRulesCollection brc = tmp.ValidationRules.GetBrokenRules(); diff --git a/PROMS/VEPROMS.CSLA.Library/Generated/ROImageInfo.cs b/PROMS/VEPROMS.CSLA.Library/Generated/ROImageInfo.cs index 0054eaf0..593975b0 100644 --- a/PROMS/VEPROMS.CSLA.Library/Generated/ROImageInfo.cs +++ b/PROMS/VEPROMS.CSLA.Library/Generated/ROImageInfo.cs @@ -296,14 +296,6 @@ namespace VEPROMS.CSLA.Library _DTS = tmp.DTS; _UserID = tmp.UserID; _ROImageInfoExtension.Refresh(this); -//RHM Removed 20090724 - Duplicates function of code above. -// - Dispose caused error when a new step was added. -// - Resequence of transitions did not work properly. -// if(_MyRODb != null) -// { -// _MyRODb.Dispose();// Dispose related value -// _MyRODb = null;// Reset related value -// } OnChange();// raise an event } public static void Refresh(RODbROImage tmp) @@ -322,14 +314,6 @@ namespace VEPROMS.CSLA.Library _DTS = tmp.DTS; _UserID = tmp.UserID; _ROImageInfoExtension.Refresh(this); -//RHM Removed 20090724 - Duplicates function of code above. -// - Dispose caused error when a new step was added. -// - Resequence of transitions did not work properly. -// if(_MyRODb != null) -// { -// _MyRODb.Dispose();// Dispose related value -// _MyRODb = null;// Reset related value -// } OnChange();// raise an event } public static ROImageInfo Get(int imageID) diff --git a/PROMS/VEPROMS.CSLA.Library/Generated/Revision.cs b/PROMS/VEPROMS.CSLA.Library/Generated/Revision.cs index 2fcf9853..3ab415e2 100644 --- a/PROMS/VEPROMS.CSLA.Library/Generated/Revision.cs +++ b/PROMS/VEPROMS.CSLA.Library/Generated/Revision.cs @@ -643,11 +643,7 @@ namespace VEPROMS.CSLA.Library { Revision tmp = Revision.New(itemID, typeID, revisionNumber, revisionDate, notes, config, dts, userID); if (tmp.IsSavable) - { - Revision tmp2 = tmp; - tmp = tmp2.Save(); - tmp2.Dispose(); - } + tmp = tmp.Save(); else { Csla.Validation.BrokenRulesCollection brc = tmp.ValidationRules.GetBrokenRules(); @@ -673,11 +669,7 @@ namespace VEPROMS.CSLA.Library { Revision tmp = Revision.New(itemID, revisionNumber, revisionDate, notes, config); if (tmp.IsSavable) - { - Revision tmp2 = tmp; - tmp = tmp2.Save(); - tmp2.Dispose(); - } + tmp = tmp.Save(); else { Csla.Validation.BrokenRulesCollection brc = tmp.ValidationRules.GetBrokenRules(); diff --git a/PROMS/VEPROMS.CSLA.Library/Generated/RoUsage.cs b/PROMS/VEPROMS.CSLA.Library/Generated/RoUsage.cs index e302fda2..e6739fe3 100644 --- a/PROMS/VEPROMS.CSLA.Library/Generated/RoUsage.cs +++ b/PROMS/VEPROMS.CSLA.Library/Generated/RoUsage.cs @@ -530,11 +530,7 @@ namespace VEPROMS.CSLA.Library { RoUsage tmp = RoUsage.New(myContent, roid, config, dts, userID, myRODb); if (tmp.IsSavable) - { - RoUsage tmp2 = tmp; - tmp = tmp2.Save(); - tmp2.Dispose(); - } + tmp = tmp.Save(); else { Csla.Validation.BrokenRulesCollection brc = tmp.ValidationRules.GetBrokenRules(); @@ -559,11 +555,7 @@ namespace VEPROMS.CSLA.Library { RoUsage tmp = RoUsage.New(myContent, roid, config, myRODb); if (tmp.IsSavable) - { - RoUsage tmp2 = tmp; - tmp = tmp2.Save(); - tmp2.Dispose(); - } + tmp = tmp.Save(); else { Csla.Validation.BrokenRulesCollection brc = tmp.ValidationRules.GetBrokenRules(); diff --git a/PROMS/VEPROMS.CSLA.Library/Generated/RoUsageInfo.cs b/PROMS/VEPROMS.CSLA.Library/Generated/RoUsageInfo.cs index fc74d8c6..a9e76f17 100644 --- a/PROMS/VEPROMS.CSLA.Library/Generated/RoUsageInfo.cs +++ b/PROMS/VEPROMS.CSLA.Library/Generated/RoUsageInfo.cs @@ -276,22 +276,6 @@ namespace VEPROMS.CSLA.Library _MyRODb = null; // Reset list so that the next line gets a new list if (MyRODb != null) MyRODb.RefreshRODbRoUsages(); // Update List for new value _RoUsageInfoExtension.Refresh(this); -//RHM Removed 20090724 - Duplicates function of code above. -// - Dispose caused error when a new step was added. -// - Resequence of transitions did not work properly. -// if(_MyContent != null) -// { -// _MyContent.Dispose();// Dispose related value -// _MyContent = null;// Reset related value -// } -//RHM Removed 20090724 - Duplicates function of code above. -// - Dispose caused error when a new step was added. -// - Resequence of transitions did not work properly. -// if(_MyRODb != null) -// { -// _MyRODb.Dispose();// Dispose related value -// _MyRODb = null;// Reset related value -// } OnChange();// raise an event } public static void Refresh(ContentRoUsage tmp) @@ -316,22 +300,6 @@ namespace VEPROMS.CSLA.Library _MyRODb = null; // Reset list so that the next line gets a new list if (MyRODb != null) MyRODb.RefreshRODbRoUsages(); // Update List for new value _RoUsageInfoExtension.Refresh(this); -//RHM Removed 20090724 - Duplicates function of code above. -// - Dispose caused error when a new step was added. -// - Resequence of transitions did not work properly. -// if(_MyContent != null) -// { -// _MyContent.Dispose();// Dispose related value -// _MyContent = null;// Reset related value -// } -//RHM Removed 20090724 - Duplicates function of code above. -// - Dispose caused error when a new step was added. -// - Resequence of transitions did not work properly. -// if(_MyRODb != null) -// { -// _MyRODb.Dispose();// Dispose related value -// _MyRODb = null;// Reset related value -// } OnChange();// raise an event } public static void Refresh(RODbRoUsage tmp) @@ -356,22 +324,6 @@ namespace VEPROMS.CSLA.Library _DTS = tmp.DTS; _UserID = tmp.UserID; _RoUsageInfoExtension.Refresh(this); -//RHM Removed 20090724 - Duplicates function of code above. -// - Dispose caused error when a new step was added. -// - Resequence of transitions did not work properly. -// if(_MyContent != null) -// { -// _MyContent.Dispose();// Dispose related value -// _MyContent = null;// Reset related value -// } -//RHM Removed 20090724 - Duplicates function of code above. -// - Dispose caused error when a new step was added. -// - Resequence of transitions did not work properly. -// if(_MyRODb != null) -// { -// _MyRODb.Dispose();// Dispose related value -// _MyRODb = null;// Reset related value -// } OnChange();// raise an event } public static RoUsageInfo Get(int rOUsageID) diff --git a/PROMS/VEPROMS.CSLA.Library/Generated/Role.cs b/PROMS/VEPROMS.CSLA.Library/Generated/Role.cs index 10a4675a..a7faefe5 100644 --- a/PROMS/VEPROMS.CSLA.Library/Generated/Role.cs +++ b/PROMS/VEPROMS.CSLA.Library/Generated/Role.cs @@ -565,11 +565,7 @@ namespace VEPROMS.CSLA.Library { Role tmp = Role.New(name, title); if (tmp.IsSavable) - { - Role tmp2 = tmp; - tmp = tmp2.Save(); - tmp2.Dispose(); - } + tmp = tmp.Save(); else { Csla.Validation.BrokenRulesCollection brc = tmp.ValidationRules.GetBrokenRules(); @@ -594,11 +590,7 @@ namespace VEPROMS.CSLA.Library { Role tmp = Role.New(name, title, dts, usrID); if (tmp.IsSavable) - { - Role tmp2 = tmp; - tmp = tmp2.Save(); - tmp2.Dispose(); - } + tmp = tmp.Save(); else { Csla.Validation.BrokenRulesCollection brc = tmp.ValidationRules.GetBrokenRules(); diff --git a/PROMS/VEPROMS.CSLA.Library/Generated/Stage.cs b/PROMS/VEPROMS.CSLA.Library/Generated/Stage.cs index 1205c19f..0342e2b3 100644 --- a/PROMS/VEPROMS.CSLA.Library/Generated/Stage.cs +++ b/PROMS/VEPROMS.CSLA.Library/Generated/Stage.cs @@ -572,11 +572,7 @@ namespace VEPROMS.CSLA.Library { Stage tmp = Stage.New(name, description, isApproved, dts, userID); if (tmp.IsSavable) - { - Stage tmp2 = tmp; - tmp = tmp2.Save(); - tmp2.Dispose(); - } + tmp = tmp.Save(); else { Csla.Validation.BrokenRulesCollection brc = tmp.ValidationRules.GetBrokenRules(); @@ -599,11 +595,7 @@ namespace VEPROMS.CSLA.Library { Stage tmp = Stage.New(name, description); if (tmp.IsSavable) - { - Stage tmp2 = tmp; - tmp = tmp2.Save(); - tmp2.Dispose(); - } + tmp = tmp.Save(); else { Csla.Validation.BrokenRulesCollection brc = tmp.ValidationRules.GetBrokenRules(); diff --git a/PROMS/VEPROMS.CSLA.Library/Generated/Transition.cs b/PROMS/VEPROMS.CSLA.Library/Generated/Transition.cs index 89732e87..11e8bab6 100644 --- a/PROMS/VEPROMS.CSLA.Library/Generated/Transition.cs +++ b/PROMS/VEPROMS.CSLA.Library/Generated/Transition.cs @@ -657,11 +657,7 @@ namespace VEPROMS.CSLA.Library { Transition tmp = Transition.New(myContent, myItemToID, myItemRangeID, isRange, tranType, config, dts, userID); if (tmp.IsSavable) - { - Transition tmp2 = tmp; - tmp = tmp2.Save(); - tmp2.Dispose(); - } + tmp = tmp.Save(); else { Csla.Validation.BrokenRulesCollection brc = tmp.ValidationRules.GetBrokenRules(); @@ -686,11 +682,7 @@ namespace VEPROMS.CSLA.Library { Transition tmp = Transition.New(myContent, myItemToID, myItemRangeID, config); if (tmp.IsSavable) - { - Transition tmp2 = tmp; - tmp = tmp2.Save(); - tmp2.Dispose(); - } + tmp = tmp.Save(); else { Csla.Validation.BrokenRulesCollection brc = tmp.ValidationRules.GetBrokenRules(); diff --git a/PROMS/VEPROMS.CSLA.Library/Generated/TransitionInfo.cs b/PROMS/VEPROMS.CSLA.Library/Generated/TransitionInfo.cs index 1818682a..2d478701 100644 --- a/PROMS/VEPROMS.CSLA.Library/Generated/TransitionInfo.cs +++ b/PROMS/VEPROMS.CSLA.Library/Generated/TransitionInfo.cs @@ -351,38 +351,6 @@ namespace VEPROMS.CSLA.Library _DTS = tmp.DTS; _UserID = tmp.UserID; _TransitionInfoExtension.Refresh(this); -//RHM Removed 20090724 - Duplicates function of code above. -// - Dispose caused error when a new step was added. -// - Resequence of transitions did not work properly. -// if(_MyContent != null) -// { -// _MyContent.Dispose();// Dispose related value -// _MyContent = null;// Reset related value -// } -//RHM Removed 20090724 - Duplicates function of code above. -// - Dispose caused error when a new step was added. -// - Resequence of transitions did not work properly. -// if(_MyItemToID != null) -// { -// _MyItemToID.Dispose();// Dispose related value -// _MyItemToID = null;// Reset related value -// } -//RHM Removed 20090724 - Duplicates function of code above. -// - Dispose caused error when a new step was added. -// - Resequence of transitions did not work properly. -// if(_MyItemRangeID != null) -// { -// _MyItemRangeID.Dispose();// Dispose related value -// _MyItemRangeID = null;// Reset related value -// } -//RHM Removed 20090724 - Duplicates function of code above. -// - Dispose caused error when a new step was added. -// - Resequence of transitions did not work properly. -// if(_MyZTransition != null) -// { -// _MyZTransition.Dispose();// Dispose related value -// _MyZTransition = null;// Reset related value -// } _TransitionZTransitionCount = -1;// Reset Count OnChange();// raise an event } @@ -416,38 +384,6 @@ namespace VEPROMS.CSLA.Library _DTS = tmp.DTS; _UserID = tmp.UserID; _TransitionInfoExtension.Refresh(this); -//RHM Removed 20090724 - Duplicates function of code above. -// - Dispose caused error when a new step was added. -// - Resequence of transitions did not work properly. -// if(_MyContent != null) -// { -// _MyContent.Dispose();// Dispose related value -// _MyContent = null;// Reset related value -// } -//RHM Removed 20090724 - Duplicates function of code above. -// - Dispose caused error when a new step was added. -// - Resequence of transitions did not work properly. -// if(_MyItemToID != null) -// { -// _MyItemToID.Dispose();// Dispose related value -// _MyItemToID = null;// Reset related value -// } -//RHM Removed 20090724 - Duplicates function of code above. -// - Dispose caused error when a new step was added. -// - Resequence of transitions did not work properly. -// if(_MyItemRangeID != null) -// { -// _MyItemRangeID.Dispose();// Dispose related value -// _MyItemRangeID = null;// Reset related value -// } -//RHM Removed 20090724 - Duplicates function of code above. -// - Dispose caused error when a new step was added. -// - Resequence of transitions did not work properly. -// if(_MyZTransition != null) -// { -// _MyZTransition.Dispose();// Dispose related value -// _MyZTransition = null;// Reset related value -// } _TransitionZTransitionCount = -1;// Reset Count OnChange();// raise an event } @@ -481,38 +417,6 @@ namespace VEPROMS.CSLA.Library _DTS = tmp.DTS; _UserID = tmp.UserID; _TransitionInfoExtension.Refresh(this); -//RHM Removed 20090724 - Duplicates function of code above. -// - Dispose caused error when a new step was added. -// - Resequence of transitions did not work properly. -// if(_MyContent != null) -// { -// _MyContent.Dispose();// Dispose related value -// _MyContent = null;// Reset related value -// } -//RHM Removed 20090724 - Duplicates function of code above. -// - Dispose caused error when a new step was added. -// - Resequence of transitions did not work properly. -// if(_MyItemToID != null) -// { -// _MyItemToID.Dispose();// Dispose related value -// _MyItemToID = null;// Reset related value -// } -//RHM Removed 20090724 - Duplicates function of code above. -// - Dispose caused error when a new step was added. -// - Resequence of transitions did not work properly. -// if(_MyItemRangeID != null) -// { -// _MyItemRangeID.Dispose();// Dispose related value -// _MyItemRangeID = null;// Reset related value -// } -//RHM Removed 20090724 - Duplicates function of code above. -// - Dispose caused error when a new step was added. -// - Resequence of transitions did not work properly. -// if(_MyZTransition != null) -// { -// _MyZTransition.Dispose();// Dispose related value -// _MyZTransition = null;// Reset related value -// } _TransitionZTransitionCount = -1;// Reset Count OnChange();// raise an event } @@ -546,38 +450,6 @@ namespace VEPROMS.CSLA.Library _DTS = tmp.DTS; _UserID = tmp.UserID; _TransitionInfoExtension.Refresh(this); -//RHM Removed 20090724 - Duplicates function of code above. -// - Dispose caused error when a new step was added. -// - Resequence of transitions did not work properly. -// if(_MyContent != null) -// { -// _MyContent.Dispose();// Dispose related value -// _MyContent = null;// Reset related value -// } -//RHM Removed 20090724 - Duplicates function of code above. -// - Dispose caused error when a new step was added. -// - Resequence of transitions did not work properly. -// if(_MyItemToID != null) -// { -// _MyItemToID.Dispose();// Dispose related value -// _MyItemToID = null;// Reset related value -// } -//RHM Removed 20090724 - Duplicates function of code above. -// - Dispose caused error when a new step was added. -// - Resequence of transitions did not work properly. -// if(_MyItemRangeID != null) -// { -// _MyItemRangeID.Dispose();// Dispose related value -// _MyItemRangeID = null;// Reset related value -// } -//RHM Removed 20090724 - Duplicates function of code above. -// - Dispose caused error when a new step was added. -// - Resequence of transitions did not work properly. -// if(_MyZTransition != null) -// { -// _MyZTransition.Dispose();// Dispose related value -// _MyZTransition = null;// Reset related value -// } _TransitionZTransitionCount = -1;// Reset Count OnChange();// raise an event } diff --git a/PROMS/VEPROMS.CSLA.Library/Generated/User.cs b/PROMS/VEPROMS.CSLA.Library/Generated/User.cs index dc5bab93..c121d541 100644 --- a/PROMS/VEPROMS.CSLA.Library/Generated/User.cs +++ b/PROMS/VEPROMS.CSLA.Library/Generated/User.cs @@ -734,11 +734,7 @@ namespace VEPROMS.CSLA.Library { User tmp = User.New(userID, firstName, middleName, lastName, suffix, courtesyTitle, phoneNumber, cFGName, userLogin, userName, config, dts, usrID); if (tmp.IsSavable) - { - User tmp2 = tmp; - tmp = tmp2.Save(); - tmp2.Dispose(); - } + tmp = tmp.Save(); else { Csla.Validation.BrokenRulesCollection brc = tmp.ValidationRules.GetBrokenRules(); @@ -769,11 +765,7 @@ namespace VEPROMS.CSLA.Library { User tmp = User.New(firstName, middleName, lastName, suffix, courtesyTitle, phoneNumber, cFGName, userLogin, userName, config); if (tmp.IsSavable) - { - User tmp2 = tmp; - tmp = tmp2.Save(); - tmp2.Dispose(); - } + tmp = tmp.Save(); else { Csla.Validation.BrokenRulesCollection brc = tmp.ValidationRules.GetBrokenRules(); diff --git a/PROMS/VEPROMS.CSLA.Library/Generated/Version.cs b/PROMS/VEPROMS.CSLA.Library/Generated/Version.cs index 57ed4376..cd85a914 100644 --- a/PROMS/VEPROMS.CSLA.Library/Generated/Version.cs +++ b/PROMS/VEPROMS.CSLA.Library/Generated/Version.cs @@ -522,11 +522,7 @@ namespace VEPROMS.CSLA.Library { Version tmp = Version.New(myRevision, myStage, pdf, summaryPDF, dts, userID); if (tmp.IsSavable) - { - Version tmp2 = tmp; - tmp = tmp2.Save(); - tmp2.Dispose(); - } + tmp = tmp.Save(); else { Csla.Validation.BrokenRulesCollection brc = tmp.ValidationRules.GetBrokenRules(); diff --git a/PROMS/VEPROMS.CSLA.Library/Generated/VersionInfo.cs b/PROMS/VEPROMS.CSLA.Library/Generated/VersionInfo.cs index 669598f3..858ba276 100644 --- a/PROMS/VEPROMS.CSLA.Library/Generated/VersionInfo.cs +++ b/PROMS/VEPROMS.CSLA.Library/Generated/VersionInfo.cs @@ -276,22 +276,6 @@ namespace VEPROMS.CSLA.Library _DTS = tmp.DTS; _UserID = tmp.UserID; _VersionInfoExtension.Refresh(this); -//RHM Removed 20090724 - Duplicates function of code above. -// - Dispose caused error when a new step was added. -// - Resequence of transitions did not work properly. -// if(_MyRevision != null) -// { -// _MyRevision.Dispose();// Dispose related value -// _MyRevision = null;// Reset related value -// } -//RHM Removed 20090724 - Duplicates function of code above. -// - Dispose caused error when a new step was added. -// - Resequence of transitions did not work properly. -// if(_MyStage != null) -// { -// _MyStage.Dispose();// Dispose related value -// _MyStage = null;// Reset related value -// } OnChange();// raise an event } public static void Refresh(RevisionVersion tmp) @@ -316,22 +300,6 @@ namespace VEPROMS.CSLA.Library _DTS = tmp.DTS; _UserID = tmp.UserID; _VersionInfoExtension.Refresh(this); -//RHM Removed 20090724 - Duplicates function of code above. -// - Dispose caused error when a new step was added. -// - Resequence of transitions did not work properly. -// if(_MyRevision != null) -// { -// _MyRevision.Dispose();// Dispose related value -// _MyRevision = null;// Reset related value -// } -//RHM Removed 20090724 - Duplicates function of code above. -// - Dispose caused error when a new step was added. -// - Resequence of transitions did not work properly. -// if(_MyStage != null) -// { -// _MyStage.Dispose();// Dispose related value -// _MyStage = null;// Reset related value -// } OnChange();// raise an event } public static void Refresh(StageVersion tmp) @@ -356,22 +324,6 @@ namespace VEPROMS.CSLA.Library _DTS = tmp.DTS; _UserID = tmp.UserID; _VersionInfoExtension.Refresh(this); -//RHM Removed 20090724 - Duplicates function of code above. -// - Dispose caused error when a new step was added. -// - Resequence of transitions did not work properly. -// if(_MyRevision != null) -// { -// _MyRevision.Dispose();// Dispose related value -// _MyRevision = null;// Reset related value -// } -//RHM Removed 20090724 - Duplicates function of code above. -// - Dispose caused error when a new step was added. -// - Resequence of transitions did not work properly. -// if(_MyStage != null) -// { -// _MyStage.Dispose();// Dispose related value -// _MyStage = null;// Reset related value -// } OnChange();// raise an event } public static VersionInfo Get(int versionID) diff --git a/PROMS/VEPROMS.CSLA.Library/Generated/ZContent.cs b/PROMS/VEPROMS.CSLA.Library/Generated/ZContent.cs index 716341b9..66a1e60d 100644 --- a/PROMS/VEPROMS.CSLA.Library/Generated/ZContent.cs +++ b/PROMS/VEPROMS.CSLA.Library/Generated/ZContent.cs @@ -346,11 +346,7 @@ namespace VEPROMS.CSLA.Library { ZContent tmp = ZContent.New(myContent, oldStepSequence); if (tmp.IsSavable) - { - ZContent tmp2 = tmp; - tmp = tmp2.Save(); - tmp2.Dispose(); - } + tmp = tmp.Save(); else { Csla.Validation.BrokenRulesCollection brc = tmp.ValidationRules.GetBrokenRules(); diff --git a/PROMS/VEPROMS.CSLA.Library/Generated/ZTransition.cs b/PROMS/VEPROMS.CSLA.Library/Generated/ZTransition.cs index 32413e93..3af570ff 100644 --- a/PROMS/VEPROMS.CSLA.Library/Generated/ZTransition.cs +++ b/PROMS/VEPROMS.CSLA.Library/Generated/ZTransition.cs @@ -310,8 +310,6 @@ namespace VEPROMS.CSLA.Library _CountDisposed++; _Disposed = true; RemoveFromDictionaries(); - if (_MyTransition != null) - _MyTransition = null; } private void RemoveFromDictionaries() { @@ -348,11 +346,7 @@ namespace VEPROMS.CSLA.Library { ZTransition tmp = ZTransition.New(myTransition, oldto); if (tmp.IsSavable) - { - ZTransition tmp2 = tmp; - tmp = tmp2.Save(); - tmp2.Dispose(); - } + tmp = tmp.Save(); else { Csla.Validation.BrokenRulesCollection brc = tmp.ValidationRules.GetBrokenRules(); diff --git a/PROMS/VEPROMS.CSLA.Library/Generated/ZTransitionInfo.cs b/PROMS/VEPROMS.CSLA.Library/Generated/ZTransitionInfo.cs index e8156695..5a4e023e 100644 --- a/PROMS/VEPROMS.CSLA.Library/Generated/ZTransitionInfo.cs +++ b/PROMS/VEPROMS.CSLA.Library/Generated/ZTransitionInfo.cs @@ -194,14 +194,6 @@ namespace VEPROMS.CSLA.Library { _Oldto = tmp.Oldto; _ZTransitionInfoExtension.Refresh(this); -//RHM Removed 20090724 - Duplicates function of code above. -// - Dispose caused error when a new step was added. -// - Resequence of transitions did not work properly. -// if(_MyTransition != null) -// { -// _MyTransition.Dispose();// Dispose related value -// _MyTransition = null;// Reset related value -// } OnChange();// raise an event } public static ZTransitionInfo Get(int transitionID) diff --git a/PROMS/Volian.Controls.Library/vlnTreeView.cs b/PROMS/Volian.Controls.Library/vlnTreeView.cs index 651a1236..d490ed08 100644 --- a/PROMS/Volian.Controls.Library/vlnTreeView.cs +++ b/PROMS/Volian.Controls.Library/vlnTreeView.cs @@ -1042,7 +1042,7 @@ namespace Volian.Controls.Library SetLastValues(DocVersionInfo.Get(docversion.VersionID)); if (OnNodeOpenProperty(this, new vlnTreePropertyEventArgs("Working Draft", docversion.DocVersionConfig)) == DialogResult.OK) { - docversion.Save().Dispose(); + docversion.Save(); tn = new VETreeNode(_LastDocVersionInfo); SelectedNode.Nodes.Add(tn); // add tree node to end of list. } @@ -1061,7 +1061,7 @@ namespace Volian.Controls.Library SetLastValues(FolderInfo.Get(folder.FolderID)); if (OnNodeOpenProperty(this, new vlnTreePropertyEventArgs(uniquename, folder.FolderConfig)) == DialogResult.OK) { - folder.Save().Dispose(); + folder.Save(); tn = new VETreeNode((IVEDrillDownReadOnly)_LastFolderInfo); SelectedNode.Nodes.Add(tn); // add new tree node to end of childlist. } @@ -1083,7 +1083,7 @@ namespace Volian.Controls.Library SetLastValues(FolderInfo.Get(folder.FolderID)); if (OnNodeOpenProperty(this, new vlnTreePropertyEventArgs(uniquename, folder.FolderConfig)) == DialogResult.OK) { - folder.Save().Dispose(); + folder.Save(); tn = new VETreeNode((IVEDrillDownReadOnly)_LastFolderInfo); if (newtype == MenuSelections.FolderBefore) SelectedNode.Parent.Nodes.Insert(SelectedNode.Index, tn); if (newtype == MenuSelections.FolderAfter) SelectedNode.Parent.Nodes.Insert(SelectedNode.Index + 1, tn); @@ -1106,7 +1106,7 @@ namespace Volian.Controls.Library SetLastValues(ProcedureInfo.Get(procedure.ItemID)); if (OnNodeOpenProperty(this, new vlnTreePropertyEventArgs("New Procedure", procedure.ProcedureConfig)) == DialogResult.OK) { - procedure.Save().Dispose(); + procedure.Save(); tn = new VETreeNode(_LastProcedureInfo); SelectedNode.Nodes.Add(tn); // add tree node to end of list. } @@ -1127,7 +1127,7 @@ namespace Volian.Controls.Library SetLastValues(ProcedureInfo.Get(procedure.ItemID)); if (OnNodeOpenProperty(this, new vlnTreePropertyEventArgs("New Procedure", procedure.ProcedureConfig)) == DialogResult.OK) { - procedure.Save().Dispose(); + procedure.Save(); tn = new VETreeNode(_LastProcedureInfo); TreeNode par = SelectedNode.Parent; par.Nodes.Insert(tvindex + ((newtype == MenuSelections.ProcedureBefore) ? 0 : 1), tn);