From f1d15f75f9130bcc76a861350ab26e1a7546b2c6 Mon Sep 17 00:00:00 2001
From: "Dr. Martin Goik" <goik@hdm-stuttgart.de>
Date: Fri, 5 Oct 2018 15:22:15 +0200
Subject: [PATCH] long literal, cosmetics
---
Doc/Sd1/gettingStarted.xml | 51 +++++++++++++++++++++-----------
Doc/Sd1/languageFundamentals.xml | 14 +++++----
2 files changed, 41 insertions(+), 24 deletions(-)
diff --git a/Doc/Sd1/gettingStarted.xml b/Doc/Sd1/gettingStarted.xml
index 269d6d766..33155c4bf 100644
--- a/Doc/Sd1/gettingStarted.xml
+++ b/Doc/Sd1/gettingStarted.xml
@@ -195,7 +195,7 @@
</imageobject>
</mediaobject>
- <para>See <link linkend="sd1SectToolsOfTheTrade1">installation
+ <para>See <link linkend="sd1_sect_usingMavenIdea">installation
details</link>.</para>
</figure>
@@ -784,14 +784,6 @@ public class HelloWorld <co
belonging to a <xref linkend="glo_JDK"/>. It will read the input
filename <filename>HelloWorld.java</filename> and create a resulting
output filename <filename>HelloWorld.class</filename>.</para>
-
- <screen>~/tmp$ ls -al HelloWorld.class
-ls: cannot access 'HelloWorld.class': No such file or directory
-
-~/tmp$ <emphasis role="red">javac</emphasis> HelloWorld.java
-
-~/tmp$ ls -al HelloWorld.class
--rw-r--r-- 1 goik fb1prof 419 Sep 23 15:44 HelloWorld.class</screen>
</callout>
<callout arearefs="sd1_fig_imageco_compileJava-3-co"
@@ -810,6 +802,18 @@ ls: cannot access 'HelloWorld.class': No such file or directory
</calloutlist>
</figure>
+ <figure xml:id="sd1_fig_imageco_compileJavaShell">
+ <title>Shell compiling <xref linkend="glo_Java"/> file</title>
+
+ <screen>~/tmp$ ls -al <emphasis role="red">HelloWorld.class</emphasis>
+ls: cannot access '<emphasis role="red">HelloWorld.class</emphasis>': No such file or directory
+
+~/tmp$ <emphasis role="red">javac</emphasis> HelloWorld.java
+
+~/tmp$ ls -al <emphasis role="red">HelloWorld.class</emphasis>
+-rw-r--r-- 1 goik fb1prof 419 Sep 23 15:44 <emphasis role="red">HelloWorld.class</emphasis></screen>
+ </figure>
+
<para>Besides human readable portions bytecode files mainly contain binary
data providing instructions to be executed:</para>
@@ -934,6 +938,13 @@ ls: cannot access 'HelloWorld.class': No such file or directory
</calloutlist>
</figure>
+ <figure xml:id="sd1_fig_imageco_executeJavaScreen">
+ <title>Shell <xref linkend="glo_Java"/> bytecode file execution</title>
+
+ <screen>> java HelloWorld
+Hello, world</screen>
+ </figure>
+
<figure xml:id="sd1_fig_imageco_installJdk">
<title><xref linkend="glo_JDK"/> installation options</title>
@@ -2269,7 +2280,7 @@ nano ~/.m2/settings.xml <co linkends="sd1_fig_mavenMiRepo-2"
<screen>mvn --batch-mode -e archetype:generate \
-DgroupId=de.hdm_stuttgart.mi.sd1 \
-DartifactId=first -Dversion=0.9 -DarchetypeGroupId=de.hdm_stuttgart.mi \
--DarchetypeArtifactId=mi-maven-archetype-quickstart -DarchetypeVersion=1.2
+-DarchetypeArtifactId=<emphasis role="red">mi-maven-archetype-quickstart</emphasis> -DarchetypeVersion=1.2
[INFO] Scanning for projects...
...
@@ -2285,11 +2296,13 @@ nano ~/.m2/settings.xml <co linkends="sd1_fig_mavenMiRepo-2"
role="red">archetype:generate</emphasis> <co
linkends="sd1_fig_mavenMiRepoCliDetails-2"
xml:id="sd1_fig_mavenMiRepoCliDetails-2-co"/> \
+ \
-D<emphasis role="red">archetypeGroupId</emphasis>=de.hdm_stuttgart.mi \ <co
linkends="sd1_fig_mavenMiRepoCliDetails-3"
xml:id="sd1_fig_mavenMiRepoCliDetails-3-co"/>
-D<emphasis role="red">archetypeArtifactId</emphasis>=mi-maven-archetype-quickstart \
-D<emphasis role="red">archetypeVersion</emphasis>=1.2 \
+ \
-D<emphasis role="red">groupId</emphasis>=de.hdm_stuttgart.mi.sd1 <co
linkends="sd1_fig_mavenMiRepoCliDetails-4"
xml:id="sd1_fig_mavenMiRepoCliDetails-4-co"/> \
@@ -2588,6 +2601,10 @@ Generating <emphasis role="bold">/ma/goik/First/target/site/apidocs/index.html</
Generating /ma/goik/First/target/site/apidocs/overview-summary.html...
Generating /ma/goik/First/target/site/apidocs/help-doc.html...
</screen>
+
+ <para>See e.g. <link
+ xlink:href="https://docs.oracle.com/javase/10/docs/api/java/lang/String.html">class
+ String documentation</link>.</para>
</figure>
<figure xml:id="sd1_fig_mavenClean">
@@ -2617,7 +2634,7 @@ Generating /ma/goik/First/target/site/apidocs/help-doc.html...
</listitem>
<listitem>
- <para>Using MI supplementary archetypes requires <link
+ <para>MI supplementary archetypes require <link
xlink:href="sd1_sect_mavenCli">MI archetype configuration</link>
in <filename>~/.m2/settings.xml</filename>.</para>
</listitem>
@@ -2639,12 +2656,12 @@ Generating /ma/goik/First/target/site/apidocs/help-doc.html...
<title><xref linkend="glo_Soft_IntellijIDEA"/> MI archetype repository
configuration</title>
- <para>Restarting <productname
+ <para>Restart <productname
xlink:href="https://www.jetbrains.com/idea">IntelliJ
- IDEA</productname> and configure the MI Maven archetype repository
- <uri
- xlink:href="https://maven.mi.hdm-stuttgart.de/nexus/repository/mi-maven/archetype-catalog.xml">https://maven.mi.hdm-stuttgart.de/nexus/repository/mi-maven/archetype-catalog.xml</uri>
- in <quote>settings</quote>:</para>
+ IDEA</productname> for <link
+ xlink:href="https://maven.mi.hdm-stuttgart.de/nexus/repository/mi-maven/archetype-catalog.xml">MI
+ Maven archetype repository</link> configuration in
+ <quote>settings</quote>:</para>
<mediaobject>
<imageobject>
@@ -2656,8 +2673,6 @@ Generating /ma/goik/First/target/site/apidocs/help-doc.html...
<figure xml:id="sd1_fig_mavenIdeaMiArchetypeNewProject">
<title>New MI archetype project</title>
- <para>Click <option>Create New Project</option>:</para>
-
<mediaobject>
<imageobject>
<imagedata fileref="Ref/Fig/NewProjectMavenIntellij/s100_startscreen.png"/>
diff --git a/Doc/Sd1/languageFundamentals.xml b/Doc/Sd1/languageFundamentals.xml
index 5b5848363..1114e735b 100644
--- a/Doc/Sd1/languageFundamentals.xml
+++ b/Doc/Sd1/languageFundamentals.xml
@@ -340,11 +340,11 @@
<figure xml:id="sd1_fig_varDeclareAndUse">
<title>Declare and use</title>
- <programlisting language="java">double pi; // Declaration
+ <programlisting language="java">double pi; // Variable seclaration
...
-pi = 3.1415926; // Value assignment
+pi = 3.1415926; // Assigning value to variable
-// Area of circle having radius 2.0
+// Print a circle's area of radius 2.0
System.out.println(pi * 2.0 * 2.0);</programlisting>
</figure>
@@ -2113,11 +2113,13 @@ System.out.println(10000000000 ); // Compile time error: Integer number larger
<figure xml:id="sd1_fig_literals">
<title>Literal examples</title>
- <programlisting language="java">System.out.println("Hello"); // A String literal
+ <programlisting language="java">System.out.println("Hello"); // A String literal
-System.out.println(33452); // An int literal
+System.out.println(33452); // An int literal
-System.out.println(34.0223); // An double (floating point) literal</programlisting>
+System.out.println(34.0223); // An double (floating point) literal
+
+System.out.println(2147483648); // An long literal</programlisting>
</figure>
<figure xml:id="sd1_fig_integerLiteral">
--
GitLab