Various Issue fixes

Hl7Models.sln

@@ -40,6 +40,7 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{14D20F5F-87E7-41BD-BE24-991081E0DE60}"
 	ProjectSection(SolutionItems) = preProject
 		.editorconfig = .editorconfig
+		global.json = global.json
 		NHapi.snk = NHapi.snk
 		README.md = README.md
 	EndProjectSection

global.json

@@ -0,0 +1,7 @@
+{
+  "sdk": {
+    "version": "3.1.301",
+    "rollForward": "latestFeature"
+  },
+  "projects": []
+}

nHapi.sln

@@ -16,11 +16,12 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{F462762A-D1DC-42AE-8E52-4BD3CC4590E4}"
 	ProjectSection(SolutionItems) = preProject
 		.editorconfig = .editorconfig
+		global.json = global.json
 		NHapi.snk = NHapi.snk
 		README.md = README.md
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NHapi.SourceGeneration", "src\NHapi.SourceGeneration\NHapi.SourceGeneration.csproj", "{D9A637CE-C1B6-499C-B81B-82AE30580394}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NHapi.SourceGeneration", "src\NHapi.SourceGeneration\NHapi.SourceGeneration.csproj", "{D9A637CE-C1B6-499C-B81B-82AE30580394}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

src/NHapi.Base/Model/GenericComposite.cs

@@ -35,11 +35,19 @@ public override String TypeName
 		private ArrayList components;
 		private IMessage message;
 
-		/// <summary>Creates a new instance of GenericComposite </summary>
-		public GenericComposite(IMessage message)
-			: base(message)
+		/// <summary>Creates a new instance of GenericComposite</summary>
+		/// <param name="theMessage">message to which this Type belongs</param>
+		public GenericComposite(IMessage theMessage)
+			: this(theMessage, null)
+		{
+		}
+
+		/// <summary>Creates a new instance of GenericComposite</summary>
+		/// <param name="theMessage">message to which this Type belongs</param>
+		/// <param name="description">The description of this type</param>
+		public GenericComposite(IMessage theMessage, string description)
+			: base(theMessage, description)
 		{
-			this.message = message;
 			components = new ArrayList(20);
 		}
 

src/NHapi.Base/Model/Primitive/DT.cs

