From 834514e3e8c232dd58179576decc419b78ee8903 Mon Sep 17 00:00:00 2001
From: Martin Goik <goik@hdm-stuttgart.de>
Date: Wed, 2 Sep 2015 17:58:40 +0200
Subject: [PATCH] Array 3 inklusive codingBat

---
 Doc/Sd1/arrays.xml      | 28 ++++++++++++++++++++++++----
 Doc/Sd1/coreClasses.xml |  7 +++++--
 Doc/Sd1/statements.xml  | 21 +++++++++++++++++++++
 3 files changed, 50 insertions(+), 6 deletions(-)

diff --git a/Doc/Sd1/arrays.xml b/Doc/Sd1/arrays.xml
index 44975e90a..d1a9bb83d 100644
--- a/Doc/Sd1/arrays.xml
+++ b/Doc/Sd1/arrays.xml
@@ -10,15 +10,35 @@
   <title>Arrays</title>
 
   <section xml:id="sw1SectHarderExternalStringExercise">
-    <title>Harder external String exercises</title>
+    <title>External array and string exercises</title>
 
     <qandaset xml:id="sw1QandaExternalHarderString">
       <qandadiv>
         <qandaentry>
           <question>
-            <para>Solve all examples from the <link
-            xlink:href="http://codingbat.com/java/String-3">String-3</link>
-            section.</para>
+            <para>Solve all examples from the following sections:</para>
+
+            <itemizedlist>
+              <listitem>
+                <para><link
+                xlink:href="http://codingbat.com/java/String-3">String-3</link></para>
+              </listitem>
+
+              <listitem>
+                <para><link
+                xlink:href="http://codingbat.com/java/Array-1">Array-1</link></para>
+              </listitem>
+
+              <listitem>
+                <para><link
+                xlink:href="http://codingbat.com/java/Array-1">Array-2</link></para>
+              </listitem>
+
+              <listitem>
+                <para><link
+                xlink:href="http://codingbat.com/java/Array-3">Array-3</link></para>
+              </listitem>
+            </itemizedlist>
           </question>
         </qandaentry>
       </qandadiv>
diff --git a/Doc/Sd1/coreClasses.xml b/Doc/Sd1/coreClasses.xml
index 0aea79beb..6505fdc6c 100644
--- a/Doc/Sd1/coreClasses.xml
+++ b/Doc/Sd1/coreClasses.xml
@@ -266,13 +266,16 @@ public class CircleAreaCalculator {
           <question>
             <para>Solve all remaining exercises from the <link
             xlink:href="http://codingbat.com/java/String-1">String-1</link>
-            section. Then solve the examples from the <link
+            section and <link
+            xlink:href="http://codingbat.com/prob/p191914">Warmup-1 &gt;
+            notString</link>. Then solve the examples from the <link
             xlink:href="http://codingbat.com/java/String-2">String-2</link>
             section.</para>
 
             <tip>
               <para>You may want to use the Eclipse IDE and then copy/paste
-              your code to the CodingBat web interface.</para>
+              your code to the CodingBat web interface to avoid tedious syntax
+              related fiddling.</para>
             </tip>
           </question>
         </qandaentry>
diff --git a/Doc/Sd1/statements.xml b/Doc/Sd1/statements.xml
index c83d777b6..cb81eabc2 100644
--- a/Doc/Sd1/statements.xml
+++ b/Doc/Sd1/statements.xml
@@ -9,6 +9,27 @@
          xmlns:db="http://docbook.org/ns/docbook">
   <title>Statements</title>
 
+  <section xml:id="sd1SectExternalLogicExercises">
+    <title>Logic related external exercises</title>
+
+    <para>Solve:</para>
+
+    <itemizedlist>
+      <listitem>
+        <para><link
+        xlink:href="http://codingbat.com/java/Warmup-1">Warmup-1</link>
+        excluding <link
+        xlink:href="http://codingbat.com/prob/p191914">Warmup-1 &gt;
+        notString</link>.</para>
+      </listitem>
+
+      <listitem>
+        <para><link
+        xlink:href="http://codingbat.com/java/Logic-1">Logic-1</link>.</para>
+      </listitem>
+    </itemizedlist>
+  </section>
+
   <section xml:id="sw1Conditionals">
     <title>Conditional clauses</title>
 
-- 
GitLab