From 0239ee9c6886e6b11d6a0b8935abc707b6d93753 Mon Sep 17 00:00:00 2001
From: Martin Goik <goik@hdm-stuttgart.de>
Date: Wed, 10 Jan 2018 13:57:24 +0100
Subject: [PATCH] no abstract fields
---
Doc/Sd1/inheritance.xml | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/Doc/Sd1/inheritance.xml b/Doc/Sd1/inheritance.xml
index b53d71c42..5b331913c 100644
--- a/Doc/Sd1/inheritance.xml
+++ b/Doc/Sd1/inheritance.xml
@@ -705,20 +705,19 @@ public class Circle extends Shape {
<itemizedlist>
<listitem>
<para>A class containing an <code language="java">abstract</code>
- method or field must itself be declared <code
+ method must itself be declared <code
language="java">abstract</code>.</para>
</listitem>
<listitem>
<para><code language="java">abstract</code> classes are allowed to
- host non-<code language="java">abstract</code> methods or
- fields.</para>
+ host non-<code language="java">abstract</code> methods.</para>
</listitem>
<listitem>
<para>A class may be declared <code language="java">abstract</code>
irrespective of purely containing non-<code
- language="java">abstract</code> methods and fields .</para>
+ language="java">abstract</code> methods.</para>
</listitem>
</itemizedlist>
</figure>
@@ -1210,7 +1209,7 @@ Type Rectangle</screen></td>
<figure xml:id="sd1_inherit_fig_shapeDefineEquals">
<title>Defining <methodname>equals(...)</methodname> of
- <classname>Shape</classname> instances </title>
+ <classname>Shape</classname> instances</title>
<para>Two <classname>Shape</classname> instances shall be considered
equal if:</para>
@@ -1287,7 +1286,7 @@ Type Rectangle</screen></td>
}
...</programlisting>
- <remark>if <code language="java">o == null</code> the expression <code
+ <remark>if <code language="java">o == null</code> then <code
language="java">o instanceof Rectangle</code> evaluates to <code
language="java">false</code>.</remark>
</figure>
--
GitLab