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

       private static string fromColumnTitle = null;
       private static ArrayList fromElementTypes = null;
       private static bool fromPackageRecursion = true;
       private static EA.Package fromPackage = null;
       private static bool fromPackageTrimming = false;
+      private static bool fromElementNotes = false;
       private static string toIntroText = null;       // This one is optional
       private static string toPackageGUID = null;
       private static string toFromTableTitle = null;  // This one is optional
       private static string toColumnTitle = null;
       private static ArrayList toElementTypes = null;
       private static bool toPackageRecursion = true;
       private static EA.Package toPackage = null;
       private static bool toPackageTrimming = false;
+      private static bool toElementNotes = false;
       private static string [] options_string = null;
+      private enum DictionaryValueType
+      {
+         DVT_EA_ELEMENT,
+         DVT_STRING
+      };
 		public static void initialise(ArrayList processedElementsRef)
+		{
          processedElements = processedElementsRef;
          fromColumnTitle = null;
          fromElementTypes.Clear();
          fromPackageRecursion = true;
          fromPackageTrimming = false;
          fromPackage = null;
+         fromElementNotes = false;
          toIntroText = null;
          toPackageGUID = null;
          toFromTableTitle = null;
          toColumnTitle = null;
          toElementTypes.Clear();
          toPackageRecursion = true;
          toPackageTrimming = false;
          toPackage = null;
+         toElementNotes = false;
+      }
       public static bool processRelationshipMatrixOptions(EA.Element theElement)
+      {
+            {
                if (s.StartsWith("style="))
+               {
                   style = EA_DocGenOptions.getOptionValue(s, style);
+               }
-               // FROM items
+                  // FROM items
                else if (s.StartsWith("fromIntroText="))
+               {
                   fromIntroText = EA_DocGenOptions.getOptionValue(s, null);
+               }
                else if (s.StartsWith("fromToTableTitle="))
+               }
                else if (s.StartsWith("fromPackage="))
+               {
                   fromPackageGUID = EA_DocGenOptions.getOptionValue(s, fromPackageGUID);
+               }
+               else if (s.StartsWith("fromElementNotes="))
+               {
+                  fromElementNotes = EA_DocGenOptions.getOptionValue(s, fromElementNotes);
+               }
                else if (s.StartsWith("fromElementType="))
+               {
                   string et = EA_DocGenOptions.getOptionValue(s,null);
                   if (et != null)
+                  {
+               }
                else if (s.StartsWith("toPackage="))
+               {
                   toPackageGUID = EA_DocGenOptions.getOptionValue(s, toPackageGUID);
+               }
+               else if (s.StartsWith("toElementNotes="))
+               {
+                  toElementNotes = EA_DocGenOptions.getOptionValue(s, toElementNotes);
+               }
                else if (s.StartsWith("toElementType="))
+               {
                   string et = EA_DocGenOptions.getOptionValue(s,null);
                   if (et != null)
+                  {
                + "fromPackage=\r\n"
                + "fromElementType=\r\n"
                + "fromElementType=\r\n"
                + "fromPackageRecursion=true\r\n"
                + "fromPackageTrimming=false\r\n"
+               + "fromElementNotes=false\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";
+               + "toPackageTrimming=false\r\n"
+               + "toElementNotes=false\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"
                + "fromColumnTitle=Requirement\r\n"
                + "fromPackage=\r\n"
                + "fromElementType=Requirement\r\n"
                + "fromPackageRecursion=true\r\n"
                + "fromPackageTrimming=false\r\n"
+               + "fromElementNotes=false\r\n"
                + "toPackageRecursion=true\r\n"
                + "toPackage=\r\n"
                + "toColumnTitle=Source Requirements\r\n"
                + "toElementType=Requirement\r\n";
             table = createWordDoc.WordDocument.Tables[tableNum];
             TabularContent.Table_SetTableColumnTitle(table, fromColumnTitle, 1);
             TabularContent.Table_SetTableColumnTitle(table, toColumnTitle, 2);
-            fillInTable(fromToDictionary, table);
+            fillInTable(fromToDictionary, table, DictionaryValueType.DVT_EA_ELEMENT);
+         }
          if (createWordDoc.abortCreationThread)
             return;
          // Does user want a to-from table ?
          if (needToFromTable)
+         {
+            // update fromElementNotes with toElementNotes setting
+            fromElementNotes = toElementNotes;
             // re-use the fromToDictionary to prepare the to-from table content
             fromToDictionary.Clear();
             // find all elements for the left hand column of the to-from table.
             ElementAccumulator toLister = new ElementAccumulator(toElementTypes);
             table = createWordDoc.WordDocument.Tables[tableNum];
             TabularContent.Table_SetTableColumnTitle(table, toColumnTitle, 1);
             TabularContent.Table_SetTableColumnTitle(table, fromColumnTitle, 2);
-            fillInTable(fromToDictionary, table);
+            fillInTable(fromToDictionary, table, DictionaryValueType.DVT_STRING);
+         }
+      }
-      private static void fillInTable(ArrayList fromToDictionary, Word.Table table )
+      private static void fillInTable(ArrayList fromToDictionary, Word.Table table, DictionaryValueType valueType )
+      {
          int lastFromElementId = -1;
-         bool firstToFromCon = true;
+         bool firstCellContent = true;
          int row = 1;
          foreach (DictionaryEntry de in fromToDictionary)
+         {
             if (createWordDoc.abortCreationThread)
                return;
             if ( ((EA.Element)de.Key).ElementID != lastFromElementId )
+            {
                lastFromElementId = ((EA.Element)de.Key).ElementID;
                row++;
                table.Cell(row,1).Range.Text = ((EA.Element)de.Key).Name;
-               firstToFromCon = true;
+               firstCellContent = true;
+               if (fromElementNotes && ((EA.Element)de.Key).Notes != null && ((EA.Element)de.Key).Notes.Length > 0)
+               {
+                  table.Cell(row,1).Range.Text += ((EA.Element)de.Key).Notes;
+               }
+            }
-            if (((string)de.Value).Length > 0)
+            if ((valueType == DictionaryValueType.DVT_EA_ELEMENT) && (((EA.Element)de.Value) != null))
+            {
-               if (firstToFromCon)
+               if (firstCellContent)
+               {
-                  firstToFromCon = false;
+                  firstCellContent = false;
+                  table.Cell(row,2).Range.Text = ((EA.Element)de.Value).Name;
+               }
+               else
+               {
+                  table.Cell(row,2).Range.Text += ((EA.Element)de.Value).Name;
+               }
+            }
+            else if ((valueType == DictionaryValueType.DVT_STRING) && (((string)de.Value).Length > 0))
+            {
+               if (firstCellContent)
+               {
+                  firstCellContent = false;
                   table.Cell(row,2).Range.Text = (string)de.Value;
+               }
                else
+               {
                   table.Cell(row,2).Range.Text += (string)de.Value;
             if (createWordDoc.abortCreationThread)
                return;
             table.Cell(row,1).Range.Text = ele.Name;
+            if (fromElementNotes && ele.Notes != null && ele.Notes.Length > 0)
+            {
+               table.Cell(row,1).Range.Text += ele.Notes;
+            }
             StringBuilder sb = new StringBuilder();
             ArrayList parentsDiscovered = new ArrayList();
             // Find this requirement's parent (source) requirements

Subversion Repositories DevTools

(root)/EA_DocGen/trunk/EA_DocGen/EA_RelationshipMatrix.cs – Rev 2116 → 2118