Merge pull request #278 from habibasorour/issue_260_liting

Issue 260 fixed: Add listing in 4.6

Author: pearcej

source/ch4_conditionals.ptx

@@ -463,9 +463,10 @@ Java also provides the ternary operator <c>condition ? valueIfTrue : valueIfFals
 </table>
 
 <p>
-Using this operator can make code shorter and more readable in cases where a simple conditional assignment is needed. See the following as an example where we see the same logic implemented in two different ways.
+Using this operator can make code shorter and more readable in cases where a simple conditional assignment is needed. <xref ref="java-ternary" text="type-global"/> shows an example where we see the same logic implemented in two different ways.
 </p>
-        <program xml:id="java-ternary" interactive="activecode" language ="java">
+        <listing xml:id="java-ternary">
+        <program interactive="activecode" language ="java">
             <code>
 public class Ternary {
     public static void main(String[] args) {
@@ -489,9 +490,10 @@ public class Ternary {
 }
             </code>
         </program>
+        </listing>
 
         <p>
-            In this example we are using this ternary operator to assign a value to <c>a</c> based on whether <c>a</c> is even or odd. If <c>a</c> is even, it will be squared; if odd, it will be instead be calculated as <c>3 * x - 1</c>. This is a concise way to write conditional assignments in Java. However, you might want to use it sparingly, as it can make code less readable if overused or used with complex expressions.
+            In <xref ref="java-ternary" text="type-global"/>, we are using this ternary operator to assign a value to <c>a</c> based on whether <c>a</c> is even or odd. If <c>a</c> is even, it will be squared; if odd, it will be instead be calculated as <c>3 * x - 1</c>. This is a concise way to write conditional assignments in Java. However, you might want to use it sparingly, as it can make code less readable if overused or used with complex expressions.
         </p>