Skip to content

Commit c15d0d9

Browse files
committed
correct topics in section 1.1 to what is actually covered
1 parent e0e2c87 commit c15d0d9

1 file changed

Lines changed: 21 additions & 32 deletions

File tree

source/ch1_overview.ptx

Lines changed: 21 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,17 @@
55
<title>Overview</title>
66

77

8-
<section xml:id="sec-prerequisites">
9-
<title>Prerequisites</title>
8+
<section xml:id="prerequisites-and-trajectory">
9+
<title>Prerequisites and Trajectory</title>
1010

1111
<p>
1212
This book assumes that you are already familiar with the <url href="http://www.python.org" visual="http://www.python.org">Python</url> programming language.
13-
We will use Python as a starting point for our journey into <url href="http://java.sun.com" visual="http://java.sun.com">Java</url>.
13+
We will use Python as a starting point for our journey into <url href="http://java.com" visual="http://java.com">Java</url>.
1414
We will begin by looking at a very simple Java program, just to see what the language looks like and how we get a program to run.
1515
Next, we will look at the main constructs that are common to most programming languages:
1616
</p>
1717

18-
<blockquote>
18+
1919
<p>
2020
<ul>
2121
<li>
@@ -26,63 +26,51 @@
2626

2727
<li>
2828
<p>
29-
Loops
29+
User input and output
3030
</p>
3131
</li>
3232

3333
<li>
3434
<p>
35-
Reading user input
35+
Conditionals and Exception Handling
3636
</p>
3737
</li>
38-
3938
<li>
4039
<p>
41-
Conditionals
40+
Loops and Iteration
4241
</p>
4342
</li>
4443
</ul>
4544
</p>
46-
</blockquote>
4745

4846
<p>
49-
Once we have the basics of Java behind us we will move on to look at the features of Java that are both unique and powerful.
47+
Once we have the basics of Java behind us we will move on to look at more powerful features of the language.
5048
</p>
5149

52-
<blockquote>
50+
5351
<p>
5452
<ul>
5553
<li>
5654
<p>
57-
Classes
55+
Classes and Interfaces
5856
</p>
5957
</li>
60-
6158
<li>
6259
<p>
63-
Interfaces
60+
Recursion
6461
</p>
6562
</li>
66-
6763
<li>
6864
<p>
69-
Collections
65+
File Handling
7066
</p>
7167
</li>
7268

73-
<li>
74-
<p>
75-
Graphical User Interface Programming
76-
</p>
77-
</li>
78-
<li>
79-
<p>
80-
Generic Programming
81-
</p>
82-
</li>
8369
</ul>
8470
</p>
85-
</blockquote>
71+
<p>
72+
Finally, we will look at common errors and how to find the help you need.
73+
</p>
8674

8775
</section>
8876

@@ -91,11 +79,7 @@
9179
<title>Java Development Environment</title>
9280

9381
<introduction>
94-
<note>
95-
<p>
96-
Thank you to Beryl Hoffman for contributing to this section from her CSAwesome: AP Java Programming book.
97-
</p>
98-
</note>
82+
9983

10084
<p>
10185
The tool that we use to compile a Java source file into a Java class file
@@ -304,6 +288,11 @@
304288
visual="http://skylit.com/javamethods/faqs/Eclipse.pdf">http://skylit.com/javamethods/faqs/Eclipse.pdf</url>.
305289
</p>
306290
</subsection>
291+
<note>
292+
<p>
293+
Thank you to Beryl Hoffman for contributing to this section from her CSAwesome: AP Java Programming book.
294+
</p>
295+
</note>
307296
</section>
308297

309298
<section xml:id="why-another-programming-language">

0 commit comments

Comments
 (0)