From 36989bedc433c8d8959f6d61380624856cf65e5d Mon Sep 17 00:00:00 2001
From: Martin Goik <goik@hdm-stuttgart.de>
Date: Fri, 9 Nov 2018 21:18:02 +0100
Subject: [PATCH] Cosmetics
---
.../Scopes/variableScopes.multi.svg | 18 ++++++-------
Doc/Sd1/objectsClasses.xml | 27 ++++++++++---------
2 files changed, 24 insertions(+), 21 deletions(-)
diff --git a/Doc/Sd1/Ref/ObjectsAndClasses/Scopes/variableScopes.multi.svg b/Doc/Sd1/Ref/ObjectsAndClasses/Scopes/variableScopes.multi.svg
index b9f03d0a0..ff52b4da0 100644
--- a/Doc/Sd1/Ref/ObjectsAndClasses/Scopes/variableScopes.multi.svg
+++ b/Doc/Sd1/Ref/ObjectsAndClasses/Scopes/variableScopes.multi.svg
@@ -15,7 +15,7 @@
viewBox="0 0 170.00002 75"
version="1.1"
id="svg8"
- inkscape:version="0.92.1 r15371"
+ inkscape:version="0.92.3 (2405546, 2018-03-11)"
sodipodi:docname="variableScopes.multi.svg">
<sodipodi:namedview
id="base"
@@ -25,15 +25,15 @@
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="1.8200176"
- inkscape:cx="316.07043"
+ inkscape:cx="335.85046"
inkscape:cy="66.513171"
inkscape:document-units="mm"
- inkscape:current-layer="g4687"
- showgrid="true"
- inkscape:window-width="1547"
- inkscape:window-height="1050"
- inkscape:window-x="40"
- inkscape:window-y="53"
+ inkscape:current-layer="g4629"
+ showgrid="false"
+ inkscape:window-width="2110"
+ inkscape:window-height="1399"
+ inkscape:window-x="1119"
+ inkscape:window-y="452"
inkscape:window-maximized="0"
fit-margin-top="0"
fit-margin-left="0"
@@ -2487,7 +2487,7 @@
id="tspan4721"
x="91.281235"
y="6.7617397"
- style="stroke-width:0.26458332">Instnce variable »<tspan
+ style="stroke-width:0.26458332">Instance variable »<tspan
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:'DejaVu Sans Mono';-inkscape-font-specification:'DejaVu Sans Mono Bold';fill:#ff0000"
id="tspan4727">radius</tspan>« is visible</tspan><tspan
sodipodi:role="line"
diff --git a/Doc/Sd1/objectsClasses.xml b/Doc/Sd1/objectsClasses.xml
index 8e7663ec1..3859629a4 100644
--- a/Doc/Sd1/objectsClasses.xml
+++ b/Doc/Sd1/objectsClasses.xml
@@ -2195,9 +2195,7 @@ public class SetterAccess {
<title>Method overloading</title>
<figure xml:id="sd1_fig_overloadingPrinciple">
- <title>What is overloading?</title>
-
- <para>Identical method name, differing method signature:</para>
+ <title>Method overloading: Same name, different signature</title>
<informaltable border="0">
<tr>
@@ -2395,29 +2393,34 @@ void main(void) {
<title>Creating and initializing rectangles</title>
<informaltable border="1">
- <colgroup width="59%"/>
+ <colgroup width="30%"/>
- <colgroup width="41%"/>
+ <colgroup width="70%"/>
<tr>
+ <td valign="top"><programlisting language="java">int a;
+a = 33;</programlisting></td>
+
<td valign="top"><programlisting language="java">Rectangle r = new Rectangle();
r.width = 28;
r.height = 10;
r.hasSolidBorder = false;</programlisting></td>
+ </tr>
- <td valign="top"><programlisting language="java">int a;
-a = 33;</programlisting></td>
+ <tr>
+ <th colspan="2"><para>Combining statements desired:</para></th>
</tr>
<tr>
- <td valign="top"><para>Combining statements
- desired:</para><programlisting language="java">Rectangle r = new Rectangle(28, 10, false);</programlisting><para>How
- to get this work?</para></td>
+ <td valign="top"><programlisting language="java">int a = 33; // works!</programlisting></td>
- <td valign="top"><programlisting language="java">int a = 33;</programlisting></td>
+ <td valign="top"><programlisting language="java">Rectangle r = new Rectangle(28, 10, false); // <emphasis
+ role="red">how ???</emphasis></programlisting></td>
</tr>
</informaltable>
+
+ <para>How to get this work?</para>
</figure>
<figure xml:id="sd1_fig_createRectangleDefineConstruct">
@@ -2493,7 +2496,7 @@ a = 33;</programlisting></td>
</listitem>
<listitem>
- <para>Only one of potentially multiple constructors can be
+ <para>Only one of potentially multiple constructors will be
executed exactly one time.</para>
</listitem>
</itemizedlist>
--
GitLab