[commit] r2327 - 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 17:57:32 CDT 2013
Author: ksmyth
Date: Fri Aug 30 17:57:32 2013
New Revision: 2327
Log:
DsmlGenerator: use new more
Modified:
trunk/Install/GME_SDK.wxs
trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/Generator/FcoArcheType.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:26:16 2013 (r2326)
+++ trunk/Install/GME_SDK.wxs Fri Aug 30 17:57:32 2013 (r2327)
@@ -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.12.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.1, 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/FcoArcheType.cs
==============================================================================
--- trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/Generator/FcoArcheType.cs Fri Aug 30 16:26:16 2013 (r2326)
+++ trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/Generator/FcoArcheType.cs Fri Aug 30 17:57:32 2013 (r2327)
@@ -27,7 +27,7 @@
{
CodeMemberProperty newArcheType = new CodeMemberProperty()
{
- Attributes = MemberAttributes.Override,
+ Attributes = MemberAttributes.Final,
HasGet = true,
Name = Configuration.GetInterfaceName(child as MgaObject) + ".ArcheType",
Type = new CodeTypeReference(Configuration.GetInterfaceName(child as MgaObject)),
@@ -56,13 +56,19 @@
//(Impl as global::GME.MGA.MgaFCO).ArcheType
CodeMemberProperty newArcheType = new CodeMemberProperty()
{
- Attributes = MemberAttributes.Public | MemberAttributes.Override,
+ Attributes = MemberAttributes.Public,
HasGet = true,
Name = "ArcheType",
Type = new CodeTypeReference(
Configuration.GetInterfaceName(Subject)),
};
+ if (baseClassesWoObject.Count > 0)
+ {
+ newArcheType.Attributes =
+ newArcheType.Attributes | MemberAttributes.New;
+ }
+
newArcheType.Comments.Add(
new CodeCommentStatement(Configuration.Comments.ArcheType, true));
Modified: trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/Generator/FcoChildren.cs
==============================================================================
--- trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/Generator/FcoChildren.cs Fri Aug 30 16:26:16 2013 (r2326)
+++ trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/Generator/FcoChildren.cs Fri Aug 30 17:57:32 2013 (r2327)
@@ -496,7 +496,7 @@
CodeMemberProperty newAllChildrenProperty = new CodeMemberProperty()
{
- Attributes = MemberAttributes.Public | MemberAttributes.Override,
+ Attributes = MemberAttributes.Public | MemberAttributes.New,
HasGet = true,
Name = "AllChildren",
Type = new CodeTypeReference(
Modified: trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/Generator/FcoParentContainer.cs
==============================================================================
--- trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/Generator/FcoParentContainer.cs Fri Aug 30 16:26:16 2013 (r2326)
+++ trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/Generator/FcoParentContainer.cs Fri Aug 30 17:57:32 2013 (r2327)
@@ -204,7 +204,7 @@
{
CodeMemberProperty newParentContainer = new CodeMemberProperty()
{
- Attributes = MemberAttributes.Public | MemberAttributes.Override,
+ Attributes = MemberAttributes.Public | MemberAttributes.New,
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.Override,
+ Attributes = MemberAttributes.Public | MemberAttributes.New,
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:26:16 2013 (r2326)
+++ trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/Generator/FcoReference.cs Fri Aug 30 17:57:32 2013 (r2327)
@@ -242,7 +242,7 @@
if (baseClassesWoObject.Any(x => x.MetaBase.MetaRef == Subject.MetaBase.MetaRef))
{
newAllReferred.Attributes =
- newAllReferred.Attributes | MemberAttributes.Override;
+ newAllReferred.Attributes | MemberAttributes.New;
}
newAllReferred.Comments.Add(
@@ -494,10 +494,10 @@
"global::System.Collections.Generic.IEnumerable<" + typeof(ISIS.GME.Common.Interfaces.FCO).FullName + ">"),
};
- if (baseClassesWoObject.Any(x => x.MetaBase.MetaRef == Subject.MetaBase.MetaRef))
+ if (baseClassesWoObject.Count > 0)
{
newAllReferencedBy.Attributes =
- newAllReferencedBy.Attributes | MemberAttributes.Override;
+ newAllReferencedBy.Attributes | MemberAttributes.New;
}
newAllReferencedBy.Comments.Add(
@@ -514,7 +514,7 @@
Configuration.GetClassName(Subject) + ".ReferencedByClass"),
};
- if (baseClassesWoObject.Any(x => x.MetaBase.MetaRef == Subject.MetaBase.MetaRef))
+ if (baseClassesWoObject.Count > 0)
{
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:26:16 2013 (r2326)
+++ trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/Generator/FcoSet.cs Fri Aug 30 17:57:32 2013 (r2327)
@@ -142,18 +142,12 @@
CodeMemberProperty newAllReferred = new CodeMemberProperty()
{
- Attributes = MemberAttributes.Public,
+ Attributes = MemberAttributes.Public | MemberAttributes.New,
HasGet = true,
Name = "AllSetMembers",
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(
@@ -227,7 +221,7 @@
{
if (Subject.MetaBase.Name == "Set")
{
- CodeMemberProperty newAllSetMembers = new CodeMemberProperty()
+ CodeMemberProperty newAllReferred = new CodeMemberProperty()
{
Attributes = MemberAttributes.Public,
HasGet = true,
@@ -235,16 +229,15 @@
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))
- {
- newAllSetMembers.Attributes =
- newAllSetMembers.Attributes | MemberAttributes.Override;
- }
+ if (baseClassesWoObject.Count > 0)
+ {
+ newAllReferred.Attributes = newAllReferred.Attributes | MemberAttributes.New;
+ }
- newAllSetMembers.Comments.Add(
+ newAllReferred.Comments.Add(
new CodeCommentStatement("Contains the domain specific ....", true));
- GeneratedInterface.Types[0].Members.Add(newAllSetMembers);
+ GeneratedInterface.Types[0].Members.Add(newAllReferred);
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:26:16 2013 (r2326)
+++ trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/Generator/FcoSrcDstConnections.cs Fri Aug 30 17:57:32 2013 (r2327)
@@ -333,10 +333,10 @@
Type = new CodeTypeReference("global::System.Collections.Generic.IEnumerable<" + typeof(ISIS.GME.Common.Interfaces.Connection).FullName + ">"),
};
- if (baseClassesWoObject.Any(x => x.MetaBase.MetaRef == Subject.MetaBase.MetaRef))
+ if (baseClasses.Count > 1)
{
newAllSrcConnections.Attributes =
- newAllSrcConnections.Attributes | MemberAttributes.Override;
+ newAllSrcConnections.Attributes | MemberAttributes.New;
}
newAllSrcConnections.Comments.Add(
@@ -353,7 +353,7 @@
Configuration.GetClassName(Subject) + ".SrcConnectionsClass"),
};
- if (baseClassesWoObject.Any(x => x.MetaBase.MetaRef == Subject.MetaBase.MetaRef))
+ if (baseClasses.Count > 1)
{
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 (baseClassesWoObject.Any(x => x.MetaBase.MetaRef == Subject.MetaBase.MetaRef))
+ if (baseClasses.Count > 1)
{
newAllDstConnections.Attributes =
- newAllDstConnections.Attributes | MemberAttributes.Override;
+ newAllDstConnections.Attributes | MemberAttributes.New;
}
newAllDstConnections.Comments.Add(
@@ -398,7 +398,7 @@
Configuration.GetClassName(Subject) + ".DstConnectionsClass"),
};
- if (baseClassesWoObject.Any(x => x.MetaBase.MetaRef == Subject.MetaBase.MetaRef))
+ if (baseClasses.Count > 1)
{
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:26:16 2013 (r2326)
+++ trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/Generator/FcoSrcDstEnd.cs Fri Aug 30 17:57:32 2013 (r2327)
@@ -364,7 +364,7 @@
if (baseClassesWoObject.Any(x => x.MetaBase.MetaRef == Subject.MetaBase.MetaRef))
{
- newAllSrcConnections.Attributes = newAllSrcConnections.Attributes | MemberAttributes.Override;
+ newAllSrcConnections.Attributes = newAllSrcConnections.Attributes | MemberAttributes.New;
}
newAllSrcConnections.Comments.Add(
@@ -406,7 +406,7 @@
if (baseClassesWoObject.Any(x => x.MetaBase.MetaRef == Subject.MetaBase.MetaRef))
{
- newAllDstConnections.Attributes = newAllDstConnections.Attributes | MemberAttributes.Override;
+ newAllDstConnections.Attributes = newAllDstConnections.Attributes | MemberAttributes.New;
}
newAllDstConnections.Comments.Add(
Modified: trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/Properties/AssemblyInfo.cs
==============================================================================
--- trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/Properties/AssemblyInfo.cs Fri Aug 30 16:26:16 2013 (r2326)
+++ trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/Properties/AssemblyInfo.cs Fri Aug 30 17:57:32 2013 (r2327)
@@ -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.12.0")]
-[assembly: AssemblyFileVersion("1.0.12.0")]
+[assembly: AssemblyVersion("1.0.12.1")]
+[assembly: AssemblyFileVersion("1.0.12.1")]
Modified: trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/app.manifest
==============================================================================
--- trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/app.manifest Fri Aug 30 16:26:16 2013 (r2326)
+++ trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/app.manifest Fri Aug 30 17:57:32 2013 (r2327)
@@ -3,7 +3,7 @@
<assemblyIdentity
type="win32"
name="CSharpDSMLGenerator"
- version="1.0.12.0"
+ version="1.0.12.1"
publicKeyToken="1321e6b92842fe54"
processorArchitecture="msil" />
<clrClass
Modified: trunk/SDK/DotNet/DsmlGenerator/GME.DSMLGenerator.nuspec
==============================================================================
--- trunk/SDK/DotNet/DsmlGenerator/GME.DSMLGenerator.nuspec Fri Aug 30 16:26:16 2013 (r2326)
+++ trunk/SDK/DotNet/DsmlGenerator/GME.DSMLGenerator.nuspec Fri Aug 30 17:57:32 2013 (r2327)
@@ -2,7 +2,7 @@
<package >
<metadata>
<id>GME.DSMLGenerator</id>
- <version>1.0.12.0</version>
+ <version>1.0.12.1</version>
<title>GME DSMLGenerator</title>
<authors>ISIS, Vanderbilt University</authors>
<owners>ksmyth</owners>
More information about the gme-commit
mailing list