Subversion Repositories DevTools

Rev

Rev 2108 | Rev 2122 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 2108 Rev 2116
Line 13... Line 13...
13 
   public class EA_DocGenOptions
 13 
   public class EA_DocGenOptions
14 
   {
 14 
   {
15 
      // Strings used in the notes section of an EA_DocGen element that persists the options.
 15 
      // Strings used in the notes section of an EA_DocGen element that persists the options.
16 
      public static string optstr_GeneralOptions = "[GeneralOptions]";
 16 
      public static string optstr_GeneralOptions = "[GeneralOptions]";
17 
      public static string optstr_ElementTypes   = "[ElementTypes]";
 17 
      public static string optstr_ElementTypes   = "[ElementTypes]";
18 
      public static string optstr_SuppressElementDescriptionMissingWarnings = "SuppressElementDescriptionMissingWarnings";
 - 
 
19 
      public static string optstr_SuppressUnAllocatedRelationshipWarnings = "SuppressUnAllocatedRelationshipWarnings";
 - 
 
20 
      public static string optstr_SuppressPrivateAttributes = "SuppressPrivateAttributes";
 - 
 
21 
      public static string optstr_SuppressPrivateMethods    = "SuppressPrivateMethods";
 - 
 
22 
      public static string optstr_SuppressPrivateClasses    = "SuppressPrivateClasses";
 - 
 
23 
      public static string optstr_ConsiderAPIElementsOnly   = "ConsiderAPIClassesOnly";
 - 
 
24 
      public static string optstr_ConsiderAPIPackagesOnly   = "ConsiderAPIPackagesOnly";
 - 
 
25 
      public static string optstr_ConsiderAPIDiagramsOnly   = "ConsiderAPIDiagramsOnly";
 - 
 
26 
      public static string optstr_RestrictForLinkedPackagesOnly = "APIPackageRestrictionForLinkedPackagesOnly";
 - 
 
27 
 
 - 
 
28 
 
 18 
 
29 
      private static string [] options_string = null;
 19 
      private static string [] options_string = null;
30 
      private static bool options_found = false;
 20 
      private static bool options_found = false;
31 
 
 21 
 
32 
      // General options
 22 
      // Boolean options
- 
 
 23 
      public enum boolean_options_e
33 
 
 24 
      {
- 
 
 25 
         SUPPRESS_PRIVATE_CLASSES = 0,
- 
 
 26 
         SUPPRESS_PRIVATE_ATTRIBUTES,
- 
 
 27 
         SUPPRESS_PRIVATE_METHODS,
- 
 
 28 
         SUPPRESS_METHOD_CHARACTERISTICS,
- 
 
 29 
         SUPPRESS_CLASS_CHARACTERISTICS,
- 
 
 30 
         SUPPRESS_CLASS_REQUIREMENTS,
- 
 
 31 
         SUPPRESS_CLASS_CONSTRAINTS,
- 
 
 32 
         SUPPRESS_CLASS_BASE_CLASSES,
- 
 
 33 
         SUPPRESS_CLASS_REALISES,
- 
 
 34 
         SUPPRESS_ATTRIBUTE_CHARACTERISTICS,
34 
      public static bool opt_SuppressElementDescriptionMissingWarnings;
 35 
         SUPPRESS_ELEMENT_DESC_MISSING_WARNINGS,
35 
      public static bool opt_SuppressUnAllocatedRelationshipWarnings;
 36 
         SUPPRESS_UN_ALLOCATED_RELATIONSHIP_WARNINGS,
- 
 
 37 
         CONSIDER_API_ELEMENTS_ONLY,
- 
 
 38 
         CONSIDER_API_DIAGRAMS_ONLY,
- 
 
 39 
         CONSIDER_API_PACKAGES_ONLY,
- 
 
 40 
         RESTRICT_FOR_LINKED_PACKAGES_ONLY,
- 
 
 41 
         USE_NUM_PARA_FOR_GENERATED_TEST_CASES,
36 
 
 42 
 
- 
 
 43 
         UNKNOWN = -1
- 
 
 44 
      };
37 
 
 45 
 
- 
 
 46 
      // local class to collect together stuff for a discrete boolean option
38 
      // Visibility options
 47 
      private class boolopt
- 
 
 48 
      {
39 
      public static bool opt_SuppressPrivateAttributes;
 49 
         public boolean_options_e enumVal;
40 
      public static bool opt_SuppressPrivateMethods;
 50 
         public int level;
41 
      public static bool opt_SuppressPrivateClasses;
 51 
         public string optstr;
42 
 
 - 
 
43 
      public static bool opt_ConsiderAPIElementsOnly;
 52 
         public string displayName;
44 
      public static bool opt_ConsiderAPIPackagesOnly;
 53 
         public bool value;
45 
      public static bool opt_ConsiderAPIDiagramsOnly;
 54 
         public boolopt(int l, boolean_options_e e, string o, string dn, bool v)
- 
 
 55 
         {
- 
 
 56 
            enumVal = e;
- 
 
 57 
            level = l;
46 
      public static bool opt_RestrictForLinkedPackagesOnly;
 58 
            optstr = o;
- 
 
 59 
            displayName = dn;
- 
 
 60 
            value = v;
- 
 
 61 
         }
- 
 
 62 
      };
47 
 
 63 
 
- 
 
 64 
      // A collection of boolean options
- 
 
 65 
      public static ArrayList boolopts;
- 
 
 66 
      private static int i_boolopts;
- 
 
 67
48 
 
 68 
 
49 
      // Element Types list
 69 
      // Element Types list
50 
      public static ArrayList opt_ElementTypes = null;
 70 
      public static ArrayList opt_ElementTypes = null;
51 
 
 71 
 
52 
 
 72
53 
      public static void initialise()
 73 
      public static void initialise()
54 
      {
 74 
      {
- 
 
 75 
         // Create discrete boolean options collection. The ordering of these statements dictates the display order in
- 
 
 76 
         // the options form.
- 
 
 77 
         //
- 
 
 78 
         // WARNING: level number can be 1 or 2, but no higher.
- 
 
 79 
         //
- 
 
 80 
         // BIG WARNING
- 
 
 81 
         // Make sure that if any option string is a substring of another option string, then the longest of the
- 
 
 82 
         // two must appear first in this initialisation sequence
- 
 
 83 
 
- 
 
 84 
         boolopts = new ArrayList();
- 
 
 85 
         boolopts.Add(new boolopt(1, boolean_options_e.CONSIDER_API_ELEMENTS_ONLY,        "ConsiderAPIClassesOnly",  "Consider API Stereotyped Elements Only", false) );
- 
 
 86 
         boolopts.Add(new boolopt(1, boolean_options_e.CONSIDER_API_DIAGRAMS_ONLY,        "ConsiderAPIDiagramsOnly", "Consider API Stereotyped Diagrams Only", false) );
- 
 
 87 
         boolopts.Add(new boolopt(1, boolean_options_e.CONSIDER_API_PACKAGES_ONLY,        "ConsiderAPIPackagesOnly", "Consider API Stereotyped Packages Only", false) );
- 
 
 88 
         boolopts.Add(new boolopt(2, boolean_options_e.RESTRICT_FOR_LINKED_PACKAGES_ONLY, "APIPackageRestrictionForLinkedPackagesOnly", "Restriction Applies Only To Linked Packages", true) );
- 
 
 89 
 
- 
 
 90 
         boolopts.Add(new boolopt(1, boolean_options_e.SUPPRESS_PRIVATE_CLASSES,       "SuppressPrivateClasses",       "Suppress Private Classes", false) );
- 
 
 91 
         boolopts.Add(new boolopt(1, boolean_options_e.SUPPRESS_CLASS_CHARACTERISTICS, "SuppressClassCharacteristics", "Suppress Class Characteristics", false) );
- 
 
 92 
         boolopts.Add(new boolopt(1, boolean_options_e.SUPPRESS_CLASS_BASE_CLASSES,    "SuppressClassBaseClasses",     "Suppress Class Base Class List", false) );
- 
 
 93 
         boolopts.Add(new boolopt(1, boolean_options_e.SUPPRESS_CLASS_REALISES,        "SuppressClassRealises",        "Suppress Class Realisation List", false) );
- 
 
 94 
         boolopts.Add(new boolopt(1, boolean_options_e.SUPPRESS_CLASS_REQUIREMENTS,    "SuppressClassRequirements",    "Suppress Class Requirements", false) );
- 
 
 95 
         boolopts.Add(new boolopt(1, boolean_options_e.SUPPRESS_CLASS_CONSTRAINTS,     "SuppressClassConstraints",     "Suppress Class Constraints", false) );
- 
 
 96 
 
- 
 
 97 
         boolopts.Add(new boolopt(1, boolean_options_e.SUPPRESS_PRIVATE_ATTRIBUTES,        "SuppressPrivateAttributes",        "Suppress Private Attributes", false) );
- 
 
 98 
         boolopts.Add(new boolopt(1, boolean_options_e.SUPPRESS_ATTRIBUTE_CHARACTERISTICS, "SuppressAttributeCharacteristics", "Suppress Attribute Characteristics", false) );
- 
 
 99 
 
- 
 
 100 
         boolopts.Add(new boolopt(1, boolean_options_e.SUPPRESS_PRIVATE_METHODS,        "SuppressPrivateMethods",        "Suppress Private Methods", false) );
- 
 
 101 
         boolopts.Add(new boolopt(1, boolean_options_e.SUPPRESS_METHOD_CHARACTERISTICS, "SuppressMethodCharacteristics", "Suppress Method Characteristics", false) );
- 
 
 102 
 
- 
 
 103 
         boolopts.Add(new boolopt(1, boolean_options_e.SUPPRESS_ELEMENT_DESC_MISSING_WARNINGS,      "SuppressElementDescriptionMissingWarnings", "Suppress Element Description Missing Warnings", false) );
- 
 
 104 
         boolopts.Add(new boolopt(1, boolean_options_e.SUPPRESS_UN_ALLOCATED_RELATIONSHIP_WARNINGS, "SuppressUnAllocatedRelationshipWarnings",   "Suppress Un-Allocated Relationship Warnings", false) );
- 
 
 105 
 
- 
 
 106 
         boolopts.Add(new boolopt(1, boolean_options_e.USE_NUM_PARA_FOR_GENERATED_TEST_CASES, "UseNumParaForGeneratedTestCases", "Use NumPara Styles For Generated Test Case Sections", true) );
- 
 
 107 
 
- 
 
 108 
         // Create element types list
55 
         if (opt_ElementTypes == null)
 109 
         if (opt_ElementTypes == null)
56 
            opt_ElementTypes = new ArrayList();
 110 
            opt_ElementTypes = new ArrayList();
57 
         opt_ElementTypes.Clear();
 111 
         opt_ElementTypes.Clear();
58 
         setDefaults();
 112 
         setDefaults();
59 
      }
 113 
      }
60 
 
 114 
 
- 
 
 115
- 
 
 116 
      /// <summary>
- 
 
 117 
      /// Function to return to another class the value of a specified discrete boolean option
- 
 
 118 
      /// </summary>
- 
 
 119 
      /// <param name="e"></param>
- 
 
 120 
      /// <returns></returns>
- 
 
 121 
      public static bool optionValue(boolean_options_e e)
- 
 
 122 
      {
- 
 
 123 
         foreach (boolopt bo in boolopts)
- 
 
 124 
         {
- 
 
 125 
            if (bo.enumVal == e)
- 
 
 126 
            {
- 
 
 127 
               return bo.value;
- 
 
 128 
            }
- 
 
 129 
         }
- 
 
 130 
         return false;
- 
 
 131 
      }
- 
 
 132 
 
- 
 
 133 
      /// <summary>
- 
 
 134 
      /// Function to allow another class to set the value of a discrete boolean option.
- 
 
 135 
      /// Normally, this will only be done from the editing form class.
- 
 
 136 
      /// </summary>
- 
 
 137 
      /// <param name="e"></param>
- 
 
 138 
      /// <param name="value"></param>
- 
 
 139 
      public static void optionValue(boolean_options_e e, bool value)
- 
 
 140 
      {
- 
 
 141 
         foreach (boolopt bo in boolopts)
- 
 
 142 
         {
- 
 
 143 
            if (bo.enumVal == e)
- 
 
 144 
            {
- 
 
 145 
               bo.value = value;
- 
 
 146 
               break;
- 
 
 147 
            }
- 
 
 148 
         }
- 
 
 149 
      }
- 
 
 150 
 
- 
 
 151 
      /// <summary>
- 
 
 152 
      /// Function to return the option string to use for a specified
- 
 
 153 
      /// discrete boolean option. Option strings are used in the actual EA element to record
- 
 
 154 
      /// the state of the option. They are (or may be) similar to the display names for the options
- 
 
 155 
      /// but without any spaces, and they may be shortened somewhat too.
- 
 
 156 
      /// </summary>
- 
 
 157 
      /// <param name="e"></param>
- 
 
 158 
      /// <returns></returns>
- 
 
 159 
      private static string optionString(boolean_options_e e)
- 
 
 160 
      {
- 
 
 161 
         foreach (boolopt bo in boolopts)
- 
 
 162 
         {
- 
 
 163 
            if (bo.enumVal == e)
- 
 
 164 
            {
- 
 
 165 
               return bo.optstr;
- 
 
 166 
            }
- 
 
 167 
         }
- 
 
 168 
         return null;
- 
 
 169 
      }
- 
 
 170 
 
- 
 
 171 
      /// <summary>
- 
 
 172 
      /// Helper for getFirstBooleanOption() and getNextBooleanOption()
- 
 
 173 
      /// </summary>
- 
 
 174 
      /// <param name="index"></param>
- 
 
 175 
      /// <param name="e"></param>
- 
 
 176 
      /// <param name="level"></param>
- 
 
 177 
      /// <param name="displayName"></param>
- 
 
 178 
      /// <param name="value"></param>
- 
 
 179 
      private static void getBooleanOption(int index, out boolean_options_e e, out int level, out string displayName, out bool value)
- 
 
 180 
      {
- 
 
 181 
         boolopt o = (boolopt)boolopts[index];
- 
 
 182 
         e = o.enumVal;
- 
 
 183 
         level = o.level;
- 
 
 184 
         displayName = o.displayName;
- 
 
 185 
         value = o.value;
- 
 
 186 
      }
- 
 
 187 
 
- 
 
 188 
      /// <summary>
- 
 
 189 
      /// Function to return the details of the first discrete boolean option.
- 
 
 190 
      /// This will be used by the option editing form class to populate a list for user editing.
- 
 
 191 
      /// </summary>
- 
 
 192 
      /// <param name="e"></param>
- 
 
 193 
      /// <param name="level"></param>
- 
 
 194 
      /// <param name="displayName"></param>
- 
 
 195 
      /// <param name="value"></param>
- 
 
 196 
      /// <returns></returns>
- 
 
 197 
      public static bool getFirstBooleanOption(out boolean_options_e e, out int level, out string displayName, out bool value)
- 
 
 198 
      {
- 
 
 199 
         i_boolopts = 0;
- 
 
 200 
 
- 
 
 201 
         e = boolean_options_e.UNKNOWN;
- 
 
 202 
         level = 1;
- 
 
 203 
         displayName = "";
- 
 
 204 
         value = false;
- 
 
 205 
 
- 
 
 206 
         if (i_boolopts < boolopts.Count)
- 
 
 207 
         {
- 
 
 208 
            getBooleanOption(i_boolopts, out e, out level, out displayName, out value);
- 
 
 209 
            return true;
- 
 
 210 
         }
- 
 
 211 
         else
- 
 
 212 
         {
- 
 
 213 
            return false;
- 
 
 214 
         }
- 
 
 215 
      }
- 
 
 216 
 
- 
 
 217 
      /// <summary>
- 
 
 218 
      /// Function to return the details of the next discrete boolean option.
- 
 
 219 
      /// This will be used by the option editing form class to populate a list for user editing.
- 
 
 220 
      /// </summary>
- 
 
 221 
      /// <param name="e"></param>
- 
 
 222 
      /// <param name="level"></param>
- 
 
 223 
      /// <param name="displayName"></param>
- 
 
 224 
      /// <param name="value"></param>
- 
 
 225 
      /// <returns></returns>
- 
 
 226 
      public static bool getNextBooleanOption(out boolean_options_e e, out int level, out string displayName, out bool value)
- 
 
 227 
      {
- 
 
 228 
         i_boolopts++;
- 
 
 229 
 
- 
 
 230 
         e = boolean_options_e.UNKNOWN;
- 
 
 231 
         level = 1;
- 
 
 232 
         displayName = "";
- 
 
 233 
         value = false;
- 
 
 234 
 
- 
 
 235 
         if (i_boolopts < boolopts.Count)
- 
 
 236 
         {
- 
 
 237 
            getBooleanOption(i_boolopts, out e, out level, out displayName, out value);
- 
 
 238 
            return true;
- 
 
 239 
         }
- 
 
 240 
         else
- 
 
 241 
         {
- 
 
 242 
            return false;
- 
 
 243 
         }
- 
 
 244 
      }
- 
 
 245 
 
- 
 
 246 
      /// <summary>
- 
 
 247 
      /// Set default values for the discrete boolean options.
- 
 
 248 
      /// </summary>
61 
      private static void setDefaults()
 249 
      private static void setDefaults()
62 
      {
 250 
      {
- 
 
 251 
         optionValue(EA_DocGenOptions.boolean_options_e.SUPPRESS_ELEMENT_DESC_MISSING_WARNINGS, false);
- 
 
 252 
         optionValue(EA_DocGenOptions.boolean_options_e.SUPPRESS_UN_ALLOCATED_RELATIONSHIP_WARNINGS, false);
63 
         opt_SuppressElementDescriptionMissingWarnings = false;
 253 
         optionValue(EA_DocGenOptions.boolean_options_e.SUPPRESS_PRIVATE_ATTRIBUTES, false);
64 
         opt_SuppressUnAllocatedRelationshipWarnings = false;
 254 
         optionValue(EA_DocGenOptions.boolean_options_e.SUPPRESS_PRIVATE_METHODS, false);
65 
         opt_SuppressPrivateAttributes = false;
 255 
         optionValue(EA_DocGenOptions.boolean_options_e.SUPPRESS_PRIVATE_CLASSES, false);
- 
 
 256 
         optionValue(EA_DocGenOptions.boolean_options_e.SUPPRESS_METHOD_CHARACTERISTICS, false);
- 
 
 257 
         optionValue(EA_DocGenOptions.boolean_options_e.SUPPRESS_CLASS_CHARACTERISTICS, false);
66 
         opt_SuppressPrivateMethods    = false;
 258 
         optionValue(EA_DocGenOptions.boolean_options_e.SUPPRESS_CLASS_REQUIREMENTS, false);
67 
         opt_SuppressPrivateClasses    = false;
 259 
         optionValue(EA_DocGenOptions.boolean_options_e.SUPPRESS_CLASS_CONSTRAINTS, false);
- 
 
 260 
         optionValue(EA_DocGenOptions.boolean_options_e.SUPPRESS_ATTRIBUTE_CHARACTERISTICS, false);
68 
         opt_ConsiderAPIElementsOnly   = false;
 261 
         optionValue(EA_DocGenOptions.boolean_options_e.CONSIDER_API_ELEMENTS_ONLY, false);
69 
         opt_ConsiderAPIDiagramsOnly   = false;
 262 
         optionValue(EA_DocGenOptions.boolean_options_e.CONSIDER_API_DIAGRAMS_ONLY, false);
70 
         opt_ConsiderAPIPackagesOnly   = false;
 263 
         optionValue(EA_DocGenOptions.boolean_options_e.CONSIDER_API_PACKAGES_ONLY, false);
71 
         opt_RestrictForLinkedPackagesOnly = true;
 264 
         optionValue(EA_DocGenOptions.boolean_options_e.RESTRICT_FOR_LINKED_PACKAGES_ONLY, true);
72 
      }
 265 
      }
73 
 
 266 
 
74 
 
 267 
 
75 
      /// <summary>
 268 
      /// <summary>
76 
      /// Looks for the EA_DocGen element in the selected package. To generate a document
 269 
      /// Looks for the EA_DocGen element in the selected package. To generate a document
Line 109... Line 302...
109 
 
 302 
 
110 
            // Extract the content of the EA_DocGen element notes section, into a list of
 303 
            // Extract the content of the EA_DocGen element notes section, into a list of
111 
            // strings.
 304 
            // strings.
112 
            string delimStr = "\n";
 305 
            string delimStr = "\n";
113 
            char [] delim = delimStr.ToCharArray();
 306 
            char [] delim = delimStr.ToCharArray();
114 
            options_string = theElement.Notes.ToString().Split(delim,200);
 307 
            options_string = theElement.Notes.ToString().Split(delim,400);
115
308
116 
            int i = 0;
 309 
            int i = 0;
117 
            foreach(string s in options_string)
 310 
            foreach(string s in options_string)
118 
            {
 311 
            {
119 
               options_string[i] = s.Trim();
 312 
               options_string[i] = s.Trim();
Line 259... Line 452...
259 
                  // we have gone past the general options and reached another section in EA_DocGen
 452 
                  // we have gone past the general options and reached another section in EA_DocGen
260 
                  // so there is no point in continuing. Exit the loop
 453 
                  // so there is no point in continuing. Exit the loop
261 
                  break;
 454 
                  break;
262 
               }
 455 
               }
263 
 
 456 
 
264 
               // BIG WARNING
 - 
 
265 
               // if any option string is a substring of another option string, then the longest of the
 - 
 
266 
               // two must appear first in this if-then-else sequence.
 - 
 
267 
 
 - 
 
268 
               if (parsingGenOpts == true)
 457 
               if (parsingGenOpts == true)
269 
               {
 458 
               {
270 
                  if (s.StartsWith(optstr_SuppressElementDescriptionMissingWarnings))
 - 
 
271 
                  {
 - 
 
272 
                     opt_SuppressElementDescriptionMissingWarnings = getOptionValue(s, opt_SuppressElementDescriptionMissingWarnings);
 - 
 
273 
                  }
 - 
 
274 
                  else if (s.StartsWith(optstr_SuppressUnAllocatedRelationshipWarnings))
 - 
 
275 
                  {
 - 
 
276 
                     opt_SuppressUnAllocatedRelationshipWarnings = getOptionValue(s, opt_SuppressUnAllocatedRelationshipWarnings);
 - 
 
277 
                  }
 - 
 
278 
                  else if (s.StartsWith(optstr_SuppressPrivateClasses))
 - 
 
279 
                  {
 - 
 
280 
                     opt_SuppressPrivateClasses = getOptionValue(s, opt_SuppressPrivateClasses);
 - 
 
281 
                  }
 - 
 
282 
                  else if (s.StartsWith(optstr_SuppressPrivateAttributes))
 - 
 
283 
                  {
 - 
 
284 
                     opt_SuppressPrivateAttributes = getOptionValue(s, opt_SuppressPrivateAttributes);
 - 
 
285 
                  }
 - 
 
286 
                  else if (s.StartsWith(optstr_SuppressPrivateMethods))
 - 
 
287 
                  {
 - 
 
288 
                     opt_SuppressPrivateMethods = getOptionValue(s, opt_SuppressPrivateMethods);
 - 
 
289 
                  }
 - 
 
290 
                  else if (s.StartsWith(optstr_ConsiderAPIElementsOnly))
 459 
                  foreach(boolopt bo in boolopts)
291 
                  {
 460 
                  {
- 
 
 461 
                     if (s.StartsWith(bo.optstr))
- 
 
 462 
                     {
292 
                     opt_ConsiderAPIElementsOnly = getOptionValue(s, opt_ConsiderAPIElementsOnly);
 463 
                        optionValue(bo.enumVal, getOptionValue(s, bo.value));
- 
 
 464 
                     }
293 
                  }
 465 
                  }
294 
                  else if (s.StartsWith(optstr_ConsiderAPIPackagesOnly))
 - 
 
295 
                  {
 - 
 
296 
                     opt_ConsiderAPIPackagesOnly = getOptionValue(s, opt_ConsiderAPIPackagesOnly);
 - 
 
297 
                  }
 - 
 
298 
                  else if (s.StartsWith(optstr_RestrictForLinkedPackagesOnly))
 - 
 
299 
                  {
 - 
 
300 
                     opt_RestrictForLinkedPackagesOnly = getOptionValue(s, opt_RestrictForLinkedPackagesOnly);
 - 
 
301 
                  }
 - 
 
302 
                  else if (s.StartsWith(optstr_ConsiderAPIDiagramsOnly))
 - 
 
303 
                  {
 - 
 
304 
                     opt_ConsiderAPIDiagramsOnly = getOptionValue(s, opt_ConsiderAPIDiagramsOnly);
 - 
 
305 
                  }
 - 
 
306 
                  // add others here
 - 
 
307 
 
 - 
 
308 
               }
 466 
               }
309 
            }
467 
            }
