[commit] r2219 - in trunk: Install SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/Generator SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/Properties
GMESRC Repository Notifications
gme-commit at list.isis.vanderbilt.edu
Wed May 29 10:10:26 CDT 2013
Author: ksmyth
Date: Wed May 29 10:10:26 2013
New Revision: 2219
Log:
Fix some DSMLGenerator issues
Modified:
trunk/Install/GME_SDK.wxs
trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/Generator/Base.cs
trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/Generator/FCO.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/FcoStaticFunctions.cs
trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/Properties/AssemblyInfo.cs
trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/app.manifest
Modified: trunk/Install/GME_SDK.wxs
==============================================================================
--- trunk/Install/GME_SDK.wxs Wed May 29 10:09:57 2013 (r2218)
+++ trunk/Install/GME_SDK.wxs Wed May 29 10:10:26 2013 (r2219)
@@ -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.8.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.9.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 Wed May 29 10:09:57 2013 (r2218)
+++ trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/Generator/Base.cs Wed May 29 10:10:26 2013 (r2219)
@@ -60,13 +60,10 @@
GeneratedClass = new CodeNamespace(Configuration.GetClassNamespace(Subject));
GeneratedInterface = new CodeNamespace(Configuration.GetInterfaceNamespace(Subject));
- GeneratedClass.Imports.Add(new CodeNamespaceImport("global::System.Collections.Generic"));
GeneratedClass.Imports.Add(new CodeNamespaceImport("global::System.Linq"));
- GeneratedClass.Imports.Add(new CodeNamespaceImport("global::GME.MGA"));
+ //GeneratedClass.Imports.Add(new CodeNamespaceImport("global::GME.MGA"));
- GeneratedInterface.Imports.Add(new CodeNamespaceImport("global::System.Collections.Generic"));
- GeneratedInterface.Imports.Add(new CodeNamespaceImport("global::System.Linq"));
- GeneratedInterface.Imports.Add(new CodeNamespaceImport("global::GME.MGA"));
+ //GeneratedInterface.Imports.Add(new CodeNamespaceImport("global::GME.MGA"));
GenerateClassCode();
GenerateInterfaceCode();
@@ -151,13 +148,13 @@
Attributes = MemberAttributes.Public | MemberAttributes.Final,
HasGet = true,
Name = "ParadigmGuid",
- Type = new CodeTypeReference(typeof(Guid).FullName),
+ Type = new CodeTypeReference("global::" + typeof(Guid).FullName),
};
GuidProperty.GetStatements.Add(
new CodeMethodReturnStatement(
new CodeObjectCreateExpression(
- new CodeTypeReference(typeof(Guid).FullName),
+ new CodeTypeReference("global::" + typeof(Guid).FullName),
new CodeSnippetExpression("\"" + Configuration.DsmlModel.Paradigm.guid + "\""))));
newInfoClass.Members.Add(GuidProperty);
@@ -233,11 +230,11 @@
MemberAttributes.Override,
HasGet = true,
Name = "MetaRefs",
- Type = new CodeTypeReference(typeof(Dictionary<int, System.Type>)),
+ Type = new CodeTypeReference("global::System.Collections.Generic.Dictionary<int, global::System.Type>"),
};
StringBuilder sbMetaRefs = new StringBuilder();
- sbMetaRefs.AppendLine("new System.Collections.Generic.Dictionary<int, System.Type>()");
+ sbMetaRefs.AppendLine("new global::System.Collections.Generic.Dictionary<int, global::System.Type>()");
sbMetaRefs.AppendLine("{");
foreach (var kvp in metarefs)
@@ -305,7 +302,7 @@
// Attributes = MemberAttributes.Final,
// HasGet = true,
// Name = typeof(ISIS.GME.Common.Interfaces.Folder).FullName + ".AllChildren",
- // Type = new CodeTypeReference("IEnumerable<" + typeof(ISIS.GME.Common.Interfaces.Base).FullName + ">"),
+ // Type = new CodeTypeReference("global::System.Collections.Generic.IEnumerable<" + typeof(ISIS.GME.Common.Interfaces.Base).FullName + ">"),
// };
// newAllChildrenProperty.Comments.Add(new CodeCommentStatement("Contains all type of child objects", true));
@@ -395,7 +392,7 @@
MemberAttributes.Override,
HasGet = true,
Name = "MetaRefs",
- Type = new CodeTypeReference(typeof(Dictionary<int, System.Type>)),
+ Type = new CodeTypeReference("global::System.Collections.Generic.Dictionary<int, global::System.Type>"),
};
newInterface.Members.Add(MetaRefs);
}
Modified: trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/Generator/FCO.cs
==============================================================================
--- trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/Generator/FCO.cs Wed May 29 10:09:57 2013 (r2218)
+++ trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/Generator/FCO.cs Wed May 29 10:10:26 2013 (r2219)
@@ -117,7 +117,7 @@
HasGet = true,
Name = "LibraryCollection",
Type = new CodeTypeReference(
- "IEnumerable<" + Configuration.ProjectIntefaceNamespace +
+ "global::System.Collections.Generic.IEnumerable<" + Configuration.ProjectIntefaceNamespace +
".RootFolder" + ">"),
};
Modified: trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/Generator/FcoArcheType.cs
==============================================================================
--- trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/Generator/FcoArcheType.cs Wed May 29 10:09:57 2013 (r2218)
+++ trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/Generator/FcoArcheType.cs Wed May 29 10:10:26 2013 (r2219)
@@ -38,9 +38,9 @@
newArcheType.GetStatements.Add(
new CodeMethodReturnStatement(
- new CodeSnippetExpression("(Impl as MgaFCO).ArcheType == null ? null : " + typeof(ISIS.GME.Common.Utils).FullName + ".CreateObject<" +
+ new CodeSnippetExpression("(Impl as global::GME.MGA.MgaFCO).ArcheType == null ? null : " + typeof(ISIS.GME.Common.Utils).FullName + ".CreateObject<" +
Configuration.GetClassName(Subject) +
- ">((Impl as MgaFCO).ArcheType as MgaObject)")));
+ ">((Impl as global::GME.MGA.MgaFCO).ArcheType as global::GME.MGA.MgaObject)")));
GeneratedClass.Types[0].Members.Add(newArcheType);
}
@@ -53,7 +53,7 @@
if (Subject.MetaBase.Name != "RootFolder" &&
Subject.MetaBase.Name != "Folder")
{
- //(Impl as MgaFCO).ArcheType
+ //(Impl as global::GME.MGA.MgaFCO).ArcheType
CodeMemberProperty newArcheType = new CodeMemberProperty()
{
Attributes = MemberAttributes.Public,
Modified: trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/Generator/FcoAttributes.cs
==============================================================================
--- trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/Generator/FcoAttributes.cs Wed May 29 10:09:57 2013 (r2218)
+++ trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/Generator/FcoAttributes.cs Wed May 29 10:10:26 2013 (r2219)
@@ -257,7 +257,7 @@
new CodeSnippetExpression(
"int number = " +
typeof(Utils).FullName +
- ".GetEnumItemNumber(Impl as MgaFCO, \"" +
+ ".GetEnumItemNumber(Impl as global::GME.MGA.MgaFCO, \"" +
attribute.Name + "\")"));
attr.GetStatements.Add(
@@ -266,7 +266,7 @@
// create the set statement
attr.SetStatements.Add(
- new CodeSnippetExpression(typeof(Utils).FullName + ".SetEnumItem(Impl as MgaFCO, \"" +
+ new CodeSnippetExpression(typeof(Utils).FullName + ".SetEnumItem(Impl as global::GME.MGA.MgaFCO, \"" +
attribute.Name + "\", (int)value);"));
newAttrClass.Members.Add(attr);
Modified: trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/Generator/FcoChildren.cs
==============================================================================
--- trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/Generator/FcoChildren.cs Wed May 29 10:09:57 2013 (r2218)
+++ trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/Generator/FcoChildren.cs Wed May 29 10:10:26 2013 (r2219)
@@ -86,7 +86,7 @@
{
Attributes = MemberAttributes.Public | MemberAttributes.Final,
HasGet = true,
- Type = new CodeTypeReference("IEnumerable<" + Configuration.GetInterfaceName(child as MgaObject) + ">"),
+ Type = new CodeTypeReference("global::System.Collections.Generic.IEnumerable<" + Configuration.GetInterfaceName(child as MgaObject) + ">"),
Name = child.Name + "Collection",
};
@@ -136,7 +136,7 @@
Configuration.GetKindName(child as MgaObject)) != 0)
{
//codeDef = String.Format(
- // "IEnumerable<{3}.{0}> result = {2}.CastMgaChildren<{1}.{0}, global::GME.MGA.MgaObjects>(Impl.ChildObjects, \"{0}\" /* {4} */);",
+ // "global::System.Collections.Generic.IEnumerable<{3}.{0}> result = {2}.CastMgaChildren<{1}.{0}, global::GME.MGA.MgaObjects>(Impl.ChildObjects, \"{0}\" /* {4} */);",
// child.Name,
// Configuration.ProjectClassNamespace,
// typeof(ISIS.GME.Common.Utils).FullName,
@@ -144,7 +144,7 @@
// Configuration.LocalFactory[child.Name]);
codeDef = String.Format(
- "IEnumerable<{3}> result = {2}.CastMgaChildren<{1}, global::GME.MGA.MgaObjects>(Impl.ChildObjects, \"{0}\" /* {4} */);",
+ "global::System.Collections.Generic.IEnumerable<{3}> result = {2}.CastMgaChildren<{1}, global::GME.MGA.MgaObjects>(Impl.ChildObjects, \"{0}\" /* {4} */);",
Configuration.GetKindName(child as MgaObject),
Configuration.GetClassName(child as MgaObject),
typeof(ISIS.GME.Common.Utils).FullName,
@@ -156,13 +156,13 @@
// base classes which are abstract or FCO-s
// we need a MetaRef list...
//codeDef = String.Format(
- // "IEnumerable<{3}.{0}> result = {2}.CastMgaChildren<{1}.{0}, global::GME.MGA.MgaObjects>(Impl.ChildObjects, \"{0}\");",
+ // "global::System.Collections.Generic.IEnumerable<{3}.{0}> result = {2}.CastMgaChildren<{1}.{0}, global::GME.MGA.MgaObjects>(Impl.ChildObjects, \"{0}\");",
// child.Name,
// Configuration.ProjectClassNamespace,
// typeof(ISIS.GME.Common.Utils).FullName,
// Configuration.ProjectIntefaceNamespace);
codeDef = String.Format(
- "IEnumerable<{3}> result = {2}.CastMgaChildren<{1}, global::GME.MGA.MgaObjects>(Impl.ChildObjects, \"{0}\");",
+ "global::System.Collections.Generic.IEnumerable<{3}> result = {2}.CastMgaChildren<{1}, global::GME.MGA.MgaObjects>(Impl.ChildObjects, \"{0}\");",
Configuration.GetKindName(child as MgaObject),
Configuration.GetClassName(child as MgaObject),
typeof(ISIS.GME.Common.Utils).FullName,
@@ -263,7 +263,7 @@
Attributes = MemberAttributes.Public | MemberAttributes.Override,
HasGet = true,
Name = "AllChildren",
- Type = new CodeTypeReference("IEnumerable<" + typeof(ISIS.GME.Common.Interfaces.Base).FullName + ">"),
+ Type = new CodeTypeReference("global::System.Collections.Generic.IEnumerable<" + typeof(ISIS.GME.Common.Interfaces.Base).FullName + ">"),
};
newAllChildrenProperty.Comments.Add(
@@ -279,7 +279,7 @@
newAllChildrenProperty.GetStatements.Add(
new CodeSnippetExpression(
- "IEnumerable<" + typeof(ISIS.GME.Common.Interfaces.Base).FullName + "> result = " +
+ "global::System.Collections.Generic.IEnumerable<" + typeof(ISIS.GME.Common.Interfaces.Base).FullName + "> result = " +
typeof(ISIS.GME.Common.Utils).FullName + ".CastMgaChildren<" +
Configuration.ProjectClassNamespace + ".RootFolder" +
", global::GME.MGA.MgaObjects>(Impl.ChildObjects, \"RootFolder\")"));
@@ -385,7 +385,7 @@
{
// newAllChildrenProperty.GetStatements.Add(
// new CodeSnippetExpression(
- // "IEnumerable<" + typeof(ISIS.GME.Common.Interfaces.Base).FullName +
+ // "global::System.Collections.Generic.IEnumerable<" + typeof(ISIS.GME.Common.Interfaces.Base).FullName +
// "> result = " +
// typeof(ISIS.GME.Common.Utils).FullName + ".CastMgaChildren<" +
// Configuration.GetClassName(allChildren.FirstOrDefault() as MgaObject) +
@@ -424,7 +424,7 @@
// }
StringBuilder sb = new StringBuilder();
- sb.AppendLine("IEnumerable<ISIS.GME.Common.Interfaces.Base> result = ISIS.GME.Common.Utils.CastMgaChildren(Impl.ChildObjects, new Dictionary<int, global::System.Type>() { ");
+ sb.AppendLine("global::System.Collections.Generic.IEnumerable<ISIS.GME.Common.Interfaces.Base> result = ISIS.GME.Common.Utils.CastMgaChildren(Impl.ChildObjects, new global::System.Collections.Generic.Dictionary<int, global::System.Type>() { ");
foreach (var item in allChildren)
{
sb.Append("{ ");
@@ -485,7 +485,7 @@
HasGet = true,
Name = "AllChildren",
Type = new CodeTypeReference(
- "IEnumerable<" + typeof(ISIS.GME.Common.Interfaces.Base).FullName + ">"),
+ "global::System.Collections.Generic.IEnumerable<" + typeof(ISIS.GME.Common.Interfaces.Base).FullName + ">"),
};
if (baseClasses.Count > 1)
Modified: trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/Generator/FcoParentContainer.cs
==============================================================================
--- trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/Generator/FcoParentContainer.cs Wed May 29 10:09:57 2013 (r2218)
+++ trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/Generator/FcoParentContainer.cs Wed May 29 10:10:26 2013 (r2219)
@@ -27,7 +27,7 @@
libraryName.GetStatements.Add(
new CodeMethodReturnStatement(
- new CodeSnippetExpression("(Impl as MgaFolder).LibraryName")));
+ new CodeSnippetExpression("(Impl as global::GME.MGA.MgaFolder).LibraryName")));
GeneratedClass.Types[0].Members.Add(libraryName);
@@ -36,7 +36,7 @@
Attributes = MemberAttributes.Public | MemberAttributes.Final,
HasGet = true,
Name = "LibraryCollection",
- Type = new CodeTypeReference("IEnumerable<" + Configuration.ProjectIntefaceNamespace +
+ Type = new CodeTypeReference("global::System.Collections.Generic.IEnumerable<" + Configuration.ProjectIntefaceNamespace +
".RootFolder" + ">"),
};
@@ -66,10 +66,10 @@
newParentContainer.GetStatements.Add(
new CodeSnippetStatement(
- "if ((Impl as MgaFolder).ParentFolder != null) { return "
+ "if ((Impl as global::GME.MGA.MgaFolder).ParentFolder != null) { return "
+ typeof(ISIS.GME.Common.Utils).FullName + ".CreateObject<" +
Configuration.ProjectClassNamespace + ".RootFolder" +
- ">((Impl as MgaFolder).ParentFolder as MgaObject); }"));
+ ">((Impl as global::GME.MGA.MgaFolder).ParentFolder as global::GME.MGA.MgaObject); }"));
newParentContainer.GetStatements.Add(
new CodeMethodReturnStatement(
@@ -147,12 +147,12 @@
new CodeMethodReturnStatement(
new CodeSnippetExpression(typeof(ISIS.GME.Common.Utils).FullName + ".CreateObject<" +
typeof(ISIS.GME.Common.Classes.Folder).FullName +
- ">((this.Impl as MgaFolder).ParentFolder as MgaObject)")));
+ ">((this.Impl as global::GME.MGA.MgaFolder).ParentFolder as global::GME.MGA.MgaObject)")));
}
else
{
newParentContainer.GetStatements.Add(
- new CodeSnippetStatement("MgaObject parentFolder = (this.Impl as MgaFCO).ParentFolder as MgaObject;"));
+ new CodeSnippetStatement("global::GME.MGA.MgaObject parentFolder = (this.Impl as global::GME.MGA.MgaFCO).ParentFolder as global::GME.MGA.MgaObject;"));
if (inrootfolder)
{
@@ -174,7 +174,7 @@
}
newParentContainer.GetStatements.Add(
- new CodeSnippetStatement("MgaObject parentModel = (this.Impl as MgaFCO).ParentModel as MgaObject;"));
+ new CodeSnippetStatement("global::GME.MGA.MgaObject parentModel = (this.Impl as global::GME.MGA.MgaFCO).ParentModel as global::GME.MGA.MgaObject;"));
foreach (var parent in modelParents.Distinct())
{
Modified: trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/Generator/FcoReference.cs
==============================================================================
--- trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/Generator/FcoReference.cs Wed May 29 10:09:57 2013 (r2218)
+++ trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/Generator/FcoReference.cs Wed May 29 10:10:26 2013 (r2219)
@@ -97,7 +97,7 @@
Configuration.GetInterfaceName(item as MgaObject) + " result = null;"));
sb.Clear();
- sb.AppendLine("result = ISIS.GME.Common.Utils.CastReferred(Impl as global::GME.MGA.MgaReference, new Dictionary<int, global::System.Type>() {");
+ sb.AppendLine("result = ISIS.GME.Common.Utils.CastReferred(Impl as global::GME.MGA.MgaReference, new global::System.Collections.Generic.Dictionary<int, global::System.Type>() {");
List<int> metaRefs = new List<int>();
@@ -158,7 +158,7 @@
typeof(ISIS.GME.Common.Interfaces.FCO).FullName + " result = null;"));
StringBuilder sb2 = new StringBuilder();
- sb2.AppendLine("result = ISIS.GME.Common.Utils.CastReferred(Impl as global::GME.MGA.MgaReference, new Dictionary<int, global::System.Type>() {");
+ sb2.AppendLine("result = ISIS.GME.Common.Utils.CastReferred(Impl as global::GME.MGA.MgaReference, new global::System.Collections.Generic.Dictionary<int, global::System.Type>() {");
List<int> metaRefs2 = new List<int>();
@@ -323,7 +323,7 @@
HasGet = true,
Name = item.Name,
Type = new CodeTypeReference(
- "IEnumerable<" + Configuration.GetInterfaceName(item as MgaObject) + ">"),
+ "global::System.Collections.Generic.IEnumerable<" + Configuration.GetInterfaceName(item as MgaObject) + ">"),
};
List<MgaFCO> derivedClasses = new List<MgaFCO>();
@@ -356,7 +356,7 @@
// Configuration.GetInterfaceName(item as MgaObject) + " result = null;"));
sb.Clear();
- sb.AppendLine("ISIS.GME.Common.Utils.CastReferencedBy(Impl as global::GME.MGA.MgaFCO, new Dictionary<int, global::System.Type>() {");
+ sb.AppendLine("ISIS.GME.Common.Utils.CastReferencedBy(Impl as global::GME.MGA.MgaFCO, new global::System.Collections.Generic.Dictionary<int, global::System.Type>() {");
List<int> metaRefs = new List<int>();
@@ -396,13 +396,13 @@
Attributes = MemberAttributes.Public,
HasGet = true,
Name = "AllReferencedBy",
- Type = new CodeTypeReference("IEnumerable<" + typeof(ISIS.GME.Common.Interfaces.FCO).FullName + ">"),
+ Type = new CodeTypeReference("global::System.Collections.Generic.IEnumerable<" + typeof(ISIS.GME.Common.Interfaces.FCO).FullName + ">"),
};
newAllReferred.Comments.Add(new CodeCommentStatement("", true));
StringBuilder sb2 = new StringBuilder();
- sb2.AppendLine("IEnumerable<" + typeof(ISIS.GME.Common.Interfaces.FCO).FullName + "> result = ISIS.GME.Common.Utils.CastReferencedBy(Impl as global::GME.MGA.MgaFCO, new Dictionary<int, global::System.Type>() {");
+ sb2.AppendLine("global::System.Collections.Generic.IEnumerable<" + typeof(ISIS.GME.Common.Interfaces.FCO).FullName + "> result = ISIS.GME.Common.Utils.CastReferencedBy(Impl as global::GME.MGA.MgaFCO, new global::System.Collections.Generic.Dictionary<int, global::System.Type>() {");
List<int> metaRefs2 = new List<int>();
@@ -479,7 +479,7 @@
HasGet = true,
Name = "AllReferencedBy",
Type = new CodeTypeReference(
- "IEnumerable<" + typeof(ISIS.GME.Common.Interfaces.FCO).FullName + ">"),
+ "global::System.Collections.Generic.IEnumerable<" + typeof(ISIS.GME.Common.Interfaces.FCO).FullName + ">"),
};
if (baseClasses.Count > 1)
Modified: trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/Generator/FcoSet.cs
==============================================================================
--- trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/Generator/FcoSet.cs Wed May 29 10:09:57 2013 (r2218)
+++ trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/Generator/FcoSet.cs Wed May 29 10:10:26 2013 (r2219)
@@ -64,7 +64,7 @@
HasSet = true,
Name = item.Name,
Type = new CodeTypeReference(
- "IEnumerable<" + Configuration.GetInterfaceName(item as MgaObject) + ">"),
+ "global::System.Collections.Generic.IEnumerable<" + Configuration.GetInterfaceName(item as MgaObject) + ">"),
};
List<MgaFCO> derivedClasses = new List<MgaFCO>();
@@ -94,10 +94,10 @@
newReferred.GetStatements.Add(
new CodeSnippetStatement(
- "IEnumerable<" + Configuration.GetInterfaceName(item as MgaObject) + "> result = null;"));
+ "global::System.Collections.Generic.IEnumerable<" + Configuration.GetInterfaceName(item as MgaObject) + "> result = null;"));
sb.Clear();
- sb.AppendLine("result = ISIS.GME.Common.Utils.CastSetMembers(Impl as global::GME.MGA.MgaSet, new Dictionary<int, global::System.Type>() {");
+ sb.AppendLine("result = ISIS.GME.Common.Utils.CastSetMembers(Impl as global::GME.MGA.MgaSet, new global::System.Collections.Generic.Dictionary<int, global::System.Type>() {");
List<int> metaRefs = new List<int>();
@@ -139,17 +139,17 @@
Attributes = MemberAttributes.Public,
HasGet = true,
Name = "AllSetMembers",
- Type = new CodeTypeReference("IEnumerable <" + typeof(ISIS.GME.Common.Interfaces.FCO).FullName + ">"),
+ Type = new CodeTypeReference("global::System.Collections.Generic.IEnumerable <" + typeof(ISIS.GME.Common.Interfaces.FCO).FullName + ">"),
};
newAllReferred.Comments.Add(new CodeCommentStatement("", true));
newAllReferred.GetStatements.Add(
new CodeSnippetStatement(
- "IEnumerable <" + typeof(ISIS.GME.Common.Interfaces.FCO).FullName + "> result = null;"));
+ "global::System.Collections.Generic.IEnumerable <" + typeof(ISIS.GME.Common.Interfaces.FCO).FullName + "> result = null;"));
StringBuilder sb2 = new StringBuilder();
- sb2.AppendLine("result = ISIS.GME.Common.Utils.CastSetMembers(Impl as global::GME.MGA.MgaSet, new Dictionary<int, global::System.Type>() {");
+ sb2.AppendLine("result = ISIS.GME.Common.Utils.CastSetMembers(Impl as global::GME.MGA.MgaSet, new global::System.Collections.Generic.Dictionary<int, global::System.Type>() {");
List<int> metaRefs2 = new List<int>();
@@ -220,7 +220,7 @@
Attributes = MemberAttributes.Public,
HasGet = true,
Name = "AllSetMembers",
- Type = new CodeTypeReference("IEnumerable <" + typeof(ISIS.GME.Common.Interfaces.FCO).FullName + ">"),
+ Type = new CodeTypeReference("global::System.Collections.Generic.IEnumerable <" + typeof(ISIS.GME.Common.Interfaces.FCO).FullName + ">"),
};
if (baseClassesWoObject.Count > 0)
@@ -308,7 +308,7 @@
HasGet = true,
Name = item.Name,
Type = new CodeTypeReference(
- "IEnumerable<" + Configuration.GetInterfaceName(item as MgaObject) + ">"),
+ "global::System.Collections.Generic.IEnumerable<" + Configuration.GetInterfaceName(item as MgaObject) + ">"),
};
List<MgaFCO> derivedClasses = new List<MgaFCO>();
@@ -341,7 +341,7 @@
// Configuration.GetInterfaceName(item as MgaObject) + " result = null;"));
sb.Clear();
- sb.AppendLine("ISIS.GME.Common.Utils.CastMembersOfSet(Impl as global::GME.MGA.MgaFCO, new Dictionary<int, global::System.Type>() {");
+ sb.AppendLine("ISIS.GME.Common.Utils.CastMembersOfSet(Impl as global::GME.MGA.MgaFCO, new global::System.Collections.Generic.Dictionary<int, global::System.Type>() {");
List<int> metaRefs = new List<int>();
@@ -381,13 +381,13 @@
Attributes = MemberAttributes.Public,
HasGet = true,
Name = "AllMembersOfSet",
- Type = new CodeTypeReference("IEnumerable<" + typeof(ISIS.GME.Common.Interfaces.FCO).FullName + ">"),
+ Type = new CodeTypeReference("global::System.Collections.Generic.IEnumerable<" + typeof(ISIS.GME.Common.Interfaces.FCO).FullName + ">"),
};
newAllReferred.Comments.Add(new CodeCommentStatement("", true));
StringBuilder sb2 = new StringBuilder();
- sb2.AppendLine("IEnumerable<" + typeof(ISIS.GME.Common.Interfaces.FCO).FullName + "> result = ISIS.GME.Common.Utils.CastMembersOfSet(Impl as global::GME.MGA.MgaFCO, new Dictionary<int, global::System.Type>() {");
+ sb2.AppendLine("global::System.Collections.Generic.IEnumerable<" + typeof(ISIS.GME.Common.Interfaces.FCO).FullName + "> result = ISIS.GME.Common.Utils.CastMembersOfSet(Impl as global::GME.MGA.MgaFCO, new global::System.Collections.Generic.Dictionary<int, global::System.Type>() {");
List<int> metaRefs2 = new List<int>();
@@ -464,7 +464,7 @@
HasGet = true,
Name = "AllMembersOfSet",
Type = new CodeTypeReference(
- "IEnumerable<" + typeof(ISIS.GME.Common.Interfaces.FCO).FullName + ">"),
+ "global::System.Collections.Generic.IEnumerable<" + typeof(ISIS.GME.Common.Interfaces.FCO).FullName + ">"),
};
if (baseClassesWoObject.Count > 0)
Modified: trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/Generator/FcoSrcDstConnections.cs
==============================================================================
--- trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/Generator/FcoSrcDstConnections.cs Wed May 29 10:09:57 2013 (r2218)
+++ trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/Generator/FcoSrcDstConnections.cs Wed May 29 10:10:26 2013 (r2219)
@@ -68,7 +68,7 @@
Attributes = MemberAttributes.Public,
HasGet = true,
Name = item.Name + "Collection",
- Type = new CodeTypeReference("IEnumerable<" + Configuration.GetInterfaceName(item as MgaObject) + ">"),
+ Type = new CodeTypeReference("global::System.Collections.Generic.IEnumerable<" + Configuration.GetInterfaceName(item as MgaObject) + ">"),
};
newConnections.Comments.Add(
@@ -104,7 +104,7 @@
Attributes = MemberAttributes.Public | MemberAttributes.Override,
HasGet = true,
Name = "AllSrcConnections",
- Type = new CodeTypeReference("IEnumerable<" + typeof(ISIS.GME.Common.Interfaces.Connection).FullName + ">"),
+ Type = new CodeTypeReference("global::System.Collections.Generic.IEnumerable<" + typeof(ISIS.GME.Common.Interfaces.Connection).FullName + ">"),
};
newAllSrcConnections.Comments.Add(new CodeCommentStatement("", true));
@@ -120,7 +120,7 @@
var allConnectionClasses = connections.Select(x => x.Item1).Distinct();
newAllSrcConnections.GetStatements.Add(
new CodeSnippetExpression(
- "IEnumerable<" + typeof(ISIS.GME.Common.Interfaces.Connection).FullName + "> result = ((" +
+ "global::System.Collections.Generic.IEnumerable<" + typeof(ISIS.GME.Common.Interfaces.Connection).FullName + "> result = ((" +
Configuration.GetInterfaceName(Subject) +
")(this)).SrcConnections." + allConnectionClasses.FirstOrDefault().Name + "Collection.Cast<" +
typeof(ISIS.GME.Common.Interfaces.Connection).FullName + ">()"));
@@ -215,7 +215,7 @@
Attributes = MemberAttributes.Public,
HasGet = true,
Name = item.Name + "Collection",
- Type = new CodeTypeReference("IEnumerable<" + Configuration.GetInterfaceName(item as MgaObject) + ">"),
+ Type = new CodeTypeReference("global::System.Collections.Generic.IEnumerable<" + Configuration.GetInterfaceName(item as MgaObject) + ">"),
};
newConnections.Comments.Add(
@@ -249,7 +249,7 @@
Attributes = MemberAttributes.Public | MemberAttributes.Override,
HasGet = true,
Name = "AllDstConnections",
- Type = new CodeTypeReference("IEnumerable<" + typeof(ISIS.GME.Common.Interfaces.Connection).FullName + ">"),
+ Type = new CodeTypeReference("global::System.Collections.Generic.IEnumerable<" + typeof(ISIS.GME.Common.Interfaces.Connection).FullName + ">"),
};
newAllDstConnections.Comments.Add(new CodeCommentStatement("", true));
@@ -265,7 +265,7 @@
var allConnectionClasses = connections.Select(x => x.Item1).Distinct();
newAllDstConnections.GetStatements.Add(
new CodeSnippetExpression(
- "IEnumerable<" + typeof(ISIS.GME.Common.Interfaces.Connection).FullName + "> result = ((" +
+ "global::System.Collections.Generic.IEnumerable<" + typeof(ISIS.GME.Common.Interfaces.Connection).FullName + "> result = ((" +
Configuration.GetInterfaceName(Subject) +
")(this)).DstConnections." + allConnectionClasses.FirstOrDefault().Name + "Collection.Cast<" +
typeof(ISIS.GME.Common.Interfaces.Connection).FullName + ">()"));
@@ -318,7 +318,7 @@
Attributes = MemberAttributes.Public | MemberAttributes.Override,
HasGet = true,
Name = "AllSrcConnections",
- Type = new CodeTypeReference("IEnumerable<" + typeof(ISIS.GME.Common.Interfaces.Connection).FullName + ">"),
+ Type = new CodeTypeReference("global::System.Collections.Generic.IEnumerable<" + typeof(ISIS.GME.Common.Interfaces.Connection).FullName + ">"),
};
if (baseClasses.Count > 1)
@@ -363,7 +363,7 @@
Attributes = MemberAttributes.Public | MemberAttributes.Override,
HasGet = true,
Name = "AllDstConnections",
- Type = new CodeTypeReference("IEnumerable<" + typeof(ISIS.GME.Common.Interfaces.Connection).FullName + ">"),
+ Type = new CodeTypeReference("global::System.Collections.Generic.IEnumerable<" + typeof(ISIS.GME.Common.Interfaces.Connection).FullName + ">"),
};
if (baseClasses.Count > 1)
Modified: trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/Generator/FcoStaticFunctions.cs
==============================================================================
--- trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/Generator/FcoStaticFunctions.cs Wed May 29 10:09:57 2013 (r2218)
+++ trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/Generator/FcoStaticFunctions.cs Wed May 29 10:10:26 2013 (r2219)
@@ -31,7 +31,7 @@
newGetRootFolder.Statements.Add(
new CodeMethodReturnStatement(
new CodeSnippetExpression(
- typeof(ISIS.GME.Common.Utils).FullName + ".CreateObject<RootFolder>(project.RootFolder as MgaObject)")));
+ typeof(ISIS.GME.Common.Utils).FullName + ".CreateObject<RootFolder>(project.RootFolder as global::GME.MGA.MgaObject)")));
GeneratedClass.Types[0].Members.Add(newGetRootFolder);
}
Modified: trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/Properties/AssemblyInfo.cs
==============================================================================
--- trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/Properties/AssemblyInfo.cs Wed May 29 10:09:57 2013 (r2218)
+++ trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/Properties/AssemblyInfo.cs Wed May 29 10:10:26 2013 (r2219)
@@ -33,6 +33,6 @@
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
// Keep in sync with app.manifest and GME_SDK.wxs
-[assembly: AssemblyVersion("1.0.8.0")]
-[assembly: AssemblyFileVersion("1.0.8.0")]
+[assembly: AssemblyVersion("1.0.9.0")]
+[assembly: AssemblyFileVersion("1.0.9.0")]
// also change GME_SDK.wxs
Modified: trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/app.manifest
==============================================================================
--- trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/app.manifest Wed May 29 10:09:57 2013 (r2218)
+++ trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/app.manifest Wed May 29 10:10:26 2013 (r2219)
@@ -3,7 +3,7 @@
<assemblyIdentity
type="win32"
name="CSharpDSMLGenerator"
- version="1.0.8.0"
+ version="1.0.9.0"
publicKeyToken="1321e6b92842fe54"
processorArchitecture="msil" />
<clrClass
More information about the gme-commit
mailing list