Merge pull request #92 from tfreitasleal/master

Fix #89 and #58
CslaGenFork · Mar 27, 2018 · 76f503f · 76f503f
2 parents 5e896f2 + 5fecf53
commit 76f503f
Show file tree

Hide file tree

Showing 31 changed files with 190 additions and 135 deletions.
diff --git a/trunk/Solutions/CslaGenFork/CodeGen/CslaTemplateHelperCS.cs b/trunk/Solutions/CslaGenFork/CodeGen/CslaTemplateHelperCS.cs
@@ -5357,13 +5357,22 @@ public bool IsCriteriaObjectNeeded(CslaObjectInfo info)
                 select FactoryOrDataPortal(crit)).FirstOrDefault();
         }
 
-        public bool IsCriteriaExtendedClassNeeded(CslaObjectInfo info)
+        public static bool IsCriteriaExtendedClassNeeded(CslaObjectInfo info)
         {
-            return (from crit in info.CriteriaObjects
-                where crit.Properties.Count > 1 && 
-                      crit.CriteriaClassMode != CriteriaMode.BusinessBase &&
-                      crit.CriteriaClassMode != CriteriaMode.CustomCriteriaClass
-                select FactoryOrDataPortal(crit)).FirstOrDefault();
+            foreach (var criteria in info.CriteriaObjects)
+            {
+                if (IsCriteriaPartial(criteria))
+                    return true;
+            }
+
+            return false;
+        }
+
+        public static bool IsCriteriaPartial(Criteria crit)
+        {
+            return crit.Properties.Count > 1 && FactoryOrDataPortal(crit) &&
+                   (crit.CriteriaClassMode == CriteriaMode.BusinessBase ||
+                    crit.CriteriaClassMode == CriteriaMode.CriteriaBase && !crit.NestedClass);
         }
 
         private static bool FactoryOrDataPortal(Criteria crit)

diff --git a/trunk/Solutions/CslaGenFork/CodeGen/CslaTemplateHelperVB.cs b/trunk/Solutions/CslaGenFork/CodeGen/CslaTemplateHelperVB.cs
@@ -5373,13 +5373,22 @@ public bool IsCriteriaObjectNeeded(CslaObjectInfo info)
                 select FactoryOrDataPortal(crit)).FirstOrDefault();
         }
 
-        public bool IsCriteriaExtendedClassNeeded(CslaObjectInfo info)
+        public static bool IsCriteriaExtendedClassNeeded(CslaObjectInfo info)
         {
-            return (from crit in info.CriteriaObjects
-                where crit.Properties.Count > 1 && 
-                      crit.CriteriaClassMode != CriteriaMode.BusinessBase &&
-                      crit.CriteriaClassMode != CriteriaMode.CustomCriteriaClass
-                select FactoryOrDataPortal(crit)).FirstOrDefault();
+            foreach (var criteria in info.CriteriaObjects)
+            {
+                if (IsCriteriaPartial(criteria))
+                    return true;
+            }
+
+            return false;
+        }
+
+        public static bool IsCriteriaPartial(Criteria crit)
+        {
+            return crit.Properties.Count > 1 && FactoryOrDataPortal(crit) &&
+                   (crit.CriteriaClassMode == CriteriaMode.BusinessBase ||
+                    crit.CriteriaClassMode == CriteriaMode.CriteriaBase && !crit.NestedClass);
         }
 
         private static bool FactoryOrDataPortal(Criteria crit)

diff --git a/trunk/Solutions/CslaGenFork/Metadata/CslaObjectInfo.cs b/trunk/Solutions/CslaGenFork/Metadata/CslaObjectInfo.cs
@@ -1794,6 +1794,9 @@ internal string GetCslaBaseClassName(bool isBindingList)
                 return "ReadOnlyBase";
             }
 
+            if (this.IsCriteriaClass())
+                return "CriteriaBase";
+
             if (this.IsBaseClass())
                 return CslaBaseClass.NonGenericBaseClass();
 

