diff --git a/Doc/Sd1/streams.xml b/Doc/Sd1/streams.xml
index 32f1a86898a640d56a9f41e66284de7299f5e810..43ae0cd1d1e02a46938d573fdb38a5748079b0fc 100644
--- a/Doc/Sd1/streams.xml
+++ b/Doc/Sd1/streams.xml
@@ -8,7 +8,7 @@
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>
+ <title>Reading character streams</title>
<section xml:id="sd1ReadCharStreamsPrepare">
<title>Preparations</title>
@@ -26,7 +26,7 @@
<listitem>
<para><link linkend="sd1FigExceptionBasics">Exception basics</link>
already being discussed in <xref
- linkend="sw1SectionErrorHandling"/>.</para>
+ linkend="sw1ChapterErrorHandling"/>.</para>
</listitem>
</itemizedlist>
</section>
@@ -208,22 +208,22 @@ final BufferedReader inputBufferedReader = new BufferedReader(fileReader);</prog
<itemizedlist>
<listitem>
- <para>If <code language="java">args.length == 0</code> assume to read from
- standard input.</para>
+ <para>If <code language="java">args.length == 0</code>
+ assume to read from standard input.</para>
</listitem>
<listitem>
- <para>if <code language="java">0 < args.length</code> try to interpret
- the arguments as filenames.</para>
+ <para>if <code language="java">0 < args.length</code>
+ try to interpret the arguments as filenames.</para>
</listitem>
</itemizedlist>
</listitem>
<listitem>
- <para>Write a class <classname>TextFileStatistics</classname> being able
- to and count characters, words and lines of a single input
- file. Instances of this class may be initialized from a
- <classname
+ <para>Write a class <classname>TextFileStatistics</classname>
+ 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="https://docs.oracle.com/javase/9/docs/api/java/io/BufferedReader.html">BufferedReader</classname>.</para>
<para>Write corresponding tests.</para>
diff --git a/Doc/Sda1/Ref/JpaIntro/P/StudyCourse_basic/Readme.md b/Doc/Sda1/Ref/JpaIntro/P/StudyCourse_basic/Readme.md
index b07ac459245099d2e00d0731dd240054dbf06f1b..399e03c5039552cabf2020cfce633c6c68281235 100644
--- a/Doc/Sda1/Ref/JpaIntro/P/StudyCourse_basic/Readme.md
+++ b/Doc/Sda1/Ref/JpaIntro/P/StudyCourse_basic/Readme.md
@@ -30,9 +30,9 @@ This project contains:
On executing i.e. »`mvn install`« Maven will
[generate]
(https://docs.jboss.org/hibernate/orm/current/topical/html_single/metamodelgen/MetamodelGenerator.html)
-metamodel classes like `StudyCourse_.java` during the
+meta model classes like `StudyCourse_.java` during the
»`generate-sources`« phase. These classes are being required for
-[typesafe criteria based queries]
+[type safe criteria based queries]
(http://docs.jboss.org/hibernate/entitymanager/3.6/reference/en/html/querycriteria.html#querycriteria-typedquery)
not being used in this project.
diff --git a/Doc/Sda1/Ref/JpaIntro/P/StudyCourse_basic/src/main/java/de/hdm_stuttgart/mi/sda1/ReadStudyCourseById.java b/Doc/Sda1/Ref/JpaIntro/P/StudyCourse_basic/src/main/java/de/hdm_stuttgart/mi/sda1/ReadStudyCourseById.java
index 252be89770ad8599b208599d01bce56703a60184..38e415b533f52723d4886e61629c0deaef151441 100644
--- a/Doc/Sda1/Ref/JpaIntro/P/StudyCourse_basic/src/main/java/de/hdm_stuttgart/mi/sda1/ReadStudyCourseById.java
+++ b/Doc/Sda1/Ref/JpaIntro/P/StudyCourse_basic/src/main/java/de/hdm_stuttgart/mi/sda1/ReadStudyCourseById.java
@@ -4,7 +4,6 @@ import de.hdm_stuttgart.mi.sda1.model.StudyCourse;
import javax.persistence.EntityManager;
import javax.persistence.EntityManagerFactory;
-import javax.persistence.EntityTransaction;
import javax.persistence.Persistence;
/**
diff --git a/Doc/Sda1/Ref/JpaIntro/P/StudyCourse_basic/src/main/java/de/hdm_stuttgart/mi/sda1/ReadStudyCourseShortName.java b/Doc/Sda1/Ref/JpaIntro/P/StudyCourse_basic/src/main/java/de/hdm_stuttgart/mi/sda1/ReadStudyCourseShortName.java
index 60e00494683d401452b5eee6b239bffb60eb8443..f508356da15f8cec48c5a70d64ba569b58fcccaf 100644
--- a/Doc/Sda1/Ref/JpaIntro/P/StudyCourse_basic/src/main/java/de/hdm_stuttgart/mi/sda1/ReadStudyCourseShortName.java
+++ b/Doc/Sda1/Ref/JpaIntro/P/StudyCourse_basic/src/main/java/de/hdm_stuttgart/mi/sda1/ReadStudyCourseShortName.java
@@ -1,12 +1,13 @@
package de.hdm_stuttgart.mi.sda1;
-import de.hdm_stuttgart.mi.sda1.model.StudyCourse;
-
-import javax.persistence.*;
+import javax.persistence.EntityManager;
+import javax.persistence.EntityManagerFactory;
+import javax.persistence.Persistence;
+import javax.persistence.Query;
import java.util.List;
/**
- * Datbase / OO Model type violation.
+ * Database / OO Model type violation.
*/
public class ReadStudyCourseShortName {
/**
@@ -18,13 +19,9 @@ public class ReadStudyCourseShortName {
"strategy_none");
final EntityManager em = factory.createEntityManager();
- final EntityTransaction tx = em.getTransaction();
-
final Query query = em.createQuery("SELECT S.shortName FROM StudyCourse AS S");
- final List<String> shortNames;
- tx.begin();
- shortNames = query.getResultList();
- tx.commit();
+ final List<String> shortNames = query.getResultList();
+
try {
for (final String shortName : shortNames) {
System.out.println("Read '" + shortName + "'");
diff --git a/Doc/Sda1/jpaintro.xml b/Doc/Sda1/jpaintro.xml
index cc68e972457760a50880b2729e9c43522c5a811a..29d738ff3fe31a1c271002fb88f99fd7c015a8f8 100644
--- a/Doc/Sda1/jpaintro.xml
+++ b/Doc/Sda1/jpaintro.xml
@@ -222,7 +222,7 @@
xlink:href="https://docs.oracle.com/javaee/7/api/javax/persistence/Query.html">Query</classname></glossterm>
<glossdef>
- <para>Start, commit and rollback transactions.</para>
+ <para>Executing <xref linkend="glo_OO"/> capable queries.</para>
</glossdef>
</glossentry>
</glosslist>
@@ -778,12 +778,13 @@ java.lang.String cannot be cast to de.hdm_stuttgart.mi.sda1.model.StudyCourse
<title>Reading <code language="java">shortName</code> values</title>
<programlisting language="java">...
-final Query query = em.createQuery("SELECT S.shortName FROM StudyCourse AS S");
-final List<StudyCourse> studyCourses = query.getResultList();
+final Query query = em.createQuery("SELECT S.shortName FROM StudyCourse AS S");
+
+final List<String> = query.getResultList();
try {
- for (final StudyCourse studyCourse : studyCourses) {
- System.out.println("Read '" + studyCourse + "'");
+ for (final String shortName : shortNames) {
+ System.out.println("Read '" + shortName + "'");
}
} finally {
factory.close();
@@ -797,7 +798,7 @@ try {
<title>Updating objects</title>
<figure xml:id="sda1_jpaintro_fig_addStudyCourseFullNameSetter">
- <title> Adding a setter</title>
+ <title>Adding a setter</title>
<programlisting language="java">@Entity
public class StudyCourse {