From 715efe0785cb2a7ea64278f7fc902129a353f6d8 Mon Sep 17 00:00:00 2001
From: Martin Goik <goik@hdm-stuttgart.de>
Date: Wed, 9 Nov 2022 15:19:36 +0100
Subject: [PATCH] Clearer structure
---
Doc/Sd1/Statements/statements.xml | 60 ++++++++++++++++++-------------
1 file changed, 35 insertions(+), 25 deletions(-)
diff --git a/Doc/Sd1/Statements/statements.xml b/Doc/Sd1/Statements/statements.xml
index 12656628b..c8e5ed8d4 100644
--- a/Doc/Sd1/Statements/statements.xml
+++ b/Doc/Sd1/Statements/statements.xml
@@ -983,14 +983,18 @@ You entered 123</screen><para>See <methodname
</question>
<answer>
- <para>The basic task is to add up the values of <code
- language="java">pointsReached</code> and <code
- language="java">pointsToAdd</code>. This sum however must not
- exceed the <code language="java">maximumPoints</code> limit. We
- use an <code language="java">if</code> statement for constraint
- safeguarding:</para>
+ <para>We present three different solutions:</para>
- <programlisting language="java">public static void main(String[] args) {
+ <orderedlist>
+ <listitem>
+ <para>The basic task is to add up the values of <code
+ language="java">pointsReached</code> and <code
+ language="java">pointsToAdd</code>. This sum however must
+ not exceed the <code language="java">maximumPoints</code>
+ limit. We use an <code language="java">if</code> statement
+ for constraint safeguarding:</para>
+
+ <programlisting language="java">public static void main(String[] args) {
final int pointsReached = 7;
final int maximumPoints = 12;
@@ -1006,44 +1010,50 @@ You entered 123</screen><para>See <methodname
System.out.println("New Result:" + augmentedMark);
}</programlisting>
+ </listitem>
- <para>Using Java's <link
- xlink:href="https://www.baeldung.com/java-ternary-operator">ternary
- operator</link> <code language="java">? :</code> may replace the
- <code language="java">if</code> clause:</para>
+ <listitem>
+ <para>Java's <link
+ xlink:href="https://www.baeldung.com/java-ternary-operator">ternary
+ operator</link> <code language="java">? :</code> allows for
+ replacing the <code language="java">if</code> clause:</para>
- <programlisting language="java">final int pointsReached = 7;
+ <programlisting language="java">final int pointsReached = 7;
final int maximumPoints = 12;
final int pointsToAdd = 3;
final int augmentedMark = maximumPoints <= pointsReached + pointsToAdd ? maximumPoints : pointsReached + pointsToAdd;
System.out.println("New Result:" + augmentedMark);</programlisting>
+ </listitem>
- <para>The augmented points value equals the minimum of <code
- language="java">pointsReached + pointsToAdd</code> and <code
- language="java">maximumPoints</code>. In favour of upcoming
- <link linkend="sd1SectClassMembers">methods</link> we may code
- as well:</para>
+ <listitem>
+ <para>The augmented points value equals the minimum of <code
+ language="java">pointsReached + pointsToAdd</code> and <code
+ language="java">maximumPoints</code>. In favour of upcoming
+ <link linkend="sd1SectClassMembers">methods</link> we may
+ code as well:</para>
- <programlisting language="java">public static void main(String[] args) {
+ <programlisting language="java">public static void main(String[] args) {
final int pointsReached = 7;
final int maximumPoints = 12;
final int pointsToAdd = 3;
final int augmentedMark = <link
- xlink:href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Math.html#min(int,int)">Math.min</link>(maximumPoints, pointsReached + pointsToAdd);
+ xlink:href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Math.html#min(int,int)">Math.min</link>(maximumPoints, pointsReached + pointsToAdd);
System.out.println("New Result:" + augmentedMark);
}</programlisting>
- <para>You will fully understand the above expression <classname
- xlink:href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Math.html">Math</classname>.<methodname
- xlink:href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Math.html#min(int,int)">min(...)</methodname>
- expression after finishing the <quote>Static Final
- Variables</quote> section of <xref
- linkend="bib_Kurniawan"/>.</para>
+ <para>You will fully understand the above <classname
+ xlink:href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Math.html">Math</classname>.<methodname
+ xlink:href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Math.html#min(int,int)">min(...)</methodname>
+ expression after finishing the <quote>Static Final
+ Variables</quote> section of <xref
+ linkend="bib_Kurniawan"/>.</para>
+ </listitem>
+ </orderedlist>
</answer>
</qandaentry>
</qandadiv>
--
GitLab