[commit] r2316 - in trunk: Install SDK/DotNet/DsmlGenerator SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/Generator SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/Properties
GMESRC Repository Notifications
gme-commit at list.isis.vanderbilt.edu
Thu Aug 29 16:30:51 CDT 2013
Author: ksmyth
Date: Thu Aug 29 16:30:51 2013
New Revision: 2316
Log:
GME-420 fix some warning in generated code
Modified:
trunk/Install/GME_SDK.wxs
trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/CSharpDSMLGenerator.cs
trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/Generator/Base.cs
trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/Generator/Configuration.cs
trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/Generator/FCO.cs
trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/Generator/FcoAttributes.cs
trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/Generator/FcoChildren.cs
trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/Generator/FcoReference.cs
trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/Generator/FcoSet.cs
trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/Generator/FcoSrcDstConnections.cs
trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/Generator/FcoSrcDstEnd.cs
trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/Properties/AssemblyInfo.cs
trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/app.manifest
trunk/SDK/DotNet/DsmlGenerator/GME.DSMLGenerator.nuspec
Modified: trunk/Install/GME_SDK.wxs
==============================================================================
--- trunk/Install/GME_SDK.wxs Thu Aug 29 11:20:04 2013 (r2315)
+++ trunk/Install/GME_SDK.wxs Thu Aug 29 16:30:51 2013 (r2316)
@@ -187,7 +187,7 @@
</Class>
<RegistryValue Root="HKCR" Key="CLSID\{78BE7B95-3564-4BA9-8FE6-8D9B91EEE0B8}\Implemented Categories\{62C8FE65-4EBB-45e7-B440-6E39B2CDBF29}" Value="" Type="string" Action="write" />
<RegistryValue Root="HKCR" Key="CLSID\{78BE7B95-3564-4BA9-8FE6-8D9B91EEE0B8}\InprocServer32" Name="Class" Value="CSharpDSMLGenerator.CSharpDSMLGeneratorInterpreter" Type="string" Action="write" />
- <RegistryValue Root="HKCR" Key="CLSID\{78BE7B95-3564-4BA9-8FE6-8D9B91EEE0B8}\InprocServer32" Name="Assembly" Value="CSharpDSMLGenerator, Version=1.0.10.0, Culture=neutral" Type="string" Action="write" />
+ <RegistryValue Root="HKCR" Key="CLSID\{78BE7B95-3564-4BA9-8FE6-8D9B91EEE0B8}\InprocServer32" Name="Assembly" Value="CSharpDSMLGenerator, Version=1.0.11.0, Culture=neutral" Type="string" Action="write" />
<RegistryValue Root="HKCR" Key="CLSID\{78BE7B95-3564-4BA9-8FE6-8D9B91EEE0B8}\InprocServer32" Name="RuntimeVersion" Value="v4.0.30319" Type="string" Action="write" />
<RegistryValue Root="HKCR" Key="CLSID\{78BE7B95-3564-4BA9-8FE6-8D9B91EEE0B8}\InprocServer32" Name="CodeBase" Value="file:///[#CSharpDSMLGenerator.dll]" Type="string" Action="write" />
<RegistryValue Root="HKCR" Key="Component Categories\{62C8FE65-4EBB-45e7-B440-6E39B2CDBF29}" Name="0" Value=".NET Category" Type="string" Action="write" />
Modified: trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/CSharpDSMLGenerator.cs
==============================================================================
--- trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/CSharpDSMLGenerator.cs Thu Aug 29 11:20:04 2013 (r2315)
+++ trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/CSharpDSMLGenerator.cs Thu Aug 29 16:30:51 2013 (r2316)
@@ -36,6 +36,7 @@
/// <summary>
/// Contains information about the GUI event that initiated the invocation.
/// </summary>
+ [ComVisible(false)]
public enum ComponentStartMode
{
GME_MAIN_START = 0, // Not used by GME
@@ -81,6 +82,7 @@
/// </param>
/// <param name="startMode">Contains information about the GUI event
/// that initiated the invocation.</param>
+ [ComVisible(false)]
public void Main(
MgaProject project,
MgaFCO currentobj,
@@ -157,6 +159,7 @@
CompileDll(outputDir, compileUnit);
}
+ [ComVisible(false)]
public CodeCompileUnit GenerateDotNetCode(MgaProject project, string paradigmXmpFile, string outputDir, GeneratorMode mode)
{
//paradigm = MgaMeta.DsmlModel.GetParadigm(paradigmXmpFile);
@@ -272,6 +275,7 @@
private string language = "c#";
+ [ComVisible(false)]
public bool CompileDll(string outputDir, CodeCompileUnit compileunit)
{
@@ -348,7 +352,7 @@
}
-
+ [ComVisible(false)]
public static IEnumerable<T> FlattenMga<T>(T item, Func<T, IEnumerable<T>> next)
where T : IMgaObject
{
@@ -366,6 +370,7 @@
}
}
+ [ComVisible(false)]
public enum GeneratorMode
{
/// <summary>
@@ -389,6 +394,7 @@
Many,
}
+ [ComVisible(false)]
public List<string> CodeDomGenerateCode(
CodeDomProvider provider,
CodeCompileUnit compileunit,
Modified: trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/Generator/Base.cs
==============================================================================
--- trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/Generator/Base.cs Thu Aug 29 11:20:04 2013 (r2315)
+++ trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/Generator/Base.cs Thu Aug 29 16:30:51 2013 (r2316)
@@ -143,6 +143,9 @@
Name = "InfoClass",
};
+ newInfoClass.Comments.Add(
+ new CodeCommentStatement(Configuration.Comments.Empty, true));
+
CodeMemberProperty GuidProperty = new CodeMemberProperty()
{
Attributes = MemberAttributes.Public | MemberAttributes.Final,
@@ -151,6 +154,9 @@
Type = new CodeTypeReference("global::" + typeof(Guid).FullName),
};
+ GuidProperty.Comments.Add(
+ new CodeCommentStatement(Configuration.Comments.Empty, true));
+
GuidProperty.GetStatements.Add(
new CodeMethodReturnStatement(
new CodeObjectCreateExpression(
@@ -167,6 +173,9 @@
Type = new CodeTypeReference(typeof(string).FullName),
};
+ ParadigmNameProperty.Comments.Add(
+ new CodeCommentStatement(Configuration.Comments.Empty, true));
+
ParadigmNameProperty.GetStatements.Add(
new CodeMethodReturnStatement(
new CodeSnippetExpression("\"" + Configuration.DsmlModel.Paradigm.name + "\"")));
@@ -183,6 +192,9 @@
Type = new CodeTypeReference(typeof(string).FullName),
};
+ Version.Comments.Add(
+ new CodeCommentStatement(Configuration.Comments.Empty, true));
+
Version.GetStatements.Add(
new CodeMethodReturnStatement(
new CodeSnippetExpression("\"" + Configuration.DsmlModel.Paradigm.version + "\"")));
@@ -233,6 +245,9 @@
Type = new CodeTypeReference("global::System.Collections.Generic.Dictionary<int, global::System.Type>"),
};
+ MetaRefs.Comments.Add(
+ new CodeCommentStatement(Configuration.Comments.Empty, true));
+
StringBuilder sbMetaRefs = new StringBuilder();
sbMetaRefs.AppendLine("new global::System.Collections.Generic.Dictionary<int, global::System.Type>()");
sbMetaRefs.AppendLine("{");
@@ -268,6 +283,9 @@
Type = new CodeTypeReference(Configuration.ProjectClassNamespace + ".RootFolder.InfoClass"),
};
+ Info.Comments.Add(
+ new CodeCommentStatement(Configuration.Comments.Empty, true));
+
Info.GetStatements.Add(
new CodeMethodReturnStatement(
new CodeObjectCreateExpression(
@@ -276,7 +294,15 @@
newClass.Members.Add(Info);
}
- newClass.Comments.Add(new CodeCommentStatement("Class comments", true));
+ newClass.Comments.Add(
+ new CodeCommentStatement(@"<summary>", true));
+
+ //newClass.Comments.Add(new CodeCommentStatement("Class comments", true));
+
+ newClass.Comments.Add(
+ new CodeCommentStatement(@"</summary>", true));
+
+
// only one class inheritance
Type t = GetBaseType(Subject, false);
newClass.BaseTypes.Add(new CodeTypeReference(t));
@@ -382,6 +408,9 @@
Type = new CodeTypeReference(Configuration.ProjectClassNamespace + ".RootFolder.InfoClass"),
};
+ Info.Comments.Add(
+ new CodeCommentStatement(Configuration.Comments.Empty, true));
+
newInterface.Members.Add(Info);
CodeMemberProperty MetaRefs = new CodeMemberProperty()
@@ -394,6 +423,10 @@
Name = "MetaRefs",
Type = new CodeTypeReference("global::System.Collections.Generic.Dictionary<int, global::System.Type>"),
};
+
+ MetaRefs.Comments.Add(
+ new CodeCommentStatement(Configuration.Comments.Empty, true));
+
newInterface.Members.Add(MetaRefs);
}
Modified: trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/Generator/Configuration.cs
==============================================================================
--- trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/Generator/Configuration.cs Thu Aug 29 11:20:04 2013 (r2315)
+++ trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/Generator/Configuration.cs Thu Aug 29 16:30:51 2013 (r2316)
@@ -69,6 +69,12 @@
/// </summary>
public struct Comments
{
+ public const string Empty =
+@"<summary>
+<para></para>
+<para></para>
+</summary>";
+
public const string ArcheType =
@"<summary>
<para>the object that is at the farthest position within the chain of base objects (i.e. the one which is not derived from anything).</para>
@@ -89,13 +95,13 @@
public const string AllDstConnections =
@"<summary>
-<para></para>
+<para>Contains the domain specific destination end point of this connection.</para>
<para></para>
</summary>";
public const string AllSrcConnections =
@"<summary>
-<para></para>
+<para>Contains the domain specific source end point of this connection.</para>
<para></para>
</summary>";
Modified: trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/Generator/FCO.cs
==============================================================================
--- trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/Generator/FCO.cs Thu Aug 29 11:20:04 2013 (r2315)
+++ trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/Generator/FCO.cs Thu Aug 29 16:30:51 2013 (r2316)
@@ -74,9 +74,17 @@
ReturnType = new CodeTypeReference(
Configuration.GetInterfaceName(Subject as MgaObject)),
};
+
+ newCast.Comments.Add(
+ new CodeCommentStatement(@"<summary>", true));
+
newCast.Comments.Add(
new CodeCommentStatement("Gets a domain specific object from a COM object.", true));
+ newCast.Comments.Add(
+ new CodeCommentStatement(@"</summary>", true));
+
+
newCast.Parameters.Add(
new CodeParameterDeclarationExpression("global::" + typeof(IMgaObject).FullName, "subject"));
Modified: trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/Generator/FcoAttributes.cs
==============================================================================
--- trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/Generator/FcoAttributes.cs Thu Aug 29 11:20:04 2013 (r2315)
+++ trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/Generator/FcoAttributes.cs Thu Aug 29 16:30:51 2013 (r2316)
@@ -23,6 +23,9 @@
TypeAttributes = System.Reflection.TypeAttributes.NestedPublic,
};
+ newAttrClass.Comments.Add(
+ new CodeCommentStatement(Configuration.Comments.Empty, true));
+
CodeMemberField impl = new CodeMemberField("global::GME.MGA.IMgaObject", "Impl");
newAttrClass.Members.Add(impl);
@@ -30,6 +33,9 @@
ctor.Attributes = MemberAttributes.Public;
ctor.Parameters.Add(new CodeParameterDeclarationExpression("global::GME.MGA.IMgaObject", "impl"));
+ ctor.Comments.Add(
+ new CodeCommentStatement(Configuration.Comments.Empty, true));
+
CodeFieldReferenceExpression implReference =
new CodeFieldReferenceExpression(
new CodeThisReferenceExpression(), "Impl");
@@ -145,6 +151,9 @@
IsEnum = true,
};
+ enumAttr.Comments.Add(
+ new CodeCommentStatement(Configuration.Comments.Empty, true));
+
List<string> enumKeys = new List<string>();
// TODO: default item???
Modified: trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/Generator/FcoChildren.cs
==============================================================================
--- trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/Generator/FcoChildren.cs Thu Aug 29 11:20:04 2013 (r2315)
+++ trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/Generator/FcoChildren.cs Thu Aug 29 16:30:51 2013 (r2316)
@@ -23,6 +23,9 @@
TypeAttributes = System.Reflection.TypeAttributes.NestedPublic,
};
+ newChildrenClass.Comments.Add(
+ new CodeCommentStatement(Configuration.Comments.Empty, true));
+
CodeMemberField impl = new CodeMemberField("global::GME.MGA.IMgaObject", "Impl");
newChildrenClass.Members.Add(impl);
@@ -49,6 +52,9 @@
ctorFolder.Attributes = MemberAttributes.Public;
ctorFolder.Parameters.Add(new CodeParameterDeclarationExpression("global::GME.MGA.MgaFolder", "impl"));
+ ctorFolder.Comments.Add(
+ new CodeCommentStatement(Configuration.Comments.Empty, true));
+
ctorFolder.Statements.Add(new CodeAssignStatement(implReferenceFolder,
new CodeArgumentReferenceExpression("impl")));
@@ -62,6 +68,9 @@
ctorModel.Attributes = MemberAttributes.Public;
ctorModel.Parameters.Add(new CodeParameterDeclarationExpression("global::GME.MGA.MgaModel", "impl"));
+ ctorModel.Comments.Add(
+ new CodeCommentStatement(Configuration.Comments.Empty, true));
+
ctorModel.Statements.Add(new CodeAssignStatement(implReferenceModel,
new CodeArgumentReferenceExpression("impl")));
Modified: trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/Generator/FcoReference.cs
==============================================================================
--- trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/Generator/FcoReference.cs Thu Aug 29 11:20:04 2013 (r2315)
+++ trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/Generator/FcoReference.cs Thu Aug 29 16:30:51 2013 (r2316)
@@ -39,6 +39,9 @@
TypeAttributes = System.Reflection.TypeAttributes.NestedPublic,
};
+ newRefClass.Comments.Add(
+ new CodeCommentStatement(Configuration.Comments.Empty, true));
+
CodeMemberField impl = new CodeMemberField("global::GME.MGA.IMgaObject", "Impl");
newRefClass.Members.Add(impl);
@@ -46,6 +49,9 @@
ctor.Attributes = MemberAttributes.Public;
ctor.Parameters.Add(new CodeParameterDeclarationExpression("global::GME.MGA.IMgaObject", "impl"));
+ ctor.Comments.Add(
+ new CodeCommentStatement(Configuration.Comments.Empty, true));
+
CodeFieldReferenceExpression implReference =
new CodeFieldReferenceExpression(
new CodeThisReferenceExpression(), "Impl");
@@ -299,6 +305,9 @@
TypeAttributes = System.Reflection.TypeAttributes.NestedPublic,
};
+ newRefClass.Comments.Add(
+ new CodeCommentStatement(Configuration.Comments.Empty, true));
+
CodeMemberField impl = new CodeMemberField("global::GME.MGA.IMgaObject", "Impl");
newRefClass.Members.Add(impl);
@@ -306,6 +315,9 @@
ctor.Attributes = MemberAttributes.Public;
ctor.Parameters.Add(new CodeParameterDeclarationExpression("global::GME.MGA.IMgaObject", "impl"));
+ ctor.Comments.Add(
+ new CodeCommentStatement(Configuration.Comments.Empty, true));
+
CodeFieldReferenceExpression implReference =
new CodeFieldReferenceExpression(
new CodeThisReferenceExpression(), "Impl");
Modified: trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/Generator/FcoSet.cs
==============================================================================
--- trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/Generator/FcoSet.cs Thu Aug 29 11:20:04 2013 (r2315)
+++ trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/Generator/FcoSet.cs Thu Aug 29 16:30:51 2013 (r2316)
@@ -39,6 +39,9 @@
TypeAttributes = System.Reflection.TypeAttributes.NestedPublic,
};
+ newRefClass.Comments.Add(
+ new CodeCommentStatement(Configuration.Comments.Empty, true));
+
CodeMemberField impl = new CodeMemberField("global::GME.MGA.IMgaObject", "Impl");
newRefClass.Members.Add(impl);
@@ -46,6 +49,9 @@
ctor.Attributes = MemberAttributes.Public;
ctor.Parameters.Add(new CodeParameterDeclarationExpression("global::GME.MGA.IMgaObject", "impl"));
+ ctor.Comments.Add(
+ new CodeCommentStatement(Configuration.Comments.Empty, true));
+
CodeFieldReferenceExpression implReference =
new CodeFieldReferenceExpression(
new CodeThisReferenceExpression(), "Impl");
@@ -284,12 +290,18 @@
TypeAttributes = System.Reflection.TypeAttributes.NestedPublic,
};
+ newRefClass.Comments.Add(
+ new CodeCommentStatement(Configuration.Comments.Empty, true));
+
CodeMemberField impl = new CodeMemberField("global::GME.MGA.IMgaObject", "Impl");
newRefClass.Members.Add(impl);
CodeConstructor ctor = new CodeConstructor();
ctor.Attributes = MemberAttributes.Public;
- ctor.Parameters.Add(new CodeParameterDeclarationExpression("global::GME.MGA.IMgaObject", "impl"));
+ ctor.Parameters.Add(new CodeParameterDeclarationExpression("global::GME.MGA.IMgaObject", "impl"));
+
+ ctor.Comments.Add(
+ new CodeCommentStatement(Configuration.Comments.Empty, true));
CodeFieldReferenceExpression implReference =
new CodeFieldReferenceExpression(
@@ -472,8 +484,8 @@
newAllReferencedBy.Attributes = newAllReferencedBy.Attributes | MemberAttributes.New;
}
- newAllReferencedBy.Comments.Add(
- new CodeCommentStatement("Contains the domain specific ....", true));
+ newAllReferencedBy.Comments.Add(
+ new CodeCommentStatement(Configuration.Comments.Empty, true));
GeneratedInterface.Types[0].Members.Add(newAllReferencedBy);
@@ -486,6 +498,9 @@
Configuration.GetClassName(Subject) + ".MembersOfSetClass"),
};
+ newReferencedBy.Comments.Add(
+ new CodeCommentStatement(Configuration.Comments.Empty, true));
+
if (baseClassesWoObject.Count > 0)
{
newReferencedBy.Attributes = newReferencedBy.Attributes | MemberAttributes.New;
Modified: trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/Generator/FcoSrcDstConnections.cs
==============================================================================
--- trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/Generator/FcoSrcDstConnections.cs Thu Aug 29 11:20:04 2013 (r2315)
+++ trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/Generator/FcoSrcDstConnections.cs Thu Aug 29 16:30:51 2013 (r2316)
@@ -40,6 +40,9 @@
TypeAttributes = System.Reflection.TypeAttributes.NestedPublic,
};
+ newSrcConn.Comments.Add(
+ new CodeCommentStatement(Configuration.Comments.Empty, true));
+
CodeMemberField impl = new CodeMemberField("global::GME.MGA.IMgaObject", "Impl");
newSrcConn.Members.Add(impl);
@@ -47,6 +50,9 @@
ctor.Attributes = MemberAttributes.Public;
ctor.Parameters.Add(new CodeParameterDeclarationExpression("global::GME.MGA.IMgaObject", "impl"));
+ ctor.Comments.Add(
+ new CodeCommentStatement(Configuration.Comments.Empty, true));
+
CodeFieldReferenceExpression implReference =
new CodeFieldReferenceExpression(
new CodeThisReferenceExpression(), "Impl");
@@ -187,6 +193,9 @@
TypeAttributes = System.Reflection.TypeAttributes.NestedPublic,
};
+ newDstConn.Comments.Add(
+ new CodeCommentStatement(Configuration.Comments.Empty, true));
+
CodeMemberField impl = new CodeMemberField("global::GME.MGA.IMgaObject", "Impl");
newDstConn.Members.Add(impl);
@@ -194,6 +203,9 @@
ctor.Attributes = MemberAttributes.Public;
ctor.Parameters.Add(new CodeParameterDeclarationExpression("global::GME.MGA.IMgaObject", "impl"));
+ ctor.Comments.Add(
+ new CodeCommentStatement(Configuration.Comments.Empty, true));
+
CodeFieldReferenceExpression implReference =
new CodeFieldReferenceExpression(
new CodeThisReferenceExpression(), "Impl");
Modified: trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/Generator/FcoSrcDstEnd.cs
==============================================================================
--- trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/Generator/FcoSrcDstEnd.cs Thu Aug 29 11:20:04 2013 (r2315)
+++ trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/Generator/FcoSrcDstEnd.cs Thu Aug 29 16:30:51 2013 (r2316)
@@ -40,6 +40,9 @@
TypeAttributes = System.Reflection.TypeAttributes.NestedPublic,
};
+ newSrcConn.Comments.Add(
+ new CodeCommentStatement(Configuration.Comments.Empty, true));
+
CodeMemberField impl = new CodeMemberField("global::GME.MGA.IMgaObject", "Impl");
newSrcConn.Members.Add(impl);
@@ -47,6 +50,9 @@
ctor.Attributes = MemberAttributes.Public;
ctor.Parameters.Add(new CodeParameterDeclarationExpression("global::GME.MGA.IMgaObject", "impl"));
+ ctor.Comments.Add(
+ new CodeCommentStatement(Configuration.Comments.Empty, true));
+
CodeFieldReferenceExpression implReference =
new CodeFieldReferenceExpression(
new CodeThisReferenceExpression(), "Impl");
@@ -200,6 +206,9 @@
TypeAttributes = System.Reflection.TypeAttributes.NestedPublic,
};
+ newDstConn.Comments.Add(
+ new CodeCommentStatement(Configuration.Comments.Empty, true));
+
CodeMemberField impl = new CodeMemberField("global::GME.MGA.IMgaObject", "Impl");
newDstConn.Members.Add(impl);
@@ -207,6 +216,9 @@
ctor.Attributes = MemberAttributes.Public;
ctor.Parameters.Add(new CodeParameterDeclarationExpression("global::GME.MGA.IMgaObject", "impl"));
+ ctor.Comments.Add(
+ new CodeCommentStatement(Configuration.Comments.Empty, true));
+
CodeFieldReferenceExpression implReference =
new CodeFieldReferenceExpression(
new CodeThisReferenceExpression(), "Impl");
@@ -355,8 +367,8 @@
newAllSrcConnections.Attributes = newAllSrcConnections.Attributes | MemberAttributes.New;
}
- newAllSrcConnections.Comments.Add(
- new CodeCommentStatement("Contains the domain specific source end point of this connection.", true));
+ newAllSrcConnections.Comments.Add(
+ new CodeCommentStatement(Configuration.Comments.AllSrcConnections, true));
GeneratedInterface.Types[0].Members.Add(newAllSrcConnections);
@@ -369,6 +381,10 @@
Configuration.GetClassName(Subject) + ".SrcEndsClass"),
};
+ newSrcConnections.Comments.Add(
+ new CodeCommentStatement(Configuration.Comments.SrcConnections, true));
+
+
if (baseClassesWoObject.Count > 0)
{
newSrcConnections.Attributes = newSrcConnections.Attributes | MemberAttributes.New;
@@ -393,8 +409,8 @@
newAllDstConnections.Attributes = newAllDstConnections.Attributes | MemberAttributes.New;
}
- newAllDstConnections.Comments.Add(
- new CodeCommentStatement("Contains the domain specific destination end point of this connection.", true));
+ newAllDstConnections.Comments.Add(
+ new CodeCommentStatement(Configuration.Comments.AllDstConnections, true));
GeneratedInterface.Types[0].Members.Add(newAllDstConnections);
@@ -407,6 +423,9 @@
Configuration.GetClassName(Subject) + ".DstEndsClass"),
};
+ newDstConnections.Comments.Add(
+ new CodeCommentStatement(Configuration.Comments.DstConnections, true));
+
if (baseClassesWoObject.Count > 0)
{
newDstConnections.Attributes = newDstConnections.Attributes | MemberAttributes.New;
Modified: trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/Properties/AssemblyInfo.cs
==============================================================================
--- trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/Properties/AssemblyInfo.cs Thu Aug 29 11:20:04 2013 (r2315)
+++ trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/Properties/AssemblyInfo.cs Thu Aug 29 16:30:51 2013 (r2316)
@@ -32,7 +32,7 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
-// Keep in sync with app.manifest and GME_SDK.wxs
-[assembly: AssemblyVersion("1.0.10.0")]
-[assembly: AssemblyFileVersion("1.0.10.0")]
-// also change GME_SDK.wxs
+
+// Keep in sync with app.manifest, GME_SDK.wxs, and GME.DSMLGenerator.nuspec
+[assembly: AssemblyVersion("1.0.11.0")]
+[assembly: AssemblyFileVersion("1.0.11.0")]
Modified: trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/app.manifest
==============================================================================
--- trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/app.manifest Thu Aug 29 11:20:04 2013 (r2315)
+++ trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/app.manifest Thu Aug 29 16:30:51 2013 (r2316)
@@ -3,7 +3,7 @@
<assemblyIdentity
type="win32"
name="CSharpDSMLGenerator"
- version="1.0.10.0"
+ version="1.0.11.0"
publicKeyToken="1321e6b92842fe54"
processorArchitecture="msil" />
<clrClass
Modified: trunk/SDK/DotNet/DsmlGenerator/GME.DSMLGenerator.nuspec
==============================================================================
--- trunk/SDK/DotNet/DsmlGenerator/GME.DSMLGenerator.nuspec Thu Aug 29 11:20:04 2013 (r2315)
+++ trunk/SDK/DotNet/DsmlGenerator/GME.DSMLGenerator.nuspec Thu Aug 29 16:30:51 2013 (r2316)
@@ -2,7 +2,7 @@
<package >
<metadata>
<id>GME.DSMLGenerator</id>
- <version>1.0.10.1</version>
+ <version>1.0.11.0</version>
<title>GME DSMLGenerator</title>
<authors>ISIS, Vanderbilt University</authors>
<owners>ksmyth</owners>
More information about the gme-commit
mailing list