Added rules on ternary operator to style guide

Author: calcmogul

cppguide.html

@@ -1856,6 +1856,12 @@ <h3 id="Conditionals">Conditionals</h3>
 
 </div>
 
+<h3 id="Ternary Operator">Ternary Operator</h3>
+
+<div class="summary">
+<p>The ternary operator is useful for condensing branching assignments into single lines. It should only be used when all parts of the ternary are simple expressions (only addition/subtraction/etc., no object allocation). Ternary operator usage may not be nested.</p>
+</div>
+
 <h3 id="Loops_and_Switch_Statements">Loops and Switch Statements</h3>
 
 <div class="summary">

javaguide.html

@@ -158,6 +158,9 @@ <h1>WPILib Java Style (Based on the
 <dd class="toc3">
 <a href="#s4.8.8-numeric-literals">4.8.8 Numeric Literals</a>
 </dd>
+<dd class="toc3">
+<a href="#s4.8.9-ternary-operator">4.8.9 Ternary Operator</a>
+</dd>
 </dl>
 </td><td>
 <dl>
@@ -618,7 +621,11 @@ <h4>4.8.7 Modifiers&nbsp;<a href="#s4.8.7-modifiers"><img height="21" width="21"
     <h4>4.8.8 Numeric Literals&nbsp;<a href="#s4.8.8-numeric-literals"><img height="21" width="21" src="guidelink.png"/></a></h4>
     <p><code>long</code>-valued integer literals use an uppercase <code>L</code> suffix, never
 lowercase (to avoid confusion with the digit <code>1</code>). For example, <code>3000000000L</code>
-rather than <code class="badcode">3000000000l</code>.</p><a name="naming"/><a name="s5-naming"/>
+rather than <code class="badcode">3000000000l</code>.</p>
+<a name="s4.8.9-ternary-operator"/>
+    <h4>4.8.9 Ternary Operator&nbsp;<a href="#s4.8.9-ternary-operator"><img height="21" width="21" src="guidelink.png"/></a></h4>
+    <p><p>The ternary operator is useful for condensing branching assignments into single lines. It should only be used when all parts of the ternary are simple expressions (only addition/subtraction/etc., no object allocation). Ternary operator usage may not be nested.</p>
+<a name="naming"/><a name="s5-naming"/>
     <h2>5 Naming&nbsp;<a href="#s5-naming"><img height="21" width="21" src="guidelink.png"/></a></h2>
     <a name="s5.1-identifier-names"/>
     <h3>5.1 Rules common to all identifiers&nbsp;<a href="#s5.1-identifier-names"><img height="21" width="21" src="guidelink.png"/></a></h3>