Merge pull request #303 from habibasorour/issue_295_listing

Issue 295 fixed: 6.1 listing added

Author: pearcej

source/ch6_definingclasses.ptx

@@ -62,11 +62,11 @@
                 </p>
 
                 <p>
-                    Here is a mostly complete implementation of a Fraction class in Python that we will refer to throughout this section:
+                    <xref ref="python-fraction-class-all" text="type-global"/> is a mostly complete implementation of a Fraction class in Python that we will refer to throughout this section. 
                 </p>
 
-
-                <program xml:id="python-fracion-class1" interactive="activecode" language="python">
+                <listing xml:id="python-fraction-class-all">
+                <program interactive="activecode" language="python">
                     <code>
         class Fraction:
             def __init__(self, num, den):
@@ -126,49 +126,53 @@
         print(sorted([Fraction(5, 16), Fraction(3, 16), Fraction(1, 16) + 1]))
                     </code> <tests> </tests>
                 </program>
+                </listing>
 
                 <p>
                     <idx>data members</idx>
         The instance variables (<term>data members</term>) we will need for our fraction class are the numerator and denominator. Of course in Python we can add instance variables to a class at any time by simply assigning a value to <c>objectReference.variableName</c>, whereas in Java all data members must be declared up front. 
                 </p>
 
                 <p>
-        The declarations of instance variables can come at the beginning of the class definition or the end. Cay Horstman, author of <url href="https://horstmann.com/corejava/index.html" visual="https://horstmann.com/corejava/index.html">the &#x201C;Core Java&#x201D; books</url> puts the declarations at the end of the class. I like them at the very beginning so you see the variables that are declared before you begin looking at the code that uses them. With that in mind the first part of the Fraction class definition is as follows: 
+        The declarations of instance variables can come at the beginning of the class definition or the end. Cay Horstman, author of <url href="https://horstmann.com/corejava/index.html" visual="https://horstmann.com/corejava/index.html">the &#x201C;Core Java&#x201D; books</url> puts the declarations at the end of the class. I like them at the very beginning so you see the variables that are declared before you begin looking at the code that uses them. With that in mind <xref ref="java-fraction-class-start" text="type-global"/> shows the first part of the Fraction class definition.
                 </p>
 
-
-                <program xml:id="java-fraction-class1" language="java">
+                <listing xml:id="java-fraction-class-start">
+                <program interactive="activecode" language="java">
                     <code>
         public class Fraction {
             private Integer numerator;
             private Integer denominator;
         }
                     </code>
                 </program>
+                </listing>
 
                 <p>
+                    <idx>private</idx>
                     Notice that we have declared the numerator and denominator to be <term>private</term>.
-                    This means that the compiler will generate an error if another method tries to write code like the following:
+                    This means that the compiler will generate an error if another method tries to write code like <xref ref="java-private" text="type-global"/>.
                 </p>
 
-
-                <program xml:id="java-private" language="java">
+                <listing xml:id="java-private">
+                <program interactive="activecode" language="java">
                     <code>
         Fraction f = new Fraction(1,2);
         Integer y = f.numerator * 10;
                     </code>
                 </program>
+                </listing>
 
                 <p>
                     <idx>getter method</idx>
                     <idx>setter method</idx>
                     Direct access to instance variables is not allowed in Java.
                     Therefore if we legitimately want to be able to access information such as the numerator or the denominator for a particular fraction we must have a <term>getter method</term> that returns the needed value.
-                    Hence, it is a very common programming practice to both provide <term>getter methods</term> and <term>setter methods</term> when needed for instance variables in Java.
+                    Hence, it is a very common programming practice to both provide <term>getter methods</term> and <term>setter methods</term> when needed for instance variables in Java. <xref ref="java-getter-and-setter" text="type-global"/> shows how the getter and setter methods are written.
                 </p>
 
-
-        <program xml:id="java-getter-and-setter" language="java">
+                <listing xml:id="java-getter-and-setter">
+                <program interactive="activecode" language="java">
             <code>
 public Integer getNumerator() {
     return numerator;
@@ -184,6 +188,7 @@ public void setDenominator(Integer denominator) {
 }
             </code>
         </program>
+        </listing>
     </introduction>
 </section>