@@ -1,43 +1,43 @@
 /*
-  The contents of this file are subject to the Mozilla Public License Version 1.1
-  (the "License"); you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at http://www.mozilla.org/MPL/
-  Software distributed under the License is distributed on an "AS IS" basis,
-  WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for the
-  specific language governing rights and limitations under the License.
-  
-  The Original Code is "DT.java".  Description:
-  "Note: The class description below has been excerpted from the Hl7 2.3.0 documentation"
-  
-  The Initial Developer of the Original Code is University Health Network. Copyright (C)
-  2005.  All Rights Reserved.
-  
-  Contributor(s): ______________________________________.
-  
-  Alternatively, the contents of this file may be used under the terms of the
-  GNU General Public License (the "GPL"), in which case the provisions of the GPL are
-  applicable instead of those above.  If you wish to allow use of your version of this
-  file only under the terms of the GPL and not to allow others to use your version
-  of this file under the MPL, indicate your decision by deleting  the provisions above
-  and replace  them with the notice and other provisions required by the GPL License.
-  If you do not delete the provisions above, a recipient may use your version of
-  this file under either the MPL or the GPL.
+	The contents of this file are subject to the Mozilla Public License Version 1.1
+	(the "License"); you may not use this file except in compliance with the License.
+	You may obtain a copy of the License at http://www.mozilla.org/MPL/
+	Software distributed under the License is distributed on an "AS IS" basis,
+	WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for the
+	specific language governing rights and limitations under the License.
+
+	The Original Code is "DT.java".  Description:
+	"Note: The class description below has been excerpted from the Hl7 2.3.0 documentation"
+
+	The Initial Developer of the Original Code is University Health Network. Copyright (C)
+	2005.  All Rights Reserved.
+
+	Contributor(s): ______________________________________.
+
+	Alternatively, the contents of this file may be used under the terms of the
+	GNU General Public License (the "GPL"), in which case the provisions of the GPL are
+	applicable instead of those above.  If you wish to allow use of your version of this
+	file only under the terms of the GPL and not to allow others to use your version
+	of this file under the MPL, indicate your decision by deleting  the provisions above
+	and replace  them with the notice and other provisions required by the GPL License.
+	If you do not delete the provisions above, a recipient may use your version of
+	this file under either the MPL or the GPL.
 */
 
 using System;
 
 namespace NHapi.Base.Model.Primitive
 {
-   /// <summary> Represents an HL7 DT (date) datatype.   
-   /// 
-   /// </summary>
-   /// <author>  <a href="mailto:neal.acharya@uhn.on.ca">Neal Acharya</a>
-   /// </author>
-   /// <author>  <a href="mailto:bryan.tripp@uhn.on.ca">Bryan Tripp</a>
-   /// </author>
-   /// <version>  $Revision: 1.3 $ updated on $Date: 2005/06/08 00:28:25 $ by $Author: bryan_tripp $
-   /// </version>
-   public abstract class DT : AbstractPrimitive
+	/// <summary>
+	///	Represents an HL7 DT (date) datatype.
+	/// </summary>
+	/// <author>  <a href="mailto:neal.acharya@uhn.on.ca">Neal Acharya</a>
+	/// </author>
+	/// <author>  <a href="mailto:bryan.tripp@uhn.on.ca">Bryan Tripp</a>
+	/// </author>
+	/// <version>  $Revision: 1.3 $ updated on $Date: 2005/06/08 00:28:25 $ by $Author: bryan_tripp $
+	/// </version>
+	public abstract class DT : AbstractPrimitive
 	{
 		private CommonDT Detail
 		{
@@ -51,10 +51,12 @@ private CommonDT Detail
 			}
 		}
 
-		/// <throws>  DataTypeException if the value is incorrectly formatted and either validation is  </throws>
-		/// <summary>      enabled for this primitive or detail setters / getters have been called, forcing further
-		/// parsing.   
-		/// </summary>
+
+		/// <value>
+		/// enabled for this primitive or detail setters / getters have been
+		/// called, forcing further parsing.
+		/// </value>
+		/// <throws ref="DataTypeException"/>if the value is incorrectly formatted and either validation is</throws>
 		public override String Value
 		{
 			get
@@ -121,20 +123,17 @@ public virtual int Day
 
 		private CommonDT myDetail;
 
-		/// <param name="theMessage">message to which this Type belongs
-		/// </param>
-		public DT(IMessage theMessage)
+		/// <summary>Construct the type</summary>
+		/// <param name="theMessage">message to which this Type belongs</param>
+		protected DT(IMessage theMessage)
 			: base(theMessage)
 		{
 		}
 
-
-		/// <summary>
-		/// DT class
-		/// </summary>
-		/// <param name="theMessage"></param>
-		/// <param name="description"></param>
-		public DT(IMessage theMessage, string description)
+		///<summary>Construct the type</summary>
+		///<param name="theMessage">message to which this Type belongs</param>
+		///<param name="description">The description of this type</param>
+		protected DT(IMessage theMessage, string description)
 			: base(theMessage, description)
 		{
 		}

src/NHapi.Base/Model/Primitive/ID.cs

@@ -1,28 +1,28 @@
 /*
-  The contents of this file are subject to the Mozilla Public License Version 1.1
-  (the "License"); you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at http://www.mozilla.org/MPL/
-  Software distributed under the License is distributed on an "AS IS" basis,
-  WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for the
-  specific language governing rights and limitations under the License.
-  
-  The Original Code is "ID.java".  Description:
-  "This class contains functionality used by the ID class
-  in the version 2.3.0, 2.3.1, 2.4, and 2.5 packages"
-  
-  The Initial Developer of the Original Code is University Health Network. Copyright (C)
-  2005.  All Rights Reserved.
-  
-  Contributor(s): ______________________________________.
-  
-  Alternatively, the contents of this file may be used under the terms of the
-  GNU General Public License (the "GPL"), in which case the provisions of the GPL are
-  applicable instead of those above.  If you wish to allow use of your version of this
-  file only under the terms of the GPL and not to allow others to use your version
-  of this file under the MPL, indicate your decision by deleting  the provisions above
-  and replace  them with the notice and other provisions required by the GPL License.
-  If you do not delete the provisions above, a recipient may use your version of
-  this file under either the MPL or the GPL.
+	The contents of this file are subject to the Mozilla Public License Version 1.1
+	(the "License"); you may not use this file except in compliance with the License.
+	You may obtain a copy of the License at http://www.mozilla.org/MPL/
+	Software distributed under the License is distributed on an "AS IS" basis,
+	WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for the
+	specific language governing rights and limitations under the License.
+	
+	The Original Code is "ID.java".  Description:
+	"This class contains functionality used by the ID class
+	in the version 2.3.0, 2.3.1, 2.4, and 2.5 packages"
+	
+	The Initial Developer of the Original Code is University Health Network. Copyright (C)
+	2005.  All Rights Reserved.
+	
+	Contributor(s): ______________________________________.
+	
+	Alternatively, the contents of this file may be used under the terms of the
+	GNU General Public License (the "GPL"), in which case the provisions of the GPL are
+	applicable instead of those above.  If you wish to allow use of your version of this
+	file only under the terms of the GPL and not to allow others to use your version
+	of this file under the MPL, indicate your decision by deleting  the provisions above
+	and replace  them with the notice and other provisions required by the GPL License.
+	If you do not delete the provisions above, a recipient may use your version of
+	this file under either the MPL or the GPL.
 */
 
 namespace NHapi.Base.Model.Primitive
@@ -60,34 +60,32 @@ public virtual int Table
 
 		private int myTable = 0;
 
-		/// <param name="theMessage">message to which this Type belongs
-		/// </param>
-		public ID(IMessage theMessage)
+		/// <summary>Construct the type</summary>
+		/// <param name="theMessage">message to which this Type belongs</param>
+		protected ID(IMessage theMessage)
 			: base(theMessage)
 		{
 		}
 
-
-		public ID(IMessage theMessage, string description)
+		///<summary>Construct the type</summary>
+		///<param name="theMessage">message to which this Type belongs</param>
+		///<param name="description">The description of this type</param>
+		protected ID(IMessage theMessage, string description)
 			: base(theMessage, description)
 		{
 		}
 
-		/// <param name="theMessage">message to which this Type belongs
-		/// </param>
-		/// <param name="theTable">HL7 table from which values are to be drawn 
-		/// </param>
-		public ID(IMessage theMessage, int theTable)
+		/// <param name="theMessage">message to which this Type belongs</param>
+		/// <param name="theTable">HL7 table from which values are to be drawn</param>
+		protected ID(IMessage theMessage, int theTable)
 			: base(theMessage)
 		{
 			myTable = theTable;
 		}
 
-		/// <param name="theMessage">message to which this Type belongs
-		/// </param>
-		/// <param name="theTable">HL7 table from which values are to be drawn 
-		/// </param>
-		public ID(IMessage message, int theTable, string description)
+		/// <param name="theMessage">message to which this Type belongs</param>
+		/// <param name="theTable">HL7 table from which values are to be drawn</param>
+		protected ID(IMessage message, int theTable, string description)
 			: base(message, description)
 		{
 			myTable = theTable;

src/NHapi.Base/Model/Primitive/IS.cs

@@ -1,28 +1,28 @@
 /*
-  The contents of this file are subject to the Mozilla Public License Version 1.1
-  (the "License"); you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at http://www.mozilla.org/MPL/
-  Software distributed under the License is distributed on an "AS IS" basis,
-  WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for the
-  specific language governing rights and limitations under the License.
-  
-  The Original Code is "IS.java".  Description:
-  "This class contains functionality used by the ID class
-  in the version 2.3.0, 2.3.1, 2.4, and 2.5 packages"
-  
-  The Initial Developer of the Original Code is University Health Network. Copyright (C)
-  2005.  All Rights Reserved.
-  
-  Contributor(s): ______________________________________.
-  
-  Alternatively, the contents of this file may be used under the terms of the
-  GNU General Public License (the "GPL"), in which case the provisions of the GPL are
-  applicable instead of those above.  If you wish to allow use of your version of this
-  file only under the terms of the GPL and not to allow others to use your version
-  of this file under the MPL, indicate your decision by deleting  the provisions above
-  and replace  them with the notice and other provisions required by the GPL License.
-  If you do not delete the provisions above, a recipient may use your version of
-  this file under either the MPL or the GPL.
+	The contents of this file are subject to the Mozilla Public License Version 1.1
+	(the "License"); you may not use this file except in compliance with the License.
+	You may obtain a copy of the License at http://www.mozilla.org/MPL/
+	Software distributed under the License is distributed on an "AS IS" basis,
+	WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for the
+	specific language governing rights and limitations under the License.
+
+	The Original Code is "IS.java".  Description:
+	"This class contains functionality used by the ID class
+	in the version 2.3.0, 2.3.1, 2.4, and 2.5 packages"
+
+	The Initial Developer of the Original Code is University Health Network. Copyright (C)
+	2005.  All Rights Reserved.
+
+	Contributor(s): ______________________________________.
+
+	Alternatively, the contents of this file may be used under the terms of the
+	GNU General Public License (the "GPL"), in which case the provisions of the GPL are
+	applicable instead of those above.  If you wish to allow use of your version of this
+	file only under the terms of the GPL and not to allow others to use your version
+	of this file under the MPL, indicate your decision by deleting  the provisions above
+	and replace  them with the notice and other provisions required by the GPL License.
+	If you do not delete the provisions above, a recipient may use your version of
+	this file under either the MPL or the GPL.
 */
 
 namespace NHapi.Base.Model.Primitive
@@ -62,15 +62,17 @@ public virtual int Table
 
 		private int myTable = 0;
 
-		/// <param name="theMessage">message to which this Type belongs
-		/// </param>
-		public IS(IMessage theMessage)
+		/// <summary>Construct the type</summary>
+		/// <param name="theMessage">message to which this Type belongs</param>
+		protected IS(IMessage theMessage)
 			: base(theMessage)
 		{
 		}
 
-
-		public IS(IMessage theMessage, string description)
+		/// <summary>Construct the type</summary>
+		/// <param name="theMessage">message to which this Type belongs</param>
+		/// <param name="description">The description of this type</param>
+		protected IS(IMessage theMessage, string description)
 			: base(theMessage, description)
 		{
 		}
@@ -79,7 +81,7 @@ public IS(IMessage theMessage, string description)
 		/// </param>
 		/// <param name="theTable">HL7 table from which values are to be drawn 
 		/// </param>
-		public IS(IMessage theMessage, int theTable)
+		protected IS(IMessage theMessage, int theTable)
 			: base(theMessage)
 		{
 			myTable = theTable;
@@ -89,7 +91,7 @@ public IS(IMessage theMessage, int theTable)
 		/// </param>
 		/// <param name="theTable">HL7 table from which values are to be drawn 
 		/// </param>
-		public IS(IMessage theMessage, int theTable, string description)
+		protected IS(IMessage theMessage, int theTable, string description)
 			: base(theMessage, description)
 		{
 			myTable = theTable;