Merge pull request #292 from habibasorour/issue_288_list

Issue 288 fixed: 5.2 listing added

Author: pearcej

source/ch5_loopsanditeration.ptx

@@ -174,21 +174,24 @@ public class StringIterationExample {
 
         <p><idx><c>while</c> loop</idx>
             Both Python and Java support the <c>while</c> loop, which continues to execute as long as a condition is true.
-            Here is a simple example in Python that counts down from 5:
+            <xref ref="python-countdown" text="type-global"/> shows a simple example in Python that counts down from 5.
         </p>
-        <program xml:id="python-countdown" interactive="activecode" language="python">
+        <listing xml:id="python-countdown">
+        <program interactive="activecode" language="python">
             <code>
 i = 5
 while i &gt; 0: 
     print(i)
     i = i - 1
             </code>
         </program>
+        </listing>
 
         <p>
-            In Java, we add parentheses and curly braces. Here is the same countdown loop in Java:
+            In Java, we add parentheses and curly braces. <xref ref="java-countdown" text="type-global"/> shows the same countdown loop in Java.
         </p>
-        <program xml:id="java-countdown" interactive="activecode" language="java">
+        <listing xml:id="java-countdown">
+        <program interactive="activecode" language="java">
             <code>
 public class WhileLoopExample {
     public static void main(String[] args) {
@@ -201,16 +204,17 @@ public class WhileLoopExample {
 }
             </code>
         </program>
+        </listing>
 
         <p><idx><c>do-while</c> loop</idx>
             Java adds an additional, if seldom used variation of the <c>while</c> loop called the <c>do-while</c> loop.
             The <c>do-while</c> loop is very similar to <c>while</c> except that the condition is evaluated at the end of the loop rather than the beginning.
             This ensures that a loop will be executed at least one time.
             Some programmers prefer this loop in some situations because it avoids an additional assignment prior to the loop.
-            For example, the following loop will execute once even though the condition is initially false.
+            For example, <xref ref="java-do-while" text="type-global"/> shows how loop will execute once even though the condition is initially false.
         </p>
-
-        <program xml:id="java-do-while" interactive="activecode" language="java">
+        <listing xml:id="java-do-while">
+        <program interactive="activecode" language="java">
             <code>
 public class DoWhileExample {
     public static void main(String[] args) {
@@ -222,6 +226,8 @@ public class DoWhileExample {
 }
             </code>
         </program>
+        </listing>
+
     </section>
     <section xml:id="chapter5_summary">
         <title>Summary &amp; Reading Questions</title>