From 5f1d7e3ece629169176c9a89e0e13a6e2bdd62ea Mon Sep 17 00:00:00 2001
From: Habiba Sorour <habiba.sorour2005@gmail.com>
Date: Mon, 10 Aug 2026 22:33:26 +0300
Subject: [PATCH 1/4] replaced th section earlier

---
 source/ch6_definingclasses.ptx | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/source/ch6_definingclasses.ptx b/source/ch6_definingclasses.ptx
index f2c8bf7..f495747 100644
--- a/source/ch6_definingclasses.ptx
+++ b/source/ch6_definingclasses.ptx
@@ -629,15 +629,8 @@ public class Fraction {
             </program>
             </listing>
 
-        </subsection>
-    </section>
-
-    <section xml:id="inheritance">
-        <title>Inheritance</title>
-
-        <introduction>
             <p>
- If you ran the program above you probably noticed that the output is not very satisfying. Chances are your output looked something like <xref ref="java-no-friendly-output" text="type-global"/>.
+            If you ran the program above you probably noticed that the output is not very satisfying. Chances are your output looked something like <xref ref="java-no-friendly-output" text="type-global"/>.
             </p>
 
             <listing xml:id="java-no-friendly-output">
@@ -654,8 +647,12 @@ Fraction@6ff3c5b5
                 In Python you can control how that looks by writing an <c>__str__</c> method for your class.
                 If you do not then you will get the default, which looks something like the above.
             </p>
-        </introduction>
 
+        </subsection>
+    </section>
+
+    <section xml:id="inheritance">
+        <title>Inheritance</title>
 
         <subsection>
             <title>The <c>Object</c> Class</title>

From bee7af32288e939800248a09b750d66e946ffdb5 Mon Sep 17 00:00:00 2001
From: Habiba Sorour <habiba.sorour2005@gmail.com>
Date: Mon, 10 Aug 2026 22:37:45 +0300
Subject: [PATCH 2/4] added a listing tags

---
 source/ch6_definingclasses.ptx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/source/ch6_definingclasses.ptx b/source/ch6_definingclasses.ptx
index f495747..668aa83 100644
--- a/source/ch6_definingclasses.ptx
+++ b/source/ch6_definingclasses.ptx
@@ -630,7 +630,7 @@ public class Fraction {
             </listing>
 
             <p>
-            If you ran the program above you probably noticed that the output is not very satisfying. Chances are your output looked something like <xref ref="java-no-friendly-output" text="type-global"/>.
+            If you ran <xref ref="java-full-fraction-class" text="type-global"/>, you probably noticed that the output is not very satisfying. Chances are your output looked something like <xref ref="java-no-friendly-output" text="type-global"/>.
             </p>
 
             <listing xml:id="java-no-friendly-output">
@@ -645,7 +645,7 @@ Fraction@6ff3c5b5
                 The reason is that we have not yet provided a friendly string representation for our <c>Fraction</c> objects.
                 Just like in Python, whenever an object is printed by the <c>println</c> method it must be converted to string format.
                 In Python you can control how that looks by writing an <c>__str__</c> method for your class.
-                If you do not then you will get the default, which looks something like the above.
+                If you do not then you will get the default, which looks something like <xref ref="java-no-friendly-output" text="type-global"/>.
             </p>
 
         </subsection>

From 7c7441807b9dd122a2a5d5f70882bd7d55cbb527 Mon Sep 17 00:00:00 2001
From: Habiba Sorour <habiba.sorour2005@gmail.com>
Date: Mon, 10 Aug 2026 22:39:57 +0300
Subject: [PATCH 3/4] added linking to section

---
 source/ch6_definingclasses.ptx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source/ch6_definingclasses.ptx b/source/ch6_definingclasses.ptx
index 668aa83..67fb411 100644
--- a/source/ch6_definingclasses.ptx
+++ b/source/ch6_definingclasses.ptx
@@ -645,7 +645,7 @@ Fraction@6ff3c5b5
                 The reason is that we have not yet provided a friendly string representation for our <c>Fraction</c> objects.
                 Just like in Python, whenever an object is printed by the <c>println</c> method it must be converted to string format.
                 In Python you can control how that looks by writing an <c>__str__</c> method for your class.
-                If you do not then you will get the default, which looks something like <xref ref="java-no-friendly-output" text="type-global"/>.
+                If you do not then you will get the default, which looks something like <xref ref="java-no-friendly-output" text="type-global"/>. We will see how to provide a friendly string representation for our <c>Fraction</c> class in <xref ref="inheritance" text="type-global"/>.
             </p>
 
         </subsection>

From 26ad182c200fa5c20f9024f72bf0f943749edd85 Mon Sep 17 00:00:00 2001
From: Habiba Sorour <habiba.sorour2005@gmail.com>
Date: Mon, 10 Aug 2026 23:15:49 +0300
Subject: [PATCH 4/4] fixed erros after merge

---
 source/ch6_definingclasses.ptx | 46 +++++++++++++---------------------
 1 file changed, 18 insertions(+), 28 deletions(-)

diff --git a/source/ch6_definingclasses.ptx b/source/ch6_definingclasses.ptx
index 32a277b..df7a4af 100644
--- a/source/ch6_definingclasses.ptx
+++ b/source/ch6_definingclasses.ptx
@@ -628,6 +628,24 @@ public class Fraction {
                 </code> <tests> </tests>
             </program>
             </listing>
+                        <p>
+ If you ran <xref ref="java-full-fraction-class" text="type-global"/>, you probably noticed that the output is not very satisfying. Chances are your output looked something like <xref ref="java-no-friendly-output" text="type-global"/>.
+            </p>
+
+            <listing xml:id="java-no-friendly-output">
+            <program language="java">
+                <code>
+Fraction@6ff3c5b5
+                </code>
+            </program>
+            </listing>
+
+            <p>
+                The reason is that we have not yet provided a friendly string representation for our <c>Fraction</c> objects.
+                Just like in Python, whenever an object is printed by the <c>println</c> method it must be converted to string format.
+                In Python you can control how that looks by writing an <c>__str__</c> method for your class.
+                If you do not then you will get the default, which looks something like <xref ref="java-no-friendly-output" text="type-global"/>. We will see how to provide a friendly string representation for our <c>Fraction</c> class in <xref ref="inheritance" text="type-global"/>.
+            </p>
 
             <exercise label="java_method_overloading_parsons">
     <statement>
@@ -672,34 +690,6 @@ public class Fraction {
 </exercise>
 
         </subsection>
-
-
-    </section>
-
-    <section xml:id="inheritance">
-        <title>Inheritance</title>
-
-        <introduction>
-            <p>
- If you ran the program above you probably noticed that the output is not very satisfying. Chances are your output looked something like <xref ref="java-no-friendly-output" text="type-global"/>.
-            </p>
-
-            <listing xml:id="java-no-friendly-output">
-            <program language="java">
-                <code>
-Fraction@6ff3c5b5
-                </code>
-            </program>
-            </listing>
-
-            <p>
-                The reason is that we have not yet provided a friendly string representation for our <c>Fraction</c> objects.
-                Just like in Python, whenever an object is printed by the <c>println</c> method it must be converted to string format.
-                In Python you can control how that looks by writing an <c>__str__</c> method for your class.
-                If you do not then you will get the default, which looks something like <xref ref="java-no-friendly-output" text="type-global"/>. We will see how to provide a friendly string representation for our <c>Fraction</c> class in <xref ref="inheritance" text="type-global"/>.
-            </p>
-
-        </subsection>
     </section>
 
     <section xml:id="inheritance">