[commit] r2325 - 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
Fri Aug 30 16:21:06 CDT 2013
Author: ksmyth
Date: Fri Aug 30 16:21:06 2013
New Revision: 2325
Log:
DsmlGenerator: use override or new where applicable
Modified:
trunk/Install/GME_SDK.wxs
trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/Generator/Base.cs
trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/Generator/FcoArcheType.cs
trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/Generator/FcoAttributes.cs
trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/Generator/FcoChildren.cs
trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/Generator/FcoParentContainer.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 Fri Aug 30 16:20:14 2013 (r2324)
+++ trunk/Install/GME_SDK.wxs Fri Aug 30 16:21:06 2013 (r2325)
@@ -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.11.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.12.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/Generator/Base.cs
==============================================================================
--- trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/Generator/Base.cs Fri Aug 30 16:20:14 2013 (r2324)
+++ trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/Generator/Base.cs Fri Aug 30 16:21:06 2013 (r2325)
@@ -238,7 +238,6 @@
{
Attributes =
MemberAttributes.Public |
- MemberAttributes.Final |
MemberAttributes.Override,
HasGet = true,
Name = "MetaRefs",
@@ -417,8 +416,7 @@
{
Attributes =
MemberAttributes.Public |
- MemberAttributes.Final |
- MemberAttributes.Override,
+ MemberAttributes.New,
HasGet = true,
Name = "MetaRefs",
Type = new CodeTypeReference("global::System.Collections.Generic.Dictionary<int, global::System.Type>"),
Modified: trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/Generator/FcoArcheType.cs
==============================================================================
--- trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/Generator/FcoArcheType.cs Fri Aug 30 16:20:14 2013 (r2324)
+++ trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/Generator/FcoArcheType.cs Fri Aug 30 16:21:06 2013 (r2325)
@@ -27,7 +27,7 @@
{
CodeMemberProperty newArcheType = new CodeMemberProperty()
{
- Attributes = MemberAttributes.Final,
+ Attributes = MemberAttributes.Override,
HasGet = true,
Name = Configuration.GetInterfaceName(child as MgaObject) + ".ArcheType",
Type = new CodeTypeReference(Configuration.GetInterfaceName(child as MgaObject)),
@@ -56,19 +56,13 @@
//(Impl as global::GME.MGA.MgaFCO).ArcheType
CodeMemberProperty newArcheType = new CodeMemberProperty()
{
- Attributes = MemberAttributes.Public,
+ Attributes = MemberAttributes.Public | MemberAttributes.Override,
HasGet = true,
Name = "ArcheType",
Type = new CodeTypeReference(
Configuration.GetInterfaceName(Subject)),
};
- if (baseClasses.Count > 1)
- {
- newArcheType.Attributes =
- newArcheType.Attributes | MemberAttributes.New;
- }
-
newArcheType.Comments.Add(
new CodeCommentStatement(Configuration.Comments.ArcheType, true));
Modified: trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/Generator/FcoAttributes.cs
==============================================================================
--- trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/Generator/FcoAttributes.cs Fri Aug 30 16:20:14 2013 (r2324)
+++ trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/Generator/FcoAttributes.cs Fri Aug 30 16:21:06 2013 (r2325)
@@ -180,7 +180,7 @@
};
codeProperty.Comments.Add(new CodeCommentStatement(@"<summary>", true));
- codeProperty.Comments.Add(new CodeCommentStatement(key, true));
+ codeProperty.Comments.Add(new CodeCommentStatement(new System.Xml.Linq.XText(key).ToString(), true));
codeProperty.Comments.Add(new CodeCommentStatement(@"</summary>", true));
if (enumAttr.Members.Cast<CodeMemberField>().Any(x => x.Name == codeProperty.Name))
@@ -534,8 +534,8 @@
Type = new CodeTypeReference(Configuration.GetClassName(Subject) + ".AttributesClass"),
};
- if (baseClasses.Count > 1)
- {
+ if (baseClassesWoObject.Count > 0)
+ {
newAttrProperty.Attributes =
newAttrProperty.Attributes | MemberAttributes.New;
}
Modified: trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/Generator/FcoChildren.cs
==============================================================================
--- trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/Generator/FcoChildren.cs Fri Aug 30 16:20:14 2013 (r2324)
+++ trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/Generator/FcoChildren.cs Fri Aug 30 16:21:06 2013 (r2325)
@@ -486,23 +486,23 @@
newChildrenProperty.Comments.Add(
new CodeCommentStatement(Configuration.Comments.Children, true));
+ if (baseClassesWoObject.Any(x => x.MetaBase.MetaRef == Subject.MetaBase.MetaRef))
+ {
+ newChildrenProperty.Attributes =
+ newChildrenProperty.Attributes | MemberAttributes.New;
+ }
+
GeneratedInterface.Types[0].Members.Add(newChildrenProperty);
CodeMemberProperty newAllChildrenProperty = new CodeMemberProperty()
{
- Attributes = MemberAttributes.Public,
+ Attributes = MemberAttributes.Public | MemberAttributes.Override,
HasGet = true,
Name = "AllChildren",
Type = new CodeTypeReference(
"global::System.Collections.Generic.IEnumerable<" + typeof(ISIS.GME.Common.Interfaces.Base).FullName + ">"),
};
- if (baseClasses.Count > 1)
- {
- newAllChildrenProperty.Attributes =
- newAllChildrenProperty.Attributes | MemberAttributes.New;
- }
-
newAllChildrenProperty.Comments.Add(
new CodeCommentStatement(Configuration.Comments.AllChildren, true));
Modified: trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/Generator/FcoParentContainer.cs
==============================================================================
--- trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/Generator/FcoParentContainer.cs Fri Aug 30 16:20:14 2013 (r2324)
+++ trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/Generator/FcoParentContainer.cs Fri Aug 30 16:21:06 2013 (r2325)
@@ -204,7 +204,7 @@
{
CodeMemberProperty newParentContainer = new CodeMemberProperty()
{
- Attributes = MemberAttributes.Public | MemberAttributes.New,
+ Attributes = MemberAttributes.Public | MemberAttributes.Override,
HasGet = true,
Name = "ParentContainer",
Type = new CodeTypeReference(typeof(ISIS.GME.Common.Interfaces.Container).FullName),
@@ -231,7 +231,7 @@
CodeMemberProperty newParentContainer = new CodeMemberProperty()
{
- Attributes = MemberAttributes.Public | MemberAttributes.New,
+ Attributes = MemberAttributes.Public | MemberAttributes.Override,
HasGet = true,
Name = "ParentContainer",
Type = new CodeTypeReference(typeof(ISIS.GME.Common.Interfaces.Container).FullName),
Modified: trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/Generator/FcoReference.cs
==============================================================================
--- trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/Generator/FcoReference.cs Fri Aug 30 16:20:14 2013 (r2324)
+++ trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/Generator/FcoReference.cs Fri Aug 30 16:21:06 2013 (r2325)
@@ -239,10 +239,10 @@
Type = new CodeTypeReference(typeof(ISIS.GME.Common.Interfaces.FCO).FullName),
};
- if (baseClasses.Count > 1)
- {
+ if (baseClassesWoObject.Any(x => x.MetaBase.MetaRef == Subject.MetaBase.MetaRef))
+ {
newAllReferred.Attributes =
- newAllReferred.Attributes | MemberAttributes.New;
+ newAllReferred.Attributes | MemberAttributes.Override;
}
newAllReferred.Comments.Add(
@@ -259,8 +259,8 @@
Configuration.GetClassName(Subject) + ".ReferredClass"),
};
- if (baseClasses.Count > 1)
- {
+ if (baseClassesWoObject.Any(x => x.MetaBase.MetaRef == Subject.MetaBase.MetaRef))
+ {
newReferred.Attributes =
newReferred.Attributes | MemberAttributes.New;
}
@@ -494,10 +494,10 @@
"global::System.Collections.Generic.IEnumerable<" + typeof(ISIS.GME.Common.Interfaces.FCO).FullName + ">"),
};
- if (baseClasses.Count > 1)
+ if (baseClassesWoObject.Any(x => x.MetaBase.MetaRef == Subject.MetaBase.MetaRef))
{
newAllReferencedBy.Attributes =
- newAllReferencedBy.Attributes | MemberAttributes.New;
+ newAllReferencedBy.Attributes | MemberAttributes.Override;
}
newAllReferencedBy.Comments.Add(
@@ -514,7 +514,7 @@
Configuration.GetClassName(Subject) + ".ReferencedByClass"),
};
- if (baseClassesWoObject.Count > 0)
+ if (baseClassesWoObject.Any(x => x.MetaBase.MetaRef == Subject.MetaBase.MetaRef))
{
newReferencedBy.Attributes =
newReferencedBy.Attributes | MemberAttributes.New;
Modified: trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/Generator/FcoSet.cs
==============================================================================
--- trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/Generator/FcoSet.cs Fri Aug 30 16:20:14 2013 (r2324)
+++ trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/Generator/FcoSet.cs Fri Aug 30 16:21:06 2013 (r2325)
@@ -148,6 +148,12 @@
Type = new CodeTypeReference("global::System.Collections.Generic.IEnumerable <" + typeof(ISIS.GME.Common.Interfaces.FCO).FullName + ">"),
};
+ if (baseClassesWoObject.Any(x => x.MetaBase.MetaRef == Subject.MetaBase.MetaRef))
+ {
+ newAllReferred.Attributes =
+ newAllReferred.Attributes | MemberAttributes.Override;
+ }
+
newAllReferred.Comments.Add(new CodeCommentStatement("", true));
newAllReferred.GetStatements.Add(
@@ -221,7 +227,7 @@
{
if (Subject.MetaBase.Name == "Set")
{
- CodeMemberProperty newAllReferred = new CodeMemberProperty()
+ CodeMemberProperty newAllSetMembers = new CodeMemberProperty()
{
Attributes = MemberAttributes.Public,
HasGet = true,
@@ -229,15 +235,16 @@
Type = new CodeTypeReference("global::System.Collections.Generic.IEnumerable <" + typeof(ISIS.GME.Common.Interfaces.FCO).FullName + ">"),
};
- if (baseClassesWoObject.Count > 0)
- {
- newAllReferred.Attributes = newAllReferred.Attributes | MemberAttributes.New;
- }
+ if (baseClassesWoObject.Any(x => x.MetaBase.MetaRef == Subject.MetaBase.MetaRef))
+ {
+ newAllSetMembers.Attributes =
+ newAllSetMembers.Attributes | MemberAttributes.Override;
+ }
- newAllReferred.Comments.Add(
+ newAllSetMembers.Comments.Add(
new CodeCommentStatement("Contains the domain specific ....", true));
- GeneratedInterface.Types[0].Members.Add(newAllReferred);
+ GeneratedInterface.Types[0].Members.Add(newAllSetMembers);
CodeMemberProperty newReferred = new CodeMemberProperty()
{
Modified: trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/Generator/FcoSrcDstConnections.cs
==============================================================================
--- trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/Generator/FcoSrcDstConnections.cs Fri Aug 30 16:20:14 2013 (r2324)
+++ trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/Generator/FcoSrcDstConnections.cs Fri Aug 30 16:21:06 2013 (r2325)
@@ -333,10 +333,10 @@
Type = new CodeTypeReference("global::System.Collections.Generic.IEnumerable<" + typeof(ISIS.GME.Common.Interfaces.Connection).FullName + ">"),
};
- if (baseClasses.Count > 1)
- {
+ if (baseClassesWoObject.Any(x => x.MetaBase.MetaRef == Subject.MetaBase.MetaRef))
+ {
newAllSrcConnections.Attributes =
- newAllSrcConnections.Attributes | MemberAttributes.New;
+ newAllSrcConnections.Attributes | MemberAttributes.Override;
}
newAllSrcConnections.Comments.Add(
@@ -353,8 +353,8 @@
Configuration.GetClassName(Subject) + ".SrcConnectionsClass"),
};
- if (baseClasses.Count > 1)
- {
+ if (baseClassesWoObject.Any(x => x.MetaBase.MetaRef == Subject.MetaBase.MetaRef))
+ {
newSrcConnections.Attributes =
newSrcConnections.Attributes | MemberAttributes.New;
}
@@ -378,10 +378,10 @@
Type = new CodeTypeReference("global::System.Collections.Generic.IEnumerable<" + typeof(ISIS.GME.Common.Interfaces.Connection).FullName + ">"),
};
- if (baseClasses.Count > 1)
- {
+ if (baseClassesWoObject.Any(x => x.MetaBase.MetaRef == Subject.MetaBase.MetaRef))
+ {
newAllDstConnections.Attributes =
- newAllDstConnections.Attributes | MemberAttributes.New;
+ newAllDstConnections.Attributes | MemberAttributes.Override;
}
newAllDstConnections.Comments.Add(
@@ -398,8 +398,8 @@
Configuration.GetClassName(Subject) + ".DstConnectionsClass"),
};
- if (baseClasses.Count > 1)
- {
+ if (baseClassesWoObject.Any(x => x.MetaBase.MetaRef == Subject.MetaBase.MetaRef))
+ {
newDstConnections.Attributes =
newDstConnections.Attributes | MemberAttributes.New;
}
Modified: trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/Generator/FcoSrcDstEnd.cs
==============================================================================
--- trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/Generator/FcoSrcDstEnd.cs Fri Aug 30 16:20:14 2013 (r2324)
+++ trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/Generator/FcoSrcDstEnd.cs Fri Aug 30 16:21:06 2013 (r2325)
@@ -362,9 +362,9 @@
Type = new CodeTypeReference(typeof(ISIS.GME.Common.Interfaces.FCO).FullName),
};
- if (baseClassesWoObject.Count > 0)
- {
- newAllSrcConnections.Attributes = newAllSrcConnections.Attributes | MemberAttributes.New;
+ if (baseClassesWoObject.Any(x => x.MetaBase.MetaRef == Subject.MetaBase.MetaRef))
+ {
+ newAllSrcConnections.Attributes = newAllSrcConnections.Attributes | MemberAttributes.Override;
}
newAllSrcConnections.Comments.Add(
@@ -385,8 +385,8 @@
new CodeCommentStatement(Configuration.Comments.SrcConnections, true));
- if (baseClassesWoObject.Count > 0)
- {
+ if (baseClassesWoObject.Any(x => x.MetaBase.MetaRef == Subject.MetaBase.MetaRef))
+ {
newSrcConnections.Attributes = newSrcConnections.Attributes | MemberAttributes.New;
}
@@ -404,9 +404,9 @@
Type = new CodeTypeReference(typeof(ISIS.GME.Common.Interfaces.FCO).FullName),
};
- if (baseClassesWoObject.Count > 0)
- {
- newAllDstConnections.Attributes = newAllDstConnections.Attributes | MemberAttributes.New;
+ if (baseClassesWoObject.Any(x => x.MetaBase.MetaRef == Subject.MetaBase.MetaRef))
+ {
+ newAllDstConnections.Attributes = newAllDstConnections.Attributes | MemberAttributes.Override;
}
newAllDstConnections.Comments.Add(
@@ -426,8 +426,8 @@
newDstConnections.Comments.Add(
new CodeCommentStatement(Configuration.Comments.DstConnections, true));
- if (baseClassesWoObject.Count > 0)
- {
+ if (baseClassesWoObject.Any(x => x.MetaBase.MetaRef == Subject.MetaBase.MetaRef)
+ {
newDstConnections.Attributes = newDstConnections.Attributes | MemberAttributes.New;
}
Modified: trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/Properties/AssemblyInfo.cs
==============================================================================
--- trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/Properties/AssemblyInfo.cs Fri Aug 30 16:20:14 2013 (r2324)
+++ trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/Properties/AssemblyInfo.cs Fri Aug 30 16:21:06 2013 (r2325)
@@ -34,5 +34,5 @@
// [assembly: AssemblyVersion("1.0.*")]
// 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")]
+[assembly: AssemblyVersion("1.0.12.0")]
+[assembly: AssemblyFileVersion("1.0.12.0")]
Modified: trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/app.manifest
==============================================================================
--- trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/app.manifest Fri Aug 30 16:20:14 2013 (r2324)
+++ trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/app.manifest Fri Aug 30 16:21:06 2013 (r2325)
@@ -3,7 +3,7 @@
<assemblyIdentity
type="win32"
name="CSharpDSMLGenerator"
- version="1.0.11.0"
+ version="1.0.12.0"
publicKeyToken="1321e6b92842fe54"
processorArchitecture="msil" />
<clrClass
Modified: trunk/SDK/DotNet/DsmlGenerator/GME.DSMLGenerator.nuspec
==============================================================================
--- trunk/SDK/DotNet/DsmlGenerator/GME.DSMLGenerator.nuspec Fri Aug 30 16:20:14 2013 (r2324)
+++ trunk/SDK/DotNet/DsmlGenerator/GME.DSMLGenerator.nuspec Fri Aug 30 16:21:06 2013 (r2325)
@@ -2,7 +2,7 @@
<package >
<metadata>
<id>GME.DSMLGenerator</id>
- <version>1.0.11.0</version>
+ <version>1.0.12.0</version>
<title>GME DSMLGenerator</title>
<authors>ISIS, Vanderbilt University</authors>
<owners>ksmyth</owners>
More information about the gme-commit
mailing list