diff --git a/Doc/Sd1/array.xml b/Doc/Sd1/array.xml
index ed82f2e8dba3720b08215870c55f7efe944333f5..5f12819840edd6855e0a5b652508a19444230f0f 100644
--- a/Doc/Sd1/array.xml
+++ b/Doc/Sd1/array.xml
@@ -12,8 +12,7 @@
<section xml:id="sd1ArrayPrepare">
<title>Preparations</title>
- <para>Chapter 4 <xref linkend="bib_Horton2011"/> excluding <quote>Mutable
- Strings</quote>.</para>
+ <para>Chapter 4 excluding <quote>Mutable Strings</quote>.</para>
</section>
<section xml:id="sd1ArrayiExercise">
@@ -238,8 +237,8 @@
<glossterm>Java Annotations</glossterm>
<glossdef>
- <para>Unfortunately <xref linkend="bib_Horton2011"/> is somewhat
- reluctant regarding Java annotations:</para>
+ <para>Unfortunately is somewhat reluctant regarding Java
+ annotations:</para>
<remark>A Java source file can contain annotations. An annotation is
not a Java language statement, but a special statement that changes
@@ -274,9 +273,9 @@
<glossterm>Inheritance</glossterm>
<glossdef>
- <para>Chapter 6 <xref linkend="bib_Horton2011"/> until (including)
- <quote>Using the final modifier</quote>. You may skip <quote>Methods
- accepting a variable number of arguments</quote>.</para>
+ <para>Chapter 6 until (including) <quote>Using the final
+ modifier</quote>. You may skip <quote>Methods accepting a variable
+ number of arguments</quote>.</para>
</glossdef>
</glossentry>
</glosslist>
@@ -1069,8 +1068,7 @@ values newArray | 1| 2| F| 7| 9| | ...</programlisting>
<para>Comparing strings lexicographically or testing for equality?
How does this relate to the <methodname
xlink:href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html#equals-java.lang.Object-">equals()</methodname>
- method you read about in chapter 6 of <xref
- linkend="bib_Horton2011"/>.</para>
+ method you read about in chapter 6 of .</para>
</listitem>
<listitem>
diff --git a/Doc/Sd1/arrays.xml b/Doc/Sd1/arrays.xml
new file mode 100644
index 0000000000000000000000000000000000000000..692508c2eafd7721fd166adc04277d12ccf17652
--- /dev/null
+++ b/Doc/Sd1/arrays.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<chapter version="5.0" xml:id="sw1ChapterArrays"
+ xmlns="http://docbook.org/ns/docbook"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:xi="http://www.w3.org/2001/XInclude"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns:m="http://www.w3.org/1998/Math/MathML"
+ xmlns:html="http://www.w3.org/1999/xhtml"
+ xmlns:db="http://docbook.org/ns/docbook">
+ <title>Statements</title>
+
+ <section xml:id="sw1SectionArrays">
+ <title/>
+
+ <para/>
+ </section>
+</chapter>
diff --git a/Doc/Sd1/class.xml b/Doc/Sd1/class.xml
index 3e9efc690af3289882b1ffb17bf4c55ffad711cc..a2bbc1fda65bb8fb3e0862521f8e31ef786945f8 100644
--- a/Doc/Sd1/class.xml
+++ b/Doc/Sd1/class.xml
@@ -15,9 +15,9 @@
<itemizedlist>
<listitem>
- <para>Read Chapter 5 from <xref linkend="bib_Horton2011"/> excluding
- the sections <quote>Recursion</quote> and <quote>Nested
- classes</quote>. Carefully read the explanations regarding:</para>
+ <para>Read Chapter 5 fro ding the sections <quote>Recursion</quote>
+ and <quote>Nested classes</quote>. Carefully read the explanations
+ regarding:</para>
<itemizedlist>
<listitem>
@@ -604,9 +604,9 @@ public void writeSvg() {
</glossentry>
</glosslist>
- <para>For both categories see <xref linkend="bib_Horton2011"/>,
- chapter 5, <quote>Fields in a Class Definition</quote> and
- <quote>Methods in a Class Definition</quote>.</para>
+ <para>For both categories chapter 5, <quote>Fields in a Class
+ Definition</quote> and <quote>Methods in a Class
+ Definition</quote>.</para>
</glossdef>
</glossentry>
@@ -670,8 +670,8 @@ public void writeSvg() {
}
...</programlisting>
- <para>See <xref linkend="bib_Horton2011"/>, chapter 5,
- <quote>CONTROLLING ACCESS TO CLASS MEMBERS</quote>.</para>
+ <para>See , chapter 5, <quote>CONTROLLING ACCESS TO CLASS
+ MEMBERS</quote>.</para>
</glossdef>
</glossentry>
@@ -703,8 +703,7 @@ public void writeSvg() {
...
}</programlisting>
- <para>See <xref linkend="bib_Horton2011"/>, chapter 5, <quote>METHOD
- OVERLOADING</quote>.</para>
+ <para>See , chapter 5, <quote>METHOD OVERLOADING</quote>.</para>
</glossdef>
</glossentry>
@@ -714,8 +713,8 @@ public void writeSvg() {
<glossdef>
<programlisting language="java">Math.pow((1 + interestRate / 100), years)</programlisting>
- <para>See <xref linkend="bib_Horton2011"/>, chapter 2,
- <quote>MATHEMATICAL FUNCTIONS AND CONSTANTS</quote>.</para>
+ <para>See , chapter 2, <quote>MATHEMATICAL FUNCTIONS AND
+ CONSTANTS</quote>.</para>
</glossdef>
</glossentry>
</glosslist>
diff --git a/Doc/Sd1/collections.xml b/Doc/Sd1/collections.xml
index 6ecb69e7e12d89ce821eb96f4bb4efa107f82796..4c671943d2dcb95b7cec71b767fe2c538f3e9740 100644
--- a/Doc/Sd1/collections.xml
+++ b/Doc/Sd1/collections.xml
@@ -12,9 +12,9 @@
<section xml:id="sd1CollectionsPrep">
<title>Preparations</title>
- <para>Chapter 14 of <xref linkend="bib_Horton2011"/> provides an in depth
- discussion of Java collections. Regarding the upcoming exercises you may
- however prefer to study the following track:</para>
+ <para>Chapter 14 of provides an in depth discussion of Java collections.
+ Regarding the upcoming exercises you may however prefer to study the
+ following track:</para>
<glosslist>
<glossentry>
@@ -1298,48 +1298,49 @@ public interface Set_String {
</qandadiv>
</qandaset>
</section>
- <section xml:id="sd1MapPrepare">
- <title>Maps 1, Preparations</title>
-
- <para>Read the introduction on <link
- xlink:href="http://tutorials.jenkov.com/java-collections/map.html">Java
- Collections - Map</link> and <link xlink:href="???">Java Collections -
- SortedMap</link>.</para>
-
- <para>Consider the following array of person names:</para>
-
- <figure xml:id="sd1ArrayPersons">
- <title>An array of strings</title>
-
- <mediaobject>
- <imageobject>
- <imagedata fileref="Ref/Fig/array.fig"/>
- </imageobject>
- </mediaobject>
- </figure>
-
- <para>Consider the following array describing (non leap year) month
- lengths:</para>
-
- <figure xml:id="sd1MonthLength">
- <title>An associative array describing month lengths</title>
-
- <mediaobject>
- <imageobject>
- <imagedata fileref="Ref/Fig/arrayAssoc.fig"/>
- </imageobject>
- </mediaobject>
- </figure>
- </section>
- <section xml:id="sd1MapExercise">
- <title>Exercises</title>
+ <section xml:id="sd1MapPrepare">
+ <title>Maps 1, Preparations</title>
+
+ <para>Read the introduction on <link
+ xlink:href="http://tutorials.jenkov.com/java-collections/map.html">Java
+ Collections - Map</link> and <link xlink:href="???">Java Collections -
+ SortedMap</link>.</para>
+
+ <para>Consider the following array of person names:</para>
+
+ <figure xml:id="sd1ArrayPersons">
+ <title>An array of strings</title>
+
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="Ref/Fig/array.fig"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
+
+ <para>Consider the following array describing (non leap year) month
+ lengths:</para>
+
+ <figure xml:id="sd1MonthLength">
+ <title>An associative array describing month lengths</title>
- <para>In <xref linkend="sd1CollectionWordFrequencies"/> we created a
- sorted set of words appearing in a text among with their respective
- frequencies:</para>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="Ref/Fig/arrayAssoc.fig"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
+ </section>
- <programlisting language="none"> 6: Newton
+ <section xml:id="sd1MapExercise">
+ <title>Exercises</title>
+
+ <para>In <xref linkend="sd1CollectionWordFrequencies"/> we created a
+ sorted set of words appearing in a text among with their respective
+ frequencies:</para>
+
+ <programlisting language="none"> 6: Newton
6: and
5: Einstein
3: Pascal
@@ -1350,12 +1351,12 @@ public interface Set_String {
2: a
...</programlisting>
- <para>Achieving this result relied on implementing a helper class
- <classname
- xlink:href="Ref/api/P/WordFrequency1/Solution/de/hdm_stuttgart/mi/sd1/textstat/WordFrequency.html">WordFrequency</classname>
- grouping words and frequencies:</para>
+ <para>Achieving this result relied on implementing a helper class
+ <classname
+ xlink:href="Ref/api/P/WordFrequency1/Solution/de/hdm_stuttgart/mi/sd1/textstat/WordFrequency.html">WordFrequency</classname>
+ grouping words and frequencies:</para>
- <programlisting language="java">public class WordFrequency {
+ <programlisting language="java">public class WordFrequency {
/**
* The frequency of this word will be counted.
*/
@@ -1363,142 +1364,142 @@ public interface Set_String {
private int frequency;
...</programlisting>
- <para>A cleaner solution might conceive the above result output as a
- <classname
- xlink:href="http://docs.oracle.com/javase/8/docs/api/java/util/Map.html">Map</classname><<classname
- xlink:href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html">String</classname>,
- <classname
- xlink:href="http://docs.oracle.com/javase/8/docs/api/java/lang/Integer.html">Integer</classname>>.
- The set of words appearing in a text will be regarded as keys. The
- frequencies of appearance are corresponding values:</para>
+ <para>A cleaner solution might conceive the above result output as a
+ <classname
+ xlink:href="http://docs.oracle.com/javase/8/docs/api/java/util/Map.html">Map</classname><<classname
+ xlink:href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html">String</classname>,
+ <classname
+ xlink:href="http://docs.oracle.com/javase/8/docs/api/java/lang/Integer.html">Integer</classname>>.
+ The set of words appearing in a text will be regarded as keys. The
+ frequencies of appearance are corresponding values:</para>
+
+ <informaltable border="1" width="40%">
+ <tr>
+ <th colspan="2"><classname
+ xlink:href="http://docs.oracle.com/javase/8/docs/api/java/util/Map.html">Map</classname><<classname
+ xlink:href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html">String</classname>,
+ <classname
+ xlink:href="http://docs.oracle.com/javase/8/docs/api/java/lang/Integer.html">Integer</classname>></th>
+ </tr>
- <informaltable border="1" width="40%">
- <tr>
- <th colspan="2"><classname
- xlink:href="http://docs.oracle.com/javase/8/docs/api/java/util/Map.html">Map</classname><<classname
- xlink:href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html">String</classname>,
- <classname
- xlink:href="http://docs.oracle.com/javase/8/docs/api/java/lang/Integer.html">Integer</classname>></th>
- </tr>
+ <tr>
+ <th>Word (<classname
+ xlink:href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html">String</classname>)</th>
- <tr>
- <th>Word (<classname
- xlink:href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html">String</classname>)</th>
+ <th>Frequency (<classname
+ xlink:href="http://docs.oracle.com/javase/8/docs/api/java/lang/Integer.html">Integer</classname>)</th>
+ </tr>
- <th>Frequency (<classname
- xlink:href="http://docs.oracle.com/javase/8/docs/api/java/lang/Integer.html">Integer</classname>)</th>
- </tr>
+ <tr>
+ <td>Newton</td>
- <tr>
- <td>Newton</td>
+ <td>6</td>
+ </tr>
- <td>6</td>
- </tr>
+ <tr>
+ <td>and</td>
- <tr>
- <td>and</td>
+ <td>6</td>
+ </tr>
- <td>6</td>
- </tr>
+ <tr>
+ <td>Einstein</td>
- <tr>
- <td>Einstein</td>
+ <td>5</td>
+ </tr>
- <td>5</td>
- </tr>
+ <tr>
+ <td>Pascal</td>
- <tr>
- <td>Pascal</td>
+ <td>3</td>
+ </tr>
- <td>3</td>
- </tr>
+ <tr>
+ <td>...</td>
- <tr>
- <td>...</td>
+ <td>...</td>
+ </tr>
+ </informaltable>
- <td>...</td>
- </tr>
- </informaltable>
+ <qandaset defaultlabel="qanda" xml:id="sde1QandaWordFreqMap">
+ <title>Implementing word frequencies by <classname
+ xlink:href="http://docs.oracle.com/javase/8/docs/api/java/util/Map.html">Map</classname><<classname
+ xlink:href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html">String</classname>,
+ <classname
+ xlink:href="http://docs.oracle.com/javase/8/docs/api/java/lang/Integer.html">Integer</classname>>
+ instances.</title>
- <qandaset defaultlabel="qanda" xml:id="sde1QandaWordFreqMap">
- <title>Implementing word frequencies by <classname
- xlink:href="http://docs.oracle.com/javase/8/docs/api/java/util/Map.html">Map</classname><<classname
- xlink:href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html">String</classname>,
- <classname
- xlink:href="http://docs.oracle.com/javase/8/docs/api/java/lang/Integer.html">Integer</classname>>
- instances.</title>
+ <qandadiv>
+ <qandaentry>
+ <question>
+ <para>Re-implement <xref linkend="sd1CollectionWordFrequencies"/>
+ replacing your <classname
+ xlink:href="Ref/api/P/WordFrequency1/Solution/de/hdm_stuttgart/mi/sd1/textstat/WordFrequency.html">WordFrequency</classname>
+ object by an instance of <classname
+ xlink:href="http://docs.oracle.com/javase/8/docs/api/java/util/Map.html">Map</classname><<classname
+ xlink:href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html">String</classname>,
+ <classname
+ xlink:href="http://docs.oracle.com/javase/8/docs/api/java/lang/Integer.html">Integer</classname>>.
+ For the time being consider the output sorting order yet as
+ irrelevant.</para>
+ </question>
- <qandadiv>
- <qandaentry>
- <question>
- <para>Re-implement <xref
- linkend="sd1CollectionWordFrequencies"/> replacing your
- <classname
- xlink:href="Ref/api/P/WordFrequency1/Solution/de/hdm_stuttgart/mi/sd1/textstat/WordFrequency.html">WordFrequency</classname>
- object by an instance of <classname
- xlink:href="http://docs.oracle.com/javase/8/docs/api/java/util/Map.html">Map</classname><<classname
- xlink:href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html">String</classname>,
- <classname
- xlink:href="http://docs.oracle.com/javase/8/docs/api/java/lang/Integer.html">Integer</classname>>.
- For the time being consider the output sorting order yet as
- irrelevant.</para>
- </question>
+ <answer>
+ <annotation role="make">
+ <para role="eclipse">Sd1/WordFrequency1/Solution</para>
+ </annotation>
+ </answer>
+ </qandaentry>
+ </qandadiv>
+ </qandaset>
- <answer>
- <annotation role="make">
- <para role="eclipse">Sd1/WordFrequency1/Solution</para>
- </annotation>
- </answer>
- </qandaentry>
- </qandadiv>
- </qandaset>
+ <para>The subsequent exercise is considered to be optional with respect to
+ the final course's examination. It does however provide some deeper
+ insight into the subject of <classname
+ xlink:href="http://docs.oracle.com/javase/8/docs/api/java/util/Map.html">Map</classname>
+ instances.</para>
- <para>The subsequent exercise is considered to be optional with respect
- to the final course's examination. It does however provide some deeper
- insight into the subject of <classname
- xlink:href="http://docs.oracle.com/javase/8/docs/api/java/util/Map.html">Map</classname>
- instances.</para>
+ <qandaset defaultlabel="qanda" xml:id="sde1QandaWordFreqMapSortOrder">
+ <title>Regain sorting capabilities.</title>
- <qandaset defaultlabel="qanda" xml:id="sde1QandaWordFreqMapSortOrder">
- <title>Regain sorting capabilities.</title>
+ <qandadiv>
+ <qandaentry>
+ <question>
+ <para>Refine <xref linkend="sde1QandaWordFreqMap"/> to sort your
+ output by word frequencies in the first place as you already did
+ in <xref linkend="sd1CollectionWordFrequencies"/>.</para>
+
+ <para>Hint: Following the discussion in <quote
+ xlink:href="http://stackoverflow.com/questions/11647889/sorting-the-mapkey-value-in-descending-order-based-on-the-value">Sorting
+ the Map<Key,Value> in descending order based on the
+ value</quote> you may create a <classname
+ xlink:href="http://docs.oracle.com/javase/8/docs/api/java/util/List.html">List</classname><<classname
+ xlink:href="http://docs.oracle.com/javase/8/docs/api/java/util/Map.Entry.html">Entry</classname>(<<classname
+ xlink:href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html">String</classname>,
+ <classname
+ xlink:href="http://docs.oracle.com/javase/8/docs/api/java/lang/Integer.html">Integer</classname>>>
+ from your <classname
+ xlink:href="http://docs.oracle.com/javase/8/docs/api/java/util/Map.html">Map</classname><<classname
+ xlink:href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html">String</classname>,
+ <classname
+ xlink:href="http://docs.oracle.com/javase/8/docs/api/java/lang/Integer.html">Integer</classname>>
+ instance on demand (i.e. when sorting). Then define an appropriate
+ <classname
+ xlink:href="http://docs.oracle.com/javase/8/docs/api/java/util/Comparator.html">Comparator</classname>
+ class to get this list sorted.</para>
+ </question>
- <qandadiv>
- <qandaentry>
- <question>
- <para>Refine <xref linkend="sde1QandaWordFreqMap"/> to sort your
- output by word frequencies in the first place as you already did
- in <xref linkend="sd1CollectionWordFrequencies"/>.</para>
-
- <para>Hint: Following the discussion in <quote
- xlink:href="http://stackoverflow.com/questions/11647889/sorting-the-mapkey-value-in-descending-order-based-on-the-value">Sorting
- the Map<Key,Value> in descending order based on the
- value</quote> you may create a <classname
- xlink:href="http://docs.oracle.com/javase/8/docs/api/java/util/List.html">List</classname><<classname
- xlink:href="http://docs.oracle.com/javase/8/docs/api/java/util/Map.Entry.html">Entry</classname>(<<classname
- xlink:href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html">String</classname>,
- <classname
- xlink:href="http://docs.oracle.com/javase/8/docs/api/java/lang/Integer.html">Integer</classname>>>
- from your <classname
- xlink:href="http://docs.oracle.com/javase/8/docs/api/java/util/Map.html">Map</classname><<classname
- xlink:href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html">String</classname>,
- <classname
- xlink:href="http://docs.oracle.com/javase/8/docs/api/java/lang/Integer.html">Integer</classname>>
- instance on demand (i.e. when sorting). Then define an
- appropriate <classname
- xlink:href="http://docs.oracle.com/javase/8/docs/api/java/util/Comparator.html">Comparator</classname>
- class to get this list sorted.</para>
- </question>
+ <answer>
+ <annotation role="make">
+ <para role="eclipse">Sd1/WordFrequency2/Solution</para>
+ </annotation>
+ </answer>
+ </qandaentry>
+ </qandadiv>
+ </qandaset>
+ </section>
- <answer>
- <annotation role="make">
- <para role="eclipse">Sd1/WordFrequency2/Solution</para>
- </annotation>
- </answer>
- </qandaentry>
- </qandadiv>
- </qandaset>
- </section>
- <section xml:id="sd1TownsByCountry">
+ <section xml:id="sd1TownsByCountry">
<title>Towns and country names</title>
<figure xml:id="sd1FigTownsByCountry">
@@ -1510,15 +1511,16 @@ public interface Set_String {
</imageobject>
</mediaobject>
</figure>
- </section>
- <section xml:id="sd1MapMarks">
- <title>Creating an overview of grades</title>
+ </section>
+
+ <section xml:id="sd1MapMarks">
+ <title>Creating an overview of grades</title>
- <para>Consider a text file representing a list of students among with
- examination grades ranging from level <quote>A</quote> to
- <quote>D</quote>:</para>
+ <para>Consider a text file representing a list of students among with
+ examination grades ranging from level <quote>A</quote> to
+ <quote>D</quote>:</para>
- <programlisting language="none">Tim Bone, D
+ <programlisting language="none">Tim Bone, D
Eve Thunder, A
Aaron King, B
Joan White, B
@@ -1527,58 +1529,58 @@ Jane Simmonds, D
Ethan Clarke, C
Paula Beam, C</programlisting>
- <para>Duplicate names may appear.</para>
+ <para>Duplicate names may appear.</para>
- <qandaset defaultlabel="qanda" xml:id="sd1QandaMarkFrequency">
- <title>Creating an overview of grades showing frequencies</title>
+ <qandaset defaultlabel="qanda" xml:id="sd1QandaMarkFrequency">
+ <title>Creating an overview of grades showing frequencies</title>
- <qandadiv>
- <qandaentry>
- <question>
- <para>Transform the preceding text file into an overview of
- grades by aggregating the occurrences of marks. The current
- example should lead to:</para>
+ <qandadiv>
+ <qandaentry>
+ <question>
+ <para>Transform the preceding text file into an overview of grades
+ by aggregating the occurrences of marks. The current example
+ should lead to:</para>
- <programlisting language="none">Overview of marks:
+ <programlisting language="none">Overview of marks:
A: 1
B: 2
C: 3
D: 2</programlisting>
- </question>
+ </question>
- <answer>
- <annotation role="make">
- <para role="eclipse">Sd1/Marks/Solution1</para>
- </annotation>
- </answer>
- </qandaentry>
- </qandadiv>
- </qandaset>
+ <answer>
+ <annotation role="make">
+ <para role="eclipse">Sd1/Marks/Solution1</para>
+ </annotation>
+ </answer>
+ </qandaentry>
+ </qandadiv>
+ </qandaset>
- <qandaset defaultlabel="qanda" xml:id="sd1QandaMarkNames">
- <title>Creating an overview of grades showing individual names</title>
+ <qandaset defaultlabel="qanda" xml:id="sd1QandaMarkNames">
+ <title>Creating an overview of grades showing individual names</title>
- <qandadiv>
- <qandaentry>
- <question>
- <para>Replace the mark frequencies by the actual list of
- alphabetically sorted names. The current example should lead
- to:</para>
+ <qandadiv>
+ <qandaentry>
+ <question>
+ <para>Replace the mark frequencies by the actual list of
+ alphabetically sorted names. The current example should lead
+ to:</para>
- <programlisting language="none">Overview of marks:
+ <programlisting language="none">Overview of marks:
A: Eve Thunder
B: Aaron King, Joan White
C: Ethan Clarke, Mark Singer, Paula Beam
D: Jane Simmonds, Tim Bone</programlisting>
- </question>
+ </question>
- <answer>
- <annotation role="make">
- <para role="eclipse">Sd1/Marks/Solution2</para>
- </annotation>
- </answer>
- </qandaentry>
- </qandadiv>
- </qandaset>
- </section>
+ <answer>
+ <annotation role="make">
+ <para role="eclipse">Sd1/Marks/Solution2</para>
+ </annotation>
+ </answer>
+ </qandaentry>
+ </qandadiv>
+ </qandaset>
+ </section>
</chapter>
diff --git a/Doc/Sd1/coreClasses.xml b/Doc/Sd1/coreClasses.xml
new file mode 100644
index 0000000000000000000000000000000000000000..aa7f46e0393b60518459cb41d77520102ab86420
--- /dev/null
+++ b/Doc/Sd1/coreClasses.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<chapter version="5.0" xml:id="sw1ChapterCoreClasses"
+ xmlns="http://docbook.org/ns/docbook"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:xi="http://www.w3.org/2001/XInclude"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns:m="http://www.w3.org/1998/Math/MathML"
+ xmlns:html="http://www.w3.org/1999/xhtml"
+ xmlns:db="http://docbook.org/ns/docbook">
+ <title>Statements</title>
+
+ <section xml:id="sw1SectionCoreClasses">
+ <title/>
+
+ <para/>
+ </section>
+</chapter>
diff --git a/Doc/Sd1/errorHandling.xml b/Doc/Sd1/errorHandling.xml
new file mode 100644
index 0000000000000000000000000000000000000000..565be73157eb0caa27d054c0712bdbe37c93b029
--- /dev/null
+++ b/Doc/Sd1/errorHandling.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<chapter version="5.0" xml:id="sw1ChapterErrorHandling"
+ xmlns="http://docbook.org/ns/docbook"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:xi="http://www.w3.org/2001/XInclude"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns:m="http://www.w3.org/1998/Math/MathML"
+ xmlns:html="http://www.w3.org/1999/xhtml"
+ xmlns:db="http://docbook.org/ns/docbook">
+ <title>Statements</title>
+
+ <section xml:id="sw1SectionErrorHandling">
+ <title/>
+
+ <para/>
+ </section>
+</chapter>
diff --git a/Doc/Sd1/identity.xml b/Doc/Sd1/identity.xml
index fcb3647017e9b6ebd5efab1726a611e32e32efbb..d56db19748bbeef759faa0d058656e3f759d53c0 100644
--- a/Doc/Sd1/identity.xml
+++ b/Doc/Sd1/identity.xml
@@ -12,8 +12,8 @@
<section xml:id="sec_PrepareOidEquality">
<title>Preparations</title>
- <para>Read all sections of chapter 6 in <xref linkend="bib_Horton2011"/>
- till and including <quote>THE UNIVERSAL SUPERCLASS</quote>.</para>
+ <para>Read all sections of chapter 6 in till and including <quote>THE
+ UNIVERSAL SUPERCLASS</quote>.</para>
</section>
<section xml:id="sd1String2Exercises">
diff --git a/Doc/Sd1/inheritance.xml b/Doc/Sd1/inheritance.xml
new file mode 100644
index 0000000000000000000000000000000000000000..bb1b5aa731f814cfc88ff40c6b7079d4b8d56c99
--- /dev/null
+++ b/Doc/Sd1/inheritance.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<chapter version="5.0" xml:id="sw1ChapterInheritance"
+ xmlns="http://docbook.org/ns/docbook"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:xi="http://www.w3.org/2001/XInclude"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns:m="http://www.w3.org/1998/Math/MathML"
+ xmlns:html="http://www.w3.org/1999/xhtml"
+ xmlns:db="http://docbook.org/ns/docbook">
+ <title>Statements</title>
+
+ <section xml:id="sw1SectionInheritance">
+ <title/>
+
+ <para/>
+ </section>
+</chapter>
diff --git a/Doc/Sd1/interfacesAbstractClasses.xml b/Doc/Sd1/interfacesAbstractClasses.xml
new file mode 100644
index 0000000000000000000000000000000000000000..d3e40dbde2d2805255265f94c45a77319634079e
--- /dev/null
+++ b/Doc/Sd1/interfacesAbstractClasses.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<chapter version="5.0" xml:id="sw1ChapterInterfacesAbstractClasses"
+ xmlns="http://docbook.org/ns/docbook"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:xi="http://www.w3.org/2001/XInclude"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns:m="http://www.w3.org/1998/Math/MathML"
+ xmlns:html="http://www.w3.org/1999/xhtml"
+ xmlns:db="http://docbook.org/ns/docbook">
+ <title>Statements</title>
+
+ <section xml:id="sw1SectionInterfacesAbstractClasses">
+ <title/>
+
+ <para/>
+ </section>
+</chapter>
diff --git a/Doc/Sd1/loop.xml b/Doc/Sd1/loop.xml
index 3839206b7fec238362464818fc84a0957bbac887..dc1c3d0cbd90be864ec629289f9fecad2b2f563f 100644
--- a/Doc/Sd1/loop.xml
+++ b/Doc/Sd1/loop.xml
@@ -11,8 +11,8 @@
<section xml:id="sd1LoopPrepare">
<title>Preparations</title>
- <para>Chapter <quote>Loops and logic</quote> <xref
- linkend="bib_Horton2011"/> till <quote>Loops</quote> (inclusive).</para>
+ <para>Chapter <quote>Loops and logic</quote> till <quote>Loops</quote>
+ (inclusive).</para>
</section>
<section xml:id="sd1LoopExercises">
diff --git a/Doc/Sd1/objectsClasses.xml b/Doc/Sd1/objectsClasses.xml
new file mode 100644
index 0000000000000000000000000000000000000000..8c5414605a2e8371b466ed5b217c53de2e8ceeeb
--- /dev/null
+++ b/Doc/Sd1/objectsClasses.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<chapter version="5.0" xml:id="sw1ChapterObjectsClasses"
+ xmlns="http://docbook.org/ns/docbook"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:xi="http://www.w3.org/2001/XInclude"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns:m="http://www.w3.org/1998/Math/MathML"
+ xmlns:html="http://www.w3.org/1999/xhtml"
+ xmlns:db="http://docbook.org/ns/docbook">
+ <title>Statements</title>
+
+ <section xml:id="sw1SectionObjectsClasses">
+ <title/>
+
+ <para/>
+ </section>
+</chapter>
diff --git a/Doc/Sd1/statements.xml b/Doc/Sd1/statements.xml
new file mode 100644
index 0000000000000000000000000000000000000000..c1e6266e718a76ed8bec6981161107528be79523
--- /dev/null
+++ b/Doc/Sd1/statements.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<chapter version="5.0" xml:id="sw1ChapterStatements"
+ xmlns="http://docbook.org/ns/docbook"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:xi="http://www.w3.org/2001/XInclude"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns:m="http://www.w3.org/1998/Math/MathML"
+ xmlns:html="http://www.w3.org/1999/xhtml"
+ xmlns:db="http://docbook.org/ns/docbook">
+ <title>Statements</title>
+
+ <section xml:id="sw1SectionStatements">
+ <title/>
+
+ <para/>
+ </section>
+</chapter>
diff --git a/Doc/Sd1/streams.xml b/Doc/Sd1/streams.xml
index 1b9e0d5ff38579805b60d59bdeeb31676c21ace8..93fc921c5f36afc5bfc64fb5b99f56a354597f02 100644
--- a/Doc/Sd1/streams.xml
+++ b/Doc/Sd1/streams.xml
@@ -1,4 +1,5 @@
- <chapter xml:id="sd1ReadCharStreams" version="5.0"
+<?xml version="1.0" encoding="UTF-8"?>
+<chapter version="5.0" xml:id="sd1ReadCharStreams"
xmlns="http://docbook.org/ns/docbook"
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -6,43 +7,42 @@
xmlns:m="http://www.w3.org/1998/Math/MathML"
xmlns:html="http://www.w3.org/1999/xhtml"
xmlns:db="http://docbook.org/ns/docbook">
- <title>Reading character streams (15.12.)</title>
-
- <section xml:id="sd1ReadCharStreamsPrepare">
- <title>Preparations</title>
-
- <itemizedlist>
- <listitem>
- <para>Section <quote>Interfaces</quote> of chapter 6 in <xref
- linkend="bib_Horton2011"/>.</para>
- </listitem>
-
- <listitem>
- <para>Chapter 8 of <xref linkend="bib_Horton2011"/> excluding the
- last chapter <quote>The Standard Streams</quote>.</para>
- </listitem>
-
- <listitem>
- <para><link xlink:href="Ref/Svg/exception.svg">Exception
- basics</link>.</para>
- </listitem>
- </itemizedlist>
- </section>
-
- <section xml:id="sd1GnuWc">
- <title>Exercises</title>
-
- <qandaset defaultlabel="qanda" xml:id="sd1QandaLinenumbers">
- <title>Adding line numbers to text files</title>
-
- <qandadiv>
- <qandaentry>
- <question>
- <para>We want to add line numbers to arbitrary text files not
- necessarily being related to programming. Consider the following
- HTML example input:</para>
-
- <programlisting language="java"><html>
+ <title>Reading character streams (15.12.)</title>
+
+ <section xml:id="sd1ReadCharStreamsPrepare">
+ <title>Preparations</title>
+
+ <itemizedlist>
+ <listitem>
+ <para>Section <quote>Interfaces</quote> of chapter 6 in .</para>
+ </listitem>
+
+ <listitem>
+ <para>Chapter 8 of excluding the last chapter <quote>The Standard
+ Streams</quote>.</para>
+ </listitem>
+
+ <listitem>
+ <para><link xlink:href="Ref/Svg/exception.svg">Exception
+ basics</link>.</para>
+ </listitem>
+ </itemizedlist>
+ </section>
+
+ <section xml:id="sd1GnuWc">
+ <title>Exercises</title>
+
+ <qandaset defaultlabel="qanda" xml:id="sd1QandaLinenumbers">
+ <title>Adding line numbers to text files</title>
+
+ <qandadiv>
+ <qandaentry>
+ <question>
+ <para>We want to add line numbers to arbitrary text files not
+ necessarily being related to programming. Consider the following
+ HTML example input:</para>
+
+ <programlisting language="java"><html>
<head>
<title>A simple HTML example</title>
</head>
@@ -51,9 +51,9 @@
</body>
</html></programlisting>
- <para>Your application shall add line numbers:</para>
+ <para>Your application shall add line numbers:</para>
- <programlisting language="none">1: <html>
+ <programlisting language="none">1: <html>
2: <head>
3: <title>A simple HTML example</title>
4: </head>
@@ -62,57 +62,55 @@
7: </body>
8: </html></programlisting>
- <para>Hints:</para>
+ <para>Hints:</para>
- <orderedlist>
- <listitem>
- <para>Given the name of an existing file you may create an
- instance of <classname
- xlink:href="http://docs.oracle.com/javase/8/docs/api/java/io/BufferedReader.html">BufferedReader</classname>:</para>
+ <orderedlist>
+ <listitem>
+ <para>Given the name of an existing file you may create an
+ instance of <classname
+ xlink:href="http://docs.oracle.com/javase/8/docs/api/java/io/BufferedReader.html">BufferedReader</classname>:</para>
- <programlisting language="java">final FileReader fileReader = new FileReader(inputFileName);
+ <programlisting language="java">final FileReader fileReader = new FileReader(inputFileName);
final BufferedReader inputBufferedReader = new BufferedReader(fileReader);</programlisting>
- </listitem>
-
- <listitem>
- <para>You will have to deal with possible <classname
- xlink:href="http://docs.oracle.com/javase/8/docs/api/java/io/FileNotFoundException.html">FileNotFoundException</classname>
- problems providing meaningful error messages.</para>
- </listitem>
-
- <listitem>
- <para>The <classname
- xlink:href="http://docs.oracle.com/javase/8/docs/api/java/io/BufferedReader.html">BufferedReader</classname>
- class provides a method <methodname
- xlink:href="http://docs.oracle.com/javase/8/docs/api/java/io/BufferedReader.html#readLine--">readLine()</methodname>
- allowing to access a given file's content line by
- line.</para>
-
- <caution>
- <para>Even if a file exists you have my encounter
- <classname
- xlink:href="http://docs.oracle.com/javase/8/docs/api/java/io/IOException.html">IOException</classname>
- problems being related to <acronym>i.e.</acronym> missing
- permissions.</para>
- </caution>
- </listitem>
- </orderedlist>
- </question>
-
- <answer>
- <annotation role="make">
- <para role="eclipse">Sd1/Wc/readFile</para>
- </annotation>
-
- <para>This solutions reacts both to inexistent files and general
- IO problems:</para>
-
- <programlisting language="none">File not found: Testdata/input.java</programlisting>
-
- <para>Two test cases deal both with readable and non-existing
- files: and expected exceptions:</para>
-
- <programlisting language="java"> @Test
+ </listitem>
+
+ <listitem>
+ <para>You will have to deal with possible <classname
+ xlink:href="http://docs.oracle.com/javase/8/docs/api/java/io/FileNotFoundException.html">FileNotFoundException</classname>
+ problems providing meaningful error messages.</para>
+ </listitem>
+
+ <listitem>
+ <para>The <classname
+ xlink:href="http://docs.oracle.com/javase/8/docs/api/java/io/BufferedReader.html">BufferedReader</classname>
+ class provides a method <methodname
+ xlink:href="http://docs.oracle.com/javase/8/docs/api/java/io/BufferedReader.html#readLine--">readLine()</methodname>
+ allowing to access a given file's content line by line.</para>
+
+ <caution>
+ <para>Even if a file exists you have my encounter <classname
+ xlink:href="http://docs.oracle.com/javase/8/docs/api/java/io/IOException.html">IOException</classname>
+ problems being related to <acronym>i.e.</acronym> missing
+ permissions.</para>
+ </caution>
+ </listitem>
+ </orderedlist>
+ </question>
+
+ <answer>
+ <annotation role="make">
+ <para role="eclipse">Sd1/Wc/readFile</para>
+ </annotation>
+
+ <para>This solutions reacts both to inexistent files and general
+ IO problems:</para>
+
+ <programlisting language="none">File not found: Testdata/input.java</programlisting>
+
+ <para>Two test cases deal both with readable and non-existing
+ files: and expected exceptions:</para>
+
+ <programlisting language="java"> @Test
public void testReadFileOk() throws FileNotFoundException, IOException {
ReadFile.openStream("Testdata/input.txt"); // Existing file
}
@@ -121,177 +119,175 @@ final BufferedReader inputBufferedReader = new BufferedReader(fileReader);</prog
ReadFile.openStream("Testdata/input.java"); // Does not exist
}</programlisting>
- <para>Notice the second test which will only succeed if a
- <classname
- xlink:href="http://docs.oracle.com/javase/8/docs/api/java/io/FileNotFoundException.html">FileNotFoundException</classname>
- is being thrown.</para>
- </answer>
- </qandaentry>
- </qandadiv>
- </qandaset>
-
- <qandaset defaultlabel="qanda" xml:id="sd1QandaWc">
- <title>A partial implementation of GNU UNIX
- <command>wc</command></title>
-
- <qandadiv>
- <qandaentry>
- <question>
- <para>In this exercise we will partly implement the (Gnu) UNIX
- command line tool <command
- xlink:href="http://www.gnu.org/software/coreutils/manual/html_node/wc-invocation.html">wc</command>
- (word count). Prior to starting this exercise you may want
- to:</para>
-
- <itemizedlist>
- <listitem>
- <para>Execute <command
- xlink:href="http://www.gnu.org/software/coreutils/manual/html_node/wc-invocation.html">wc</command>
- for sample text files like e.g. a Java source file of
- similar:</para>
-
- <programlisting language="bourne">goik >wc BoundedIntegerStore.java
+ <para>Notice the second test which will only succeed if a
+ <classname
+ xlink:href="http://docs.oracle.com/javase/8/docs/api/java/io/FileNotFoundException.html">FileNotFoundException</classname>
+ is being thrown.</para>
+ </answer>
+ </qandaentry>
+ </qandadiv>
+ </qandaset>
+
+ <qandaset defaultlabel="qanda" xml:id="sd1QandaWc">
+ <title>A partial implementation of GNU UNIX
+ <command>wc</command></title>
+
+ <qandadiv>
+ <qandaentry>
+ <question>
+ <para>In this exercise we will partly implement the (Gnu) UNIX
+ command line tool <command
+ xlink:href="http://www.gnu.org/software/coreutils/manual/html_node/wc-invocation.html">wc</command>
+ (word count). Prior to starting this exercise you may want
+ to:</para>
+
+ <itemizedlist>
+ <listitem>
+ <para>Execute <command
+ xlink:href="http://www.gnu.org/software/coreutils/manual/html_node/wc-invocation.html">wc</command>
+ for sample text files like e.g. a Java source file of
+ similar:</para>
+
+ <programlisting language="bourne">goik >wc BoundedIntegerStore.java
58 198 1341 BoundedIntegerStore.java
</programlisting>
- <para>What do these three numbers 58, 198 and 1341 mean?
- Execute <command>wc</command> <option>--help</option> or
- <command>man</command> <option>wc</option> or read the <link
- xlink:href="http://www.gnu.org/software/coreutils/manual/html_node/wc-invocation.html">HTML
- documentation</link>.</para>
- </listitem>
+ <para>What do these three numbers 58, 198 and 1341 mean?
+ Execute <command>wc</command> <option>--help</option> or
+ <command>man</command> <option>wc</option> or read the <link
+ xlink:href="http://www.gnu.org/software/coreutils/manual/html_node/wc-invocation.html">HTML
+ documentation</link>.</para>
+ </listitem>
- <listitem>
- <para><command>wc</command> may process several file in
- parallel thereby producing an extra line <coref
- linkend="sd1PlWcExtraLine"/> summing up all values:</para>
+ <listitem>
+ <para><command>wc</command> may process several file in
+ parallel thereby producing an extra line <coref
+ linkend="sd1PlWcExtraLine"/> summing up all values:</para>
- <programlisting language="bourne">goik >wc bibliography.xml swd1.xml
+ <programlisting language="bourne">goik >wc bibliography.xml swd1.xml
69 83 2087 bibliography.xml
6809 18252 248894 swd1.xml
<emphasis role="bold">6878 18335 250981 total</emphasis> <co
- xml:id="sd1PlWcExtraLine"/>
+ xml:id="sd1PlWcExtraLine"/>
</programlisting>
- </listitem>
+ </listitem>
- <listitem>
- <para><command>wc</command> can be used in <link
- xlink:href="http://en.wikipedia.org/wiki/Pipeline_(Unix)">pipes</link>
- () like:</para>
+ <listitem>
+ <para><command>wc</command> can be used in <link
+ xlink:href="http://en.wikipedia.org/wiki/Pipeline_(Unix)">pipes</link>
+ () like:</para>
- <programlisting language="bourne">goik >grep int BoundedIntegerStore.java | wc
+ <programlisting language="bourne">goik >grep int BoundedIntegerStore.java | wc
12 76 516</programlisting>
- <para>The above output <quote>12 76 516</quote> tells us
- that our file <filename>BoundedIntegerStore.java</filename>
- does have 12 lines containing the string
- <quote>int</quote>.</para>
- </listitem>
- </itemizedlist>
-
- <para>A partial implementation shall offer all features being
- mentioned in the introduction. The following steps are a
- proposal for your implementation:</para>
-
- <orderedlist>
- <listitem>
- <para>Write a method counting the number of words within a
- given string. We assume words to be separated by at least
- one white space character (<code>space</code> or
- <code>\t</code>). Write some tests to assure correct
- behaviour.</para>
- </listitem>
-
- <listitem>
- <para>Read input either from a list of files or from
- standard input depending on the number of arguments to
- main(String[] args):</para>
-
- <itemizedlist>
- <listitem>
- <para>If <code>args.length == 0</code> assume to read
- from standard input.</para>
- </listitem>
-
- <listitem>
- <para>if <code>0 < args.length</code> try to
- interpret the arguments as filenames.</para>
- </listitem>
- </itemizedlist>
- </listitem>
-
- <listitem>
- <para>Write a class <code>TextFileStatistics</code> being
- able to and count characters, words and lines of a single
- input file. Instances of this class may be initialized from
- a <classname
- xlink:href="http://docs.oracle.com/javase/8/docs/api/java/io/BufferedReader.html">BufferedReader</classname>.</para>
-
- <para>Write corresponding tests.</para>
- </listitem>
-
- <listitem>
- <para>You may create an instance of <classname
- xlink:href="http://docs.oracle.com/javase/8/docs/api/java/io/BufferedReader.html">BufferedReader</classname>
- from <link
- xlink:href="http://docs.oracle.com/javase/8/docs/api/java/lang/System.html#in">System.in</link>
- via:</para>
-
- <programlisting language="java">new BufferedReader(new InputStreamReader(System.in))</programlisting>
- </listitem>
-
- <listitem>
- <para>Create an executable Jar archive and execute some
- examples. The UNIX command <command
- xlink:href="http://www.gnu.org/software/coreutils/manual/html_node/cat-invocation.html#cat-invocation">cat</command>
- writes a file's content to standard output. This output may
- be piped as input to your application as in <code>cat
- filename.txt | java -jar .../wc-1.0.jar</code>.</para>
- </listitem>
- </orderedlist>
- </question>
-
- <answer>
- <annotation role="make">
- <para role="eclipse">Sd1/Wc/wc</para>
- </annotation>
-
- <para>Executing <command>mvn</command> <option>package</option>
- creates an executable Jar file
- <filename>../target/wc-1.0.jar</filename>. We test both ways of
- operation:</para>
-
- <glosslist>
- <glossentry>
- <glossterm>Reading from standard input</glossterm>
-
- <glossdef>
- <programlisting language="bourne">goik >cat Testdata/input.html | java -jar target/wc-1.0.jar
+ <para>The above output <quote>12 76 516</quote> tells us that
+ our file <filename>BoundedIntegerStore.java</filename> does
+ have 12 lines containing the string <quote>int</quote>.</para>
+ </listitem>
+ </itemizedlist>
+
+ <para>A partial implementation shall offer all features being
+ mentioned in the introduction. The following steps are a proposal
+ for your implementation:</para>
+
+ <orderedlist>
+ <listitem>
+ <para>Write a method counting the number of words within a
+ given string. We assume words to be separated by at least one
+ white space character (<code>space</code> or <code>\t</code>).
+ Write some tests to assure correct behaviour.</para>
+ </listitem>
+
+ <listitem>
+ <para>Read input either from a list of files or from standard
+ input depending on the number of arguments to main(String[]
+ args):</para>
+
+ <itemizedlist>
+ <listitem>
+ <para>If <code>args.length == 0</code> assume to read from
+ standard input.</para>
+ </listitem>
+
+ <listitem>
+ <para>if <code>0 < args.length</code> try to interpret
+ the arguments as filenames.</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+
+ <listitem>
+ <para>Write a class <code>TextFileStatistics</code> being able
+ to and count characters, words and lines of a single input
+ file. Instances of this class may be initialized from a
+ <classname
+ xlink:href="http://docs.oracle.com/javase/8/docs/api/java/io/BufferedReader.html">BufferedReader</classname>.</para>
+
+ <para>Write corresponding tests.</para>
+ </listitem>
+
+ <listitem>
+ <para>You may create an instance of <classname
+ xlink:href="http://docs.oracle.com/javase/8/docs/api/java/io/BufferedReader.html">BufferedReader</classname>
+ from <link
+ xlink:href="http://docs.oracle.com/javase/8/docs/api/java/lang/System.html#in">System.in</link>
+ via:</para>
+
+ <programlisting language="java">new BufferedReader(new InputStreamReader(System.in))</programlisting>
+ </listitem>
+
+ <listitem>
+ <para>Create an executable Jar archive and execute some
+ examples. The UNIX command <command
+ xlink:href="http://www.gnu.org/software/coreutils/manual/html_node/cat-invocation.html#cat-invocation">cat</command>
+ writes a file's content to standard output. This output may be
+ piped as input to your application as in <code>cat
+ filename.txt | java -jar .../wc-1.0.jar</code>.</para>
+ </listitem>
+ </orderedlist>
+ </question>
+
+ <answer>
+ <annotation role="make">
+ <para role="eclipse">Sd1/Wc/wc</para>
+ </annotation>
+
+ <para>Executing <command>mvn</command> <option>package</option>
+ creates an executable Jar file
+ <filename>../target/wc-1.0.jar</filename>. We test both ways of
+ operation:</para>
+
+ <glosslist>
+ <glossentry>
+ <glossterm>Reading from standard input</glossterm>
+
+ <glossdef>
+ <programlisting language="bourne">goik >cat Testdata/input.html | java -jar target/wc-1.0.jar
9 14 137</programlisting>
- </glossdef>
- </glossentry>
+ </glossdef>
+ </glossentry>
- <glossentry>
- <glossterm>Passing file names as parameters</glossterm>
+ <glossentry>
+ <glossterm>Passing file names as parameters</glossterm>
- <glossdef>
- <programlisting language="bourne">goik >java -jar target/wc-1.0.jar Testdata/*
+ <glossdef>
+ <programlisting language="bourne">goik >java -jar target/wc-1.0.jar Testdata/*
9 14 137 Testdata/input.html
4 5 41 Testdata/model.css
13 19 178 total</programlisting>
- </glossdef>
- </glossentry>
- </glosslist>
+ </glossdef>
+ </glossentry>
+ </glosslist>
- <para><xref linkend="glo_Junit"/> tests of internal
- functionality:</para>
+ <para><xref linkend="glo_Junit"/> tests of internal
+ functionality:</para>
- <glosslist>
- <glossentry>
- <glossterm>Counting words in a given string:</glossterm>
+ <glosslist>
+ <glossentry>
+ <glossterm>Counting words in a given string:</glossterm>
- <glossdef>
- <programlisting language="java"> @Test
+ <glossdef>
+ <programlisting language="java"> @Test
public void testNoWord() {
Assert.assertEquals("Just white space", 0, TextFileStatistics.findNoOfWords(" \t"));
}
@@ -325,14 +321,14 @@ final BufferedReader inputBufferedReader = new BufferedReader(fileReader);</prog
final String s = " some\t\tinterspersed \t spaces \t\t ";
Assert.assertEquals("text='" + s + "'", 3, TextFileStatistics.findNoOfWords(s));
}</programlisting>
- </glossdef>
- </glossentry>
+ </glossdef>
+ </glossentry>
- <glossentry>
- <glossterm>Analyzing test file data:</glossterm>
+ <glossentry>
+ <glossterm>Analyzing test file data:</glossterm>
- <glossdef>
- <programlisting language="java"> @Test
+ <glossdef>
+ <programlisting language="java"> @Test
public void testTwoInputFiles() throws FileNotFoundException, IOException {
final String model_css_filename = "Testdata/model.css", // 4 lines 5 words 41 character
@@ -362,12 +358,12 @@ final BufferedReader inputBufferedReader = new BufferedReader(fileReader);</prog
Assert.assertEquals( 19, TextFileStatistics.getTotalNumWords());
Assert.assertEquals(178, TextFileStatistics.getTotalNumCharacters());
}</programlisting>
- </glossdef>
- </glossentry>
- </glosslist>
- </answer>
- </qandaentry>
- </qandadiv>
- </qandaset>
- </section>
- </chapter>
+ </glossdef>
+ </glossentry>
+ </glosslist>
+ </answer>
+ </qandaentry>
+ </qandadiv>
+ </qandaset>
+ </section>
+</chapter>
diff --git a/Doc/Sd1/workingWithNumbers.xml b/Doc/Sd1/workingWithNumbers.xml
new file mode 100644
index 0000000000000000000000000000000000000000..9c99672ab7d55fe48f7d8768e4fa450dab8cf0d5
--- /dev/null
+++ b/Doc/Sd1/workingWithNumbers.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<chapter version="5.0" xml:id="sw1ChapterWorkingWithNumbers"
+ xmlns="http://docbook.org/ns/docbook"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:xi="http://www.w3.org/2001/XInclude"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns:m="http://www.w3.org/1998/Math/MathML"
+ xmlns:html="http://www.w3.org/1999/xhtml"
+ xmlns:db="http://docbook.org/ns/docbook">
+ <title>Statements</title>
+
+ <section xml:id="sw1SectionWorkingWithNumbers">
+ <title/>
+
+ <para/>
+ </section>
+</chapter>
diff --git a/Doc/lectures.xml b/Doc/lectures.xml
index d0fc71fd3feccedd8d41ba6139d0f6d034b85d91..ce1bf3433847b98b75388b1192fd0e8a2cbb3d53 100644
--- a/Doc/lectures.xml
+++ b/Doc/lectures.xml
@@ -33,6 +33,15 @@
<xi:include href="Sd1/languageFundamentals.xml" xpointer="element(/1)"/>
+ <xi:include href="Sd1/statements.xml" xpointer="element(/1)"/>
+ <xi:include href="Sd1/objectsClasses.xml" xpointer="element(/1)"/>
+ <xi:include href="Sd1/coreClasses.xml" xpointer="element(/1)"/>
+ <xi:include href="Sd1/arrays.xml" xpointer="element(/1)"/>
+ <xi:include href="Sd1/inheritance.xml" xpointer="element(/1)"/>
+ <xi:include href="Sd1/errorHandling.xml" xpointer="element(/1)"/>
+ <xi:include href="Sd1/workingWithNumbers.xml" xpointer="element(/1)"/>
+ <xi:include href="Sd1/interfacesAbstractClasses.xml" xpointer="element(/1)"/>
+
<xi:include href="Sd1/class.xml" xpointer="element(/1)"/>
<xi:include href="Sd1/loop.xml" xpointer="element(/1)"/>