[commit] r1842 - in trunk/SDK/DotNet/DsmlGenerator: CSharpDsmlGenerator/Generator ISIS.GME.Common

[GMESRC Repository Notifications]

Author: lattmann
Date: Tue Feb 28 14:17:35 2012
New Revision: 1842

Log:
- Do not generate roles for abstract elements.
- & is replaced by _and_ in enumerations.

Modified:
   trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/Generator/FcoRoles.cs
   trunk/SDK/DotNet/DsmlGenerator/ISIS.GME.Common/Utils.cs

Modified: trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/Generator/FcoRoles.cs
==============================================================================
--- trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/Generator/FcoRoles.cs	Fri Feb 24 09:53:55 2012	(r1841)
+++ trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/Generator/FcoRoles.cs	Tue Feb 28 14:17:35 2012	(r1842)
@@ -19,11 +19,11 @@
 				Subject.MetaBase.Name == "Reference" ||
 				Subject.MetaBase.Name == "Model")
 			{
-				//if ((Subject as MgaFCO).BoolAttrByName["IsAbstract"])
-				//{
-				//  // do not generate roles for abstract types
-				//  return;
-				//}
+				if ((Subject as MgaFCO).BoolAttrByName["IsAbstract"])
+				{
+					// do not generate roles for abstract types
+					return;
+				}
 
 				CodeTypeDeclaration newDefaultRole = new CodeTypeDeclaration()
 				{

Modified: trunk/SDK/DotNet/DsmlGenerator/ISIS.GME.Common/Utils.cs
==============================================================================
--- trunk/SDK/DotNet/DsmlGenerator/ISIS.GME.Common/Utils.cs	Fri Feb 24 09:53:55 2012	(r1841)
+++ trunk/SDK/DotNet/DsmlGenerator/ISIS.GME.Common/Utils.cs	Tue Feb 28 14:17:35 2012	(r1842)
@@ -503,7 +503,8 @@
 				Replace("-", "_dash_").
 				Replace(".", "_dot_").
 				Replace(":", "_").
-				Replace(' ', '_');
+				Replace(' ', '_').
+				Replace("&", "_and_");
 		}
 
 		//public static bool IsObjectCacheEnabled = true;