310 
         }
 468 
         }
311 
      }
 469 
      }
312 
 
 470 
 
Line 389... Line 547...
389 
            // opt_ElementTypes is empty so no filtering, return true
547 
            // opt_ElementTypes is empty so no filtering, return true
390 
            return true;
 548 
            return true;
391 
         }
 549 
         }
392 
      }
 550 
      }
393 
 
 551 
 
394 
      private static void updateEA_DocGen(ref StringBuilder sb, bool bValue, string s)
 552 
      private static void updateEA_DocGen(ref StringBuilder sb, EA_DocGenOptions.boolean_options_e e)
395 
      {
 553 
      {
- 
 
 554 
         boolopt o = (boolopt)boolopts[(int)e];
- 
 
 555 
 
396 
         sb.Append( s );
 556 
         sb.Append( o.optstr );
397 
         sb.Append( "=" );
 557 
         sb.Append( "=" );
398 
         sb.Append( bValue.ToString() );
 558 
         sb.Append( o.value.ToString() );
399 
         sb.Append( "\r\n" );
 559 
         sb.Append( "\r\n" );
400 
      }
 560 
      }
401 
 
 561 
 
402 
      private static void updateEA_DocGen(ref StringBuilder sb, int iValue, string s)
 562 
      private static void updateEA_DocGen(ref StringBuilder sb, int iValue, string s)
