Fix merge issues

Author: robertgoss

Build/build.bat

@@ -3,7 +3,7 @@ set startingDir="%CD%"
 set basepath="%~dp0"
 
 cd %basepath%\..\Source
-set Sources=actutils.go automaticcomponenttoolkit.go buildbindingccpp.go buildbindingcsharp.go buildbindinggo.go buildbindingnode.go buildbindingpascal.go buildbindingpython.go buildimplementationcpp.go buildimplementationpascal.go buildimplementationrust.go componentdefinition.go componentdiff.go languagewriter.go languagec.go languagecpp.go languagepascal.go languagerust.go
+set Sources=actutils.go automaticcomponenttoolkit.go buildbindingccpp.go buildbindingccppdocumentation.go buildbindingcsharp.go buildbindinggo.go buildbindingjava.go buildbindingnode.go buildbindingpascal.go buildbindingpython.go buildimplementationcpp.go buildimplementationpascal.go buildimplementationrust.go componentdefinition.go componentdiff.go languagewriter.go languagec.go languagecpp.go languagepascal.go languagerust.go
 set GOARCH=amd64
 echo "Build act.win64.exe"
 go build -o ..\act.win64.exe %Sources%

Examples/Primes/libPrimes.xml

@@ -46,6 +46,9 @@
 	</functiontype>
 
 	<class name="Base">
+		<method name="ClassTypeId" description="Get Class Type Id">
+			<param name="ClassTypeId" type="uint64" pass="return" description="Class type as a 64 bits integer" />
+		</method>
 	</class>
 
 	<class name="Calculator" parent="Base">
@@ -75,7 +78,8 @@
 	</class>
 
 	<global baseclassname="Base" acquiremethod="AcquireInstance"
-		releasemethod="ReleaseInstance" versionmethod="GetVersion" errormethod="GetLastError" journalmethod="SetJournal">
+		releasemethod="ReleaseInstance" versionmethod="GetVersion" errormethod="GetLastError" journalmethod="SetJournal"
+		classtypeidmethod="ClassTypeId">
 		<method name="GetVersion" description = "retrieves the binary version of this library.">
 			<param name="Major" type="uint32" pass="out" description="returns the major version of this library" />
 			<param name="Minor" type="uint32" pass="out" description="returns the minor version of this library" />

Source/languagewriter.go

@@ -137,8 +137,8 @@ func (writer *LanguageWriter) WritePythonLicenseHeader(component ComponentDefini
 }
 
 // WriteJavaLicenseHeader writes a license header into a writer Java-style comments
-func (writer *LanguageWriter) WriteJavaLicenseHeader (component ComponentDefinition, abstract string, includeVersion bool) {
-	writeLicenseHeaderEx (writer.Writer, component, abstract, includeVersion, "/*", "*/");
+func (writer *LanguageWriter) WriteJavaLicenseHeader(component ComponentDefinition, abstract string, includeVersion bool) {
+	writeLicenseHeaderEx(writer.Writer, component, abstract, includeVersion, "/*", "*/", "")
 }
 
 // WritePlainLicenseHeader writes a license header into a writer without comments