WebSVN – DevTools – Diff – /EA_DocGen/trunk/EA_DocGen/EA_RelationshipMatrix.cs

          public ArrayList elementTypes;
          public bool packageRecursion;
          public bool packageTrimming;
          public bool elementNotes;
+         public bool reqTagSort;
       };
       public struct RM_TableType
+      {
          public string introText;
          RM_Matrix.from.elementTypes.Clear();
          RM_Matrix.from.packageRecursion = true;
          RM_Matrix.from.packageTrimming = false;
          RM_Matrix.from.elementNotes = false;
          RM_Matrix.from.packageName = null;
+         RM_Matrix.from.reqTagSort = true;
          fromPackage = null;
          RM_Matrix.toFromTable.introText = null;
          RM_Matrix.toFromTable.title = null;
          RM_Matrix.to.elementTypes.Clear();
          RM_Matrix.to.packageRecursion = true;
          RM_Matrix.to.packageTrimming = false;
          RM_Matrix.to.elementNotes = false;
          RM_Matrix.to.packageName = null;
+         RM_Matrix.to.reqTagSort = true;
          toPackage = null;
+      }
                   if (et != null)
+                  {
                      RM_Matrix.from.elementTypes.Add( et );
+                  }
+               }
+               else if (s.StartsWith("fromUsesTagSort="))
+               {
+                  RM_Matrix.from.reqTagSort = EA_DocGenOptions.getOptionValue(s, RM_Matrix.from.reqTagSort);
+               }
                   // TO items
                else if (s.StartsWith("toIntroText="))
+               {
                   RM_Matrix.toFromTable.introText = EA_DocGenOptions.getOptionValue(s, null);
                   if (et != null)
+                  {
                      RM_Matrix.to.elementTypes.Add( et );
+                  }
+               }
+               else if (s.StartsWith("toUsesTagSort="))
+               {
+                  RM_Matrix.to.reqTagSort = EA_DocGenOptions.getOptionValue(s, RM_Matrix.to.reqTagSort);
+               }
+            }
+         }
          // Verify that we have all the necessary compulsory options
          if (RM_Matrix.fromToTable.title == null && RM_Matrix.toFromTable.title == null)
                + "fromPackage=\r\n"
                + "fromElementType=\r\n"
                + "fromElementType=\r\n"
                + "fromPackageRecursion=true\r\n"
                + "fromPackageTrimming=false\r\n"
                + "fromElementNotes=false\r\n"
+               + "fromUsesTagSort=true\r\n"
                + "toFromTableTitle=\r\n"
                + "toIntroText=\r\n"
                + "toColumnTitle=\r\n"
                + "toPackage=\r\n"
                + "toElementType=\r\n"
                + "toPackageRecursion=true\r\n"
                + "toPackageTrimming=false\r\n"
-               + "toElementNotes=false\r\n";
+               + "toElementNotes=false\r\n"
+               + "toUsesTagSort=true\r\n";
             case 2:
                return
                "style=2\r\n"
                + "fromToTableTitle=Requirement Dependencies\r\n"
                + "fromIntroText=The following table identifies the source requirements (if any) for each requirement stated in this document.\r\n"
                + "fromPackage=\r\n"
                + "fromElementType=Requirement\r\n"
                + "fromPackageRecursion=true\r\n"
                + "fromPackageTrimming=false\r\n"
                + "fromElementNotes=false\r\n"
+               + "fromUsesTagSort=true\r\n"
                + "toPackageRecursion=true\r\n"
                + "toPackage=\r\n"
                + "toColumnTitle=Source Requirements\r\n"
                + "toElementType=Requirement\r\n";