403 
      {
 563 
      {
Line 412... Line 572...
412 
         StringBuilder sb = new StringBuilder();
 572 
         StringBuilder sb = new StringBuilder();
413 
 
 573 
 
414 
         sb.Append( optstr_GeneralOptions );
 574 
         sb.Append( optstr_GeneralOptions );
415 
         sb.Append( "\r\n" );
 575 
         sb.Append( "\r\n" );
416 
 
 576 
 
417 
         // Missing Description handling options
 577 
         // output discrete boolean options
418 
         updateEA_DocGen(ref sb, opt_SuppressElementDescriptionMissingWarnings, optstr_SuppressElementDescriptionMissingWarnings);
 - 
 
419 
         updateEA_DocGen(ref sb, opt_SuppressUnAllocatedRelationshipWarnings, optstr_SuppressUnAllocatedRelationshipWarnings);
 578 
         foreach(boolopt bo in boolopts)
420 
 
 - 
 
421 
         // visibility options
 579 
         {
422 
         updateEA_DocGen(ref sb, opt_SuppressPrivateClasses,    optstr_SuppressPrivateClasses);
 - 
 
423 
         updateEA_DocGen(ref sb, opt_SuppressPrivateAttributes, optstr_SuppressPrivateAttributes);
 - 
 
424 
         updateEA_DocGen(ref sb, opt_SuppressPrivateMethods,    optstr_SuppressPrivateMethods);
 - 
 
425 
         updateEA_DocGen(ref sb, opt_ConsiderAPIElementsOnly,   optstr_ConsiderAPIElementsOnly);
 - 
 
426 
         updateEA_DocGen(ref sb, opt_ConsiderAPIDiagramsOnly,   optstr_ConsiderAPIDiagramsOnly);
 - 
 
427 
         updateEA_DocGen(ref sb, opt_ConsiderAPIPackagesOnly,   optstr_ConsiderAPIPackagesOnly);
 580 
            updateEA_DocGen(ref sb, bo.enumVal);
428 
         updateEA_DocGen(ref sb, opt_RestrictForLinkedPackagesOnly, optstr_RestrictForLinkedPackagesOnly);
 - 
 
429 
 
 581 
         }
430 
 
 582 
 
431 
         // Element type filtering options
 583 
         // Element type filtering options
432 
         if (opt_ElementTypes.Count > 0)
 584 
         if (opt_ElementTypes.Count > 0)
433 
         {
 585 
         {
434 
            sb.Append( "\r\n" );
 586 
            sb.Append( "\r\n" );