From 2b756c23c013cba93902ec81c837ee7bd5bdaca8 Mon Sep 17 00:00:00 2001
From: Martin Goik <goik@hdm-stuttgart.de>
Date: Wed, 9 Nov 2022 15:15:43 +0100
Subject: [PATCH] Cosmetics

---
 Doc/Sd1/Statements/statements.xml | 36 ++++++++++++++-----------------
 1 file changed, 16 insertions(+), 20 deletions(-)

diff --git a/Doc/Sd1/Statements/statements.xml b/Doc/Sd1/Statements/statements.xml
index 732741e1d..12656628b 100644
--- a/Doc/Sd1/Statements/statements.xml
+++ b/Doc/Sd1/Statements/statements.xml
@@ -978,7 +978,7 @@ You entered 123</screen><para>See <methodname
 
   // TODO: Assignment to variable augmentedMark
 
-  System.out.println("New marking:" + augmentedMark);
+  System.out.println("New Result:" + augmentedMark);
 }</programlisting>
             </question>
 
@@ -1004,7 +1004,7 @@ You entered 123</screen><para>See <methodname
     augmentedMark = pointsReached + pointsToAdd;
   }
 
-  System.out.println("New marking:" + augmentedMark);
+  System.out.println("New Result:" + augmentedMark);
 }</programlisting>
 
               <para>Using Java's <link
@@ -1018,7 +1018,7 @@ final int pointsToAdd = 3;
 
 final int augmentedMark = maximumPoints &lt;= pointsReached + pointsToAdd ? maximumPoints : pointsReached + pointsToAdd;
 
-System.out.println("New marking:" + augmentedMark);</programlisting>
+System.out.println("New Result:" + augmentedMark);</programlisting>
 
               <para>The augmented points value equals the minimum of <code
               language="java">pointsReached + pointsToAdd</code> and <code
@@ -1086,7 +1086,7 @@ System.out.println("New marking:" + augmentedMark);</programlisting>
 
 Your choice:&gt;1
 Tell me your age please:&gt;15
-Sorry, we are not allowed to serve beer to underage customers</screen>
+Sorry mate, you are too young</screen>
                 </listitem>
 
                 <listitem>
@@ -1104,7 +1104,7 @@ o.K.</screen>
   2=Orange juice
 
 Your choice:&gt;4
-Sorry, invalid choice</screen>
+Sorry, invalid choice value »4«</screen>
                 </listitem>
               </orderedlist>
 
@@ -1115,15 +1115,13 @@ Sorry, invalid choice</screen>
               <programlisting language="java"
                               xml:id="sd1_listing_scannerBoilerplate">public static void main(String[] args) {
 
-  try (final Scanner scan = new Scanner(System.in)) { // Creating a scanner for reading user input
+  final Scanner scan = new Scanner(System.in)) // Creating a scanner for reading user input
 
-    System.out.print("Please enter a value:");
-    final int userInput = scan.nextInt();
+   System.out.print("Please enter a value:");
+   final int userInput = scan.nextInt();
 
-    System.out.println("You entered: " + userInput);
-    // TODO: Implement «at the bar» logic
-
-  } // Auto closing scanner
+   System.out.println("You entered: " + userInput);
+   // TODO: Implement «at the bar» logic
 }</programlisting>
 
               <para>Copy this boilerplate code into your <xref
@@ -1141,8 +1139,8 @@ You entered: 112</screen>
             </question>
 
             <answer>
-              <para>Using <code language="java">if</code> conditionals we may
-              implement:</para>
+              <para>Nested <code language="java">if</code> conditional allows
+              for implementing the desired logic:</para>
 
               <programlisting language="java">import java.util.Scanner;
 
@@ -1151,7 +1149,7 @@ public class BarOrder {
     public static void main(String[] args) {
 
         final Scanner scan = new Scanner(System.in);
-        System.out.print("On offer:\n  1=Beer\n  2=Orange juice\n\nYour choice:&gt;" );
+        System.out.print("Please choose:\n  1=Beer\n  2=Orange juice\n\nYour choice:&gt;" );
 
         final int beverageChoice = scan.nextInt(); // Read user input
 
@@ -1159,17 +1157,15 @@ public class BarOrder {
             System.out.print("Tell me your age please:&gt;");
             final int age = scan.nextInt();
             if (age &lt; 16) {
-                System.out.println("Sorry, we are not allowed to serve beer to underage customers");
+                System.out.println("Sorry mate, you are too young");
             } else {
                 System.out.println("o.K.");
             }
         } else if (2 == beverageChoice) {
             System.out.println("o.K.");
-
         } else {
-            System.err.println("Sorry, invalid choice");
+            System.err.println("Sorry, invalid choice value »" + beverageChoice + "«");
         }
-        scan.close();
     }
 }</programlisting>
 
@@ -1196,7 +1192,7 @@ switch (beverageChoice) {
     break;
 
   default:
-     System.err.println("Sorry, invalid choice");
+     System.err.println("Sorry, invalid choice value »" + beverageChoice + "«");
      break;
 }  ...</programlisting>
             </answer>
-- 
GitLab