diff --git a/trunk/Templates/CSLA40/CSharp/BaseClass.cst b/trunk/Templates/CSLA40/CSharp/BaseClass.cst
@@ -1,4 +1,3 @@
-
 <%@ CodeTemplate Inherits="CslaTemplateHelperCS" Language="CSharp" TargetLanguage="CSharp" Description="Generates a CSLA Editable Root Object." %>
 <%@ Property Name="Info" Type="CslaObjectInfo" Optional="false" Category="Business Object" Description="Definition of the EditableRoot Object to create." %>
 <%@ Property Name="Errors" Type="System.Text.StringBuilder" Optional="false" Category="Options" Description="Allows the template to return errors to master.cst" %>

diff --git a/trunk/Templates/CSLA40/CSharp/BaseClassDeclaration.asp b/trunk/Templates/CSLA40/CSharp/BaseClassDeclaration.asp
@@ -1,9 +1,8 @@
-
 <%
     String[] clauses = GetGenericWhereClause(Info);
     if (Info.InheritedType.FinalName != string.Empty)
     {
-        %><%= GetBaseClassDeclarationInheritedType(Info) %>
+        %><%= GetBaseClassDeclarationInheritedType(Info) + GetInterfaceDeclaration(Info) %>
 <%
         if (clauses.Length > 0)
         {
@@ -20,7 +19,7 @@
     }
     else
     {
-        %><%= GetBaseClassDeclaration(Info) %>
+        %><%= GetBaseClassDeclaration(Info) + GetInterfaceDeclaration(Info) %>
 <%
         if (clauses.Length > 0)
         {

diff --git a/trunk/Templates/CSLA40/CSharp/Constructor.asp b/trunk/Templates/CSLA40/CSharp/Constructor.asp
@@ -1,4 +1,3 @@
-
 <%
 if (Info.GenerateConstructor)
 {

diff --git a/trunk/Templates/CSLA40/CSharp/Criteria.asp b/trunk/Templates/CSLA40/CSharp/Criteria.asp
@@ -1,4 +1,3 @@
-
 <%
 if (Info.CriteriaObjects.Count > 0)
 {
@@ -12,14 +11,14 @@ if (Info.CriteriaObjects.Count > 0)
         IndentLevel += 3;
         %>
 
-        #region Criteria
+        #region Nested Criteria
         <%
         foreach (Criteria crit in Info.CriteriaObjects)
         {
             string strParams = string.Empty;
             string strFieldAssignments = string.Empty;
             string strComment = string.Empty;
-            if (crit.Properties.Count > 1)
+            if (crit.Properties.Count > 1 && crit.NestedClass)
             {
                     %>
 
@@ -58,7 +57,7 @@ if (Info.CriteriaObjects.Count > 0)
                     else
                     {
                         %>
-        public <%= crit.CriteriaClassMode == CriteriaMode.BusinessBase ? "partial " : "" %>class <%= crit.Name %> : <%= crit.CriteriaClassMode != CriteriaMode.BusinessBase ? "CriteriaBase" : "BusinessBase" %><<%= crit.Name %>>
+        public <%= IsCriteriaPartial(crit) ? "partial " : "" %>class <%= crit.Name %> : <%= crit.CriteriaClassMode != CriteriaMode.BusinessBase ? "CriteriaBase" : "BusinessBase" %><<%= crit.Name %>>
         <%
                     }
                 }
@@ -79,7 +78,7 @@ if (Info.CriteriaObjects.Count > 0)
                     else
                     {
                         %>
-        protected <%= crit.CriteriaClassMode == CriteriaMode.BusinessBase ? "partial " : "" %>class <%= crit.Name %> : <%= crit.CriteriaClassMode != CriteriaMode.BusinessBase ? "CriteriaBase" : "BusinessBase" %><<%= crit.Name %>>
+        protected <%= IsCriteriaPartial(crit) ? "partial " : "" %>class <%= crit.Name %> : <%= crit.CriteriaClassMode != CriteriaMode.BusinessBase ? "CriteriaBase" : "BusinessBase" %><<%= crit.Name %>>
         <%
                     }
                 }

diff --git a/trunk/Templates/CSLA40/CSharp/CriteriaObject.asp b/trunk/Templates/CSLA40/CSharp/CriteriaObject.asp
@@ -1,4 +1,3 @@
-
 <%
 if (Info.CriteriaObjects.Count > 0)
 {
@@ -18,7 +17,7 @@ if (Info.CriteriaObjects.Count > 0)
             string strParams = string.Empty;
             string strFieldAssignments = string.Empty;
             string strComment = string.Empty;
-            if (crit.Properties.Count > 1)
+            if (crit.Properties.Count > 1 && !crit.NestedClass)
             {
                     %>
 
@@ -46,7 +45,7 @@ if (Info.CriteriaObjects.Count > 0)
                 else
                 {
                     %>
-    public <%= crit.CriteriaClassMode == CriteriaMode.BusinessBase ? "partial " : "" %>class <%= crit.Name %> : <%= crit.CriteriaClassMode != CriteriaMode.BusinessBase ? "CriteriaBase" : "BusinessBase" %><<%= crit.Name %>>
+    public <%= IsCriteriaPartial(crit) ? "partial " : "" %>class <%= crit.Name %> : <%= crit.CriteriaClassMode != CriteriaMode.BusinessBase ? "CriteriaBase" : "BusinessBase" %><<%= crit.Name %>>
     <%
                 }
                 %>

diff --git a/trunk/Templates/CSLA40/CSharp/ExtendedFile.cst b/trunk/Templates/CSLA40/CSharp/ExtendedFile.cst
@@ -1,4 +1,3 @@
-
 <%@ CodeTemplate Inherits="CslaTemplateHelperCS" Language="CSharp" TargetLanguage="CSharp" Description="Generates a CSLA Inherited Object." %>
 <%@ Property Name="Info" Type="CslaObjectInfo" Optional="false" Category="Business Object" Description="Definition of the CSLA Object to inherit from." %>
 <%@ Property Name="Errors" Type="System.Text.StringBuilder" Optional="false" Category="Options" Description="Allows the template to return errors to master.cst" %>
@@ -374,7 +373,7 @@ if (IsCriteriaExtendedClassNeeded(Info))
     <%
     foreach (Criteria crit in Info.CriteriaObjects)
     {
-        if (crit.Properties.Count > 1)
+        if (crit.Properties.Count > 1 && !crit.NestedClass)
         {
             %>
 

diff --git a/trunk/Templates/CSLA40/CSharp/XmlComment.asp b/trunk/Templates/CSLA40/CSharp/XmlComment.asp
@@ -1,4 +1,3 @@
-
 <%
 string classType = "business object";
 if (Info.ObjectType == CslaObjectType.BaseClass)

diff --git a/trunk/Templates/CSLA40/VB/Criteria.asp b/trunk/Templates/CSLA40/VB/Criteria.asp
@@ -11,14 +11,14 @@ if (Info.CriteriaObjects.Count > 0)
         IndentLevel += 3;
         %>
 
-        #Region " Criteria "
+        #Region " Nested Criteria "
         <%
         foreach (Criteria crit in Info.CriteriaObjects)
         {
             string strParams = string.Empty;
             string strFieldAssignments = string.Empty;
             string strComment = string.Empty;
-            if (crit.Properties.Count > 1)
+            if (crit.Properties.Count > 1 && crit.NestedClass)
             {
                     %>
 
@@ -57,7 +57,7 @@ if (Info.CriteriaObjects.Count > 0)
                     else
                     {
                         %>
-        Public <%= crit.CriteriaClassMode == CriteriaMode.BusinessBase ? "Partial " : "" %>Class <%= crit.Name %>
+        Public <%= IsCriteriaPartial(crit) ? "Partial " : "" %>Class <%= crit.Name %>
             Inherits <%= crit.CriteriaClassMode != CriteriaMode.BusinessBase ? "CriteriaBase" : "BusinessBase" %>(Of <%= crit.Name %>)
         <%
                     }
@@ -79,7 +79,7 @@ if (Info.CriteriaObjects.Count > 0)
                     else
                     {
                         %>
-        Protected <%= crit.CriteriaClassMode == CriteriaMode.BusinessBase ? "Partial " : "" %>Class <%= crit.Name %>
+        Protected <%= IsCriteriaPartial(crit) ? "Partial " : "" %>Class <%= crit.Name %>
             Inherits <%= crit.CriteriaClassMode != CriteriaMode.BusinessBase ? "CriteriaBase" : "BusinessBase" %>(Of <%= crit.Name %>)
         <%
                     }

diff --git a/trunk/Templates/CSLA40/VB/CriteriaObject.asp b/trunk/Templates/CSLA40/VB/CriteriaObject.asp
@@ -17,7 +17,7 @@ if (Info.CriteriaObjects.Count > 0)
             string strParams = string.Empty;
             string strFieldAssignments = string.Empty;
             string strComment = string.Empty;
-            if (crit.Properties.Count > 1)
+            if (crit.Properties.Count > 1 && !crit.NestedClass)
             {
                     %>
 
@@ -45,7 +45,7 @@ if (Info.CriteriaObjects.Count > 0)
                 else
                 {
                     %>
-    Public <%= crit.CriteriaClassMode == CriteriaMode.BusinessBase ? "Partial " : "" %>Class <%= crit.Name %>
+    Public <%= IsCriteriaPartial(crit) ? "Partial " : "" %>Class <%= crit.Name %>
         Inherits <%= crit.CriteriaClassMode != CriteriaMode.BusinessBase ? "CriteriaBase" : "BusinessBase" %>(Of <%= crit.Name %>)
     <%
                 }

diff --git a/trunk/Templates/CSLA40/VB/ExtendedFile.cst b/trunk/Templates/CSLA40/VB/ExtendedFile.cst
@@ -333,7 +333,7 @@ if (IsCriteriaExtendedClassNeeded(Info))
     <%
     foreach (Criteria crit in Info.CriteriaObjects)
     {
-        if (crit.Properties.Count > 1)
+        if (crit.Properties.Count > 1 && !crit.NestedClass)
         {
             %>
 

diff --git a/trunk/Templates/CSLA40DAL/CSharp/BaseClass.cst b/trunk/Templates/CSLA40DAL/CSharp/BaseClass.cst
@@ -1,4 +1,3 @@
-
 <%@ CodeTemplate Inherits="CslaTemplateHelperCS" Language="CSharp" TargetLanguage="CSharp" Description="Generates a CSLA Editable Root Object." %>
 <%@ Property Name="Info" Type="CslaObjectInfo" Optional="false" Category="Business Object" Description="Definition of the EditableRoot Object to create." %>
 <%@ Property Name="Errors" Type="System.Text.StringBuilder" Optional="false" Category="Options" Description="Allows the template to return errors to master.cst" %>
@@ -56,43 +55,7 @@ namespace <%= GetContextObjectNamespace(Info, CurrentUnit, GenerationStep.Busine
     }
     %>
     [Serializable]
-    <%
-    String[] clauses = GetGenericWhereClause(Info);
-    if (Info.InheritedType.FinalName != string.Empty)
-    {
-        %><%= GetBaseClassDeclarationInheritedType(Info) + GetInterfaceDeclaration(Info) %>
-<%
-        if (clauses.Length > 0)
-        {
-            %>
-        <%= clauses[0] %>
-<%
-        }
-        if (clauses.Length > 1)
-        {
-            %>
-        <%= clauses[1] %>
-<%
-        }
-    }
-    else
-    {
-        %><%= GetBaseClassDeclaration(Info) + GetInterfaceDeclaration(Info) %>
-<%
-        if (clauses.Length > 0)
-        {
-            %>
-        <%= clauses[0] %>
-<%
-        }
-        if (clauses.Length > 1)
-        {
-            %>
-        <%= clauses[1] %>
-<%
-        }
-    }
-    %>
+    <!-- #include file="BaseClassDeclaration.asp" -->
     {
     <%
     if (CslaBaseClassesExtensions.IsNotListBaseClass(Info.CslaBaseClass))

diff --git a/trunk/Templates/CSLA40DAL/CSharp/BaseClassDeclaration.asp b/trunk/Templates/CSLA40DAL/CSharp/BaseClassDeclaration.asp
@@ -0,0 +1,37 @@
+<%
+    String[] clauses = GetGenericWhereClause(Info);
+    if (Info.InheritedType.FinalName != string.Empty)
+    {
+        %><%= GetBaseClassDeclarationInheritedType(Info) + GetInterfaceDeclaration(Info) %>
+<%
+        if (clauses.Length > 0)
+        {
+            %>
+        <%= clauses[0] %>
+<%
+        }
+        if (clauses.Length > 1)
+        {
+            %>
+        <%= clauses[1] %>
+<%
+        }
+    }
+    else
+    {
+        %><%= GetBaseClassDeclaration(Info) + GetInterfaceDeclaration(Info) %>
+<%
+        if (clauses.Length > 0)
+        {
+            %>
+        <%= clauses[0] %>
+<%
+        }
+        if (clauses.Length > 1)
+        {
+            %>
+        <%= clauses[1] %>
+<%
+        }
+    }
+    %>
diff --git a/trunk/Templates/CSLA40DAL/CSharp/Constructor.asp b/trunk/Templates/CSLA40DAL/CSharp/Constructor.asp
@@ -24,7 +24,7 @@ if (Info.GenerateConstructor)
         #region Constructor
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="<%= Info.ObjectName %>"/> class.
+        /// Initializes a new instance of the <see cref="<%= Info.GenericNameXml %>"/> class.
         /// </summary>
         /// <remarks> Do not use to create a <%= Info.IsUnitOfWork() ? "Unit of Work" : "Csla object" %>. Use factory methods instead.</remarks>
 <%

diff --git a/trunk/Templates/CSLA40DAL/CSharp/Criteria.asp b/trunk/Templates/CSLA40DAL/CSharp/Criteria.asp
@@ -11,14 +11,14 @@ if (Info.CriteriaObjects.Count > 0)
         IndentLevel += 3;
         %>
 
-        #region Criteria
+        #region Nested Criteria
         <%
         foreach (Criteria crit in Info.CriteriaObjects)
         {
             string strParams = string.Empty;
             string strFieldAssignments = string.Empty;
             string strComment = string.Empty;
-            if (crit.Properties.Count > 1)
+            if (crit.Properties.Count > 1 && crit.NestedClass)
             {
                     %>
 
@@ -57,7 +57,7 @@ if (Info.CriteriaObjects.Count > 0)
                     else
                     {
                         %>
-        public <%= crit.CriteriaClassMode == CriteriaMode.BusinessBase ? "partial " : "" %>class <%= crit.Name %> : <%= crit.CriteriaClassMode != CriteriaMode.BusinessBase ? "CriteriaBase" : "BusinessBase" %><<%= crit.Name %>>
+        public <%= IsCriteriaPartial(crit) ? "partial " : "" %>class <%= crit.Name %> : <%= crit.CriteriaClassMode != CriteriaMode.BusinessBase ? "CriteriaBase" : "BusinessBase" %><<%= crit.Name %>>
         <%
                     }
                 }
@@ -78,7 +78,7 @@ if (Info.CriteriaObjects.Count > 0)
                     else
                     {
                         %>
-        protected <%= crit.CriteriaClassMode == CriteriaMode.BusinessBase ? "partial " : "" %>class <%= crit.Name %> : <%= crit.CriteriaClassMode != CriteriaMode.BusinessBase ? "CriteriaBase" : "BusinessBase" %><<%= crit.Name %>>
+        protected <%= IsCriteriaPartial(crit) ? "partial " : "" %>class <%= crit.Name %> : <%= crit.CriteriaClassMode != CriteriaMode.BusinessBase ? "CriteriaBase" : "BusinessBase" %><<%= crit.Name %>>
         <%
                     }
                 }

diff --git a/trunk/Templates/CSLA40DAL/CSharp/CriteriaObject.asp b/trunk/Templates/CSLA40DAL/CSharp/CriteriaObject.asp
@@ -17,7 +17,7 @@ if (Info.CriteriaObjects.Count > 0)
             string strParams = string.Empty;
             string strFieldAssignments = string.Empty;
             string strComment = string.Empty;
-            if (crit.Properties.Count > 1)
+            if (crit.Properties.Count > 1 && !crit.NestedClass)
             {
                     %>
 
@@ -45,7 +45,7 @@ if (Info.CriteriaObjects.Count > 0)
                 else
                 {
                     %>
-    public <%= crit.CriteriaClassMode == CriteriaMode.BusinessBase ? "partial " : "" %>class <%= crit.Name %> : <%= crit.CriteriaClassMode != CriteriaMode.BusinessBase ? "CriteriaBase" : "BusinessBase" %><<%= crit.Name %>>
+    public <%= IsCriteriaPartial(crit) ? "partial " : "" %>class <%= crit.Name %> : <%= crit.CriteriaClassMode != CriteriaMode.BusinessBase ? "CriteriaBase" : "BusinessBase" %><<%= crit.Name %>>
     <%
                 }
                 %>