[commit] r1592 - in trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator: . Generator
GMESRC Repository Notifications
gme-commit at list.isis.vanderbilt.edu
Wed Oct 5 16:30:56 CDT 2011
Author: lattmann
Date: Wed Oct 5 16:30:51 2011
New Revision: 1592
Log:
Namespace fixes (global prefix was added)
Modified:
trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/CSharpDSMLGenerator.csproj
trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/Generator/Base.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
Modified: trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/CSharpDSMLGenerator.csproj
==============================================================================
--- trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/CSharpDSMLGenerator.csproj Wed Oct 5 10:48:29 2011 (r1591)
+++ trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/CSharpDSMLGenerator.csproj Wed Oct 5 16:30:51 2011 (r1592)
@@ -141,6 +141,7 @@
<ItemGroup>
<EmbeddedResource Include="ApiGenerator.resx">
<DependentUpon>ApiGenerator.cs</DependentUpon>
+ <SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="Properties\Resources.resx">
<Generator>ResXFileCodeGenerator</Generator>
Modified: trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/Generator/Base.cs
==============================================================================
--- trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/Generator/Base.cs Wed Oct 5 10:48:29 2011 (r1591)
+++ trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/Generator/Base.cs Wed Oct 5 16:30:51 2011 (r1592)
@@ -60,12 +60,12 @@
GeneratedClass = new CodeNamespace(Configuration.GetClassNamespace(Subject));
GeneratedInterface = new CodeNamespace(Configuration.GetInterfaceNamespace(Subject));
- GeneratedClass.Imports.Add(new CodeNamespaceImport("System.Collections.Generic"));
- GeneratedClass.Imports.Add(new CodeNamespaceImport("System.Linq"));
+ 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"));
- GeneratedInterface.Imports.Add(new CodeNamespaceImport("System.Collections.Generic"));
- GeneratedInterface.Imports.Add(new CodeNamespaceImport("System.Linq"));
+ 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"));
GenerateClassCode();
Modified: trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/Generator/FcoAttributes.cs
==============================================================================
--- trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/Generator/FcoAttributes.cs Wed Oct 5 10:48:29 2011 (r1591)
+++ trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/Generator/FcoAttributes.cs Wed Oct 5 16:30:51 2011 (r1592)
@@ -250,7 +250,7 @@
// create the get statement
attr.GetStatements.Add(
- new CodeSnippetExpression("System.Array a = System.Enum.GetValues(typeof(" +
+ new CodeSnippetExpression("global::System.Array a = global::System.Enum.GetValues(typeof(" +
Configuration.GetClassName(Subject) + ".AttributesClass." + attribute.Name + "_enum))"));
attr.GetStatements.Add(
Modified: trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/Generator/FcoChildren.cs
==============================================================================
--- trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/Generator/FcoChildren.cs Wed Oct 5 10:48:29 2011 (r1591)
+++ trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/Generator/FcoChildren.cs Wed Oct 5 16:30:51 2011 (r1592)
@@ -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, System.Type>() { ");
+ sb.AppendLine("IEnumerable<ISIS.GME.Common.Interfaces.Base> result = ISIS.GME.Common.Utils.CastMgaChildren(Impl.ChildObjects, new Dictionary<int, global::System.Type>() { ");
foreach (var item in allChildren)
{
sb.Append("{ ");
Modified: trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/Generator/FcoReference.cs
==============================================================================
--- trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/Generator/FcoReference.cs Wed Oct 5 10:48:29 2011 (r1591)
+++ trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/Generator/FcoReference.cs Wed Oct 5 16:30:51 2011 (r1592)
@@ -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, System.Type>() {");
+ sb.AppendLine("result = ISIS.GME.Common.Utils.CastReferred(Impl as global::GME.MGA.MgaReference, new 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, System.Type>() {");
+ sb2.AppendLine("result = ISIS.GME.Common.Utils.CastReferred(Impl as global::GME.MGA.MgaReference, new Dictionary<int, global::System.Type>() {");
List<int> metaRefs2 = new List<int>();
@@ -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, System.Type>() {");
+ sb.AppendLine("ISIS.GME.Common.Utils.CastReferencedBy(Impl as global::GME.MGA.MgaFCO, new Dictionary<int, global::System.Type>() {");
List<int> metaRefs = new List<int>();
@@ -402,7 +402,7 @@
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, System.Type>() {");
+ 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>() {");
List<int> metaRefs2 = new List<int>();
Modified: trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/Generator/FcoSet.cs
==============================================================================
--- trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/Generator/FcoSet.cs Wed Oct 5 10:48:29 2011 (r1591)
+++ trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/Generator/FcoSet.cs Wed Oct 5 16:30:51 2011 (r1592)
@@ -97,7 +97,7 @@
"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, System.Type>() {");
+ sb.AppendLine("result = ISIS.GME.Common.Utils.CastSetMembers(Impl as global::GME.MGA.MgaSet, new Dictionary<int, global::System.Type>() {");
List<int> metaRefs = new List<int>();
@@ -149,7 +149,7 @@
"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, System.Type>() {");
+ sb2.AppendLine("result = ISIS.GME.Common.Utils.CastSetMembers(Impl as global::GME.MGA.MgaSet, new Dictionary<int, global::System.Type>() {");
List<int> metaRefs2 = new List<int>();
@@ -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, System.Type>() {");
+ sb.AppendLine("ISIS.GME.Common.Utils.CastMembersOfSet(Impl as global::GME.MGA.MgaFCO, new Dictionary<int, global::System.Type>() {");
List<int> metaRefs = new List<int>();
@@ -387,7 +387,7 @@
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, System.Type>() {");
+ 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>() {");
List<int> metaRefs2 = new List<int>();
More information about the gme-commit
mailing list