+      {
          int tableNum = 0;
          Word.Table table = null;
          // Scan the fromPackage to find all the "from elements".
+         Main.WriteOutput("   Finding elements in fromPackage", -1);
          ElementAccumulator fromLister = new ElementAccumulator(RM_Matrix.from.elementTypes);
          EA_Utilities.findAndProcessPackageElements( fromPackage, fromLister, RM_Matrix.from.packageRecursion );
          if (createWordDoc.abortCreationThread)
             return;
          // Scan the toPackage to find all the "to elements".
+         Main.WriteOutput("   Finding elements in toPackage", -1);
          ElementAccumulator toLister = new ElementAccumulator(RM_Matrix.to.elementTypes);
          EA_Utilities.findAndProcessPackageElements( toPackage, toLister, RM_Matrix.to.packageRecursion );
          if (createWordDoc.abortCreationThread)
             return;
          // Sort the "from elements"
+         Main.WriteOutput("   Sorting elements in fromPackage", -1);
+         if (RM_Matrix.from.reqTagSort)
+         {
+            elementSortByTAG sorter = new elementSortByTAG();
+            fromLister.Elements.Sort( sorter );
+         }
+         else
+         {
-         elementSortByName sorter = new elementSortByName();
+            elementSortByName sorter = new elementSortByName();
-         fromLister.Elements.Sort( sorter );
+            fromLister.Elements.Sort( sorter );
+         }
          // Sort the "to" elements
+         Main.WriteOutput("   Sorting elements in toPackage", -1);
+         if (RM_Matrix.to.reqTagSort)
+         {
+            elementSortByTAG sorter = new elementSortByTAG();
-         toLister.Elements.Sort( sorter );
+            toLister.Elements.Sort( sorter );
+         }
+         else
+         {
+            elementSortByName sorter = new elementSortByName();
+            toLister.Elements.Sort( sorter );
+         }
          if (createWordDoc.abortCreationThread)
             return;
          // dictionary to support from-to table construction.
             needToFromTable = true;
          // NOTE: this code has to execute even if no from-to table is needed, in order to support the
          // generation of a to-from table, assuming the user has requested one.
          int numberOfFromToRows = 0;
+         Main.WriteOutput("   Creating from-to Dictionary", -1);
          foreach(EA.Element fromElement in fromLister.Elements)
+         {
             if (createWordDoc.abortCreationThread)
                return;
          if (needFromToTable)
+         {
             // Now we can actually serialise the table
+            Main.WriteOutput("   Creating from-to table", -1);
             if (RM_Matrix.fromToTable.introText != null && RM_Matrix.fromToTable.introText.Length > 0)
+            {
                Word.Range wr = TextualContent.appendAndSelectText( RM_Matrix.fromToTable.introText, EA_Constants.styleName_Body1 );
                object obj = string.Format("EA_DocGen Informational Comment - This table has been produced using the following options:\n\n{0}", RM_Element.Notes);
                createWordDoc.WordDocument.Comments.Add(wr, ref obj);
             return;
          // Does user want a to-from table ?
          if (needToFromTable)
+         {
+            Main.WriteOutput("   Creating to-from Dictionary", -1);
             // update fromElementNotes with toElementNotes setting
             RM_Matrix.from.elementNotes = RM_Matrix.to.elementNotes;
             // re-use the fromToDictionary to prepare the to-from table content
             fromToDictionary.Clear();
             if (createWordDoc.abortCreationThread)
                return;
             // Now begin to add the to-from table to the word document
+            Main.WriteOutput("   Creating to-from table", -1);
             if (RM_Matrix.toFromTable.introText != null && RM_Matrix.toFromTable.introText.Length > 0)
+            {
                Word.Range wr = TextualContent.appendAndSelectText( RM_Matrix.toFromTable.introText, EA_Constants.styleName_Body1 );
                // add options comment only if user did not generate a from-to table, since there is no point in repeating
          int i;
          int tableNum = 0;
          Word.Table table = null;
          // Scan the fromPackage to find all the "from elements".
+         Main.WriteOutput("   Finding elements in fromPackage", -1);
          ElementAccumulator fromLister = new ElementAccumulator(RM_Matrix.from.elementTypes);
          EA_Utilities.findAndProcessPackageElements( fromPackage, fromLister, RM_Matrix.from.packageRecursion );
          if (createWordDoc.abortCreationThread)
             return;
          if (createWordDoc.abortCreationThread)
             return;
          // Sort the remaining "from elements"
+         Main.WriteOutput("   Sorting elements in fromPackage", -1);
+         if (RM_Matrix.from.reqTagSort)
+         {
+            elementSortByTAG sorter = new elementSortByTAG();
+            fromLister.Elements.Sort( sorter );
+         }
+         else
+         {
-         elementSortByName sorter = new elementSortByName();
+            elementSortByName sorter = new elementSortByName();
-         fromLister.Elements.Sort( sorter );
+            fromLister.Elements.Sort( sorter );
+         }
          if (createWordDoc.abortCreationThread)
             return;
          // Scan the toPackage to find all the "to elements".
          // Extract their element IDs into a new list.
+         Main.WriteOutput("   Finding elements in toPackage", -1);
          ElementAccumulator toLister = new ElementAccumulator(RM_Matrix.to.elementTypes);
          EA_Utilities.findAndProcessPackageElements( toPackage, toLister, RM_Matrix.to.packageRecursion );
          ArrayList acceptableParents = new ArrayList();
          foreach(EA.Element ele in toLister.Elements)
+         {
             return;
          // The list of from elements dictates the number of rows in our table.
          int numberOfFromToRows = fromLister.Elements.Count;
+         Main.WriteOutput("   Creating from-to table", -1);
          if (RM_Matrix.fromToTable.introText != null && RM_Matrix.fromToTable.introText.Length > 0)
+         {
             Word.Range wr = TextualContent.appendAndSelectText( RM_Matrix.fromToTable.introText, EA_Constants.styleName_Body1 );
             object obj = string.Format("EA_DocGen Informational Comment - This table has been produced using the following options:\n\n{0}", RM_Element.Notes);
             createWordDoc.WordDocument.Comments.Add(wr, ref obj);

Subversion Repositories DevTools

(root)/EA_DocGen/trunk/EA_DocGen/EA_RelationshipMatrix.cs – Rev 2122 → 2124