Skip to content

Commit 8236616

Browse files
authored
Merge pull request #137 from FlashEb/Issue-#131-Fix
Added more indices to important concepts and terminology
2 parents b3310f6 + 5649c7d commit 8236616

4 files changed

Lines changed: 8 additions & 9 deletions

File tree

source/ch2_firstjavaprogram.ptx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
<title>Classes and Objects</title>
99

1010
<p>
11-
<idx>Object-Oriented Programming (OOP)</idx>
12-
Depending on how deep your knowledge of Python and programming in general is, you may or may not be familiar with classes and objects. These two important <term>Object-Oriented Programming (OOP)</term> concepts will briefly be discussed. If you already have a good understanding of classes and objects in Python, this section may be skipped.
11+
<idx>object-oriented programming</idx> <idx>OOP</idx>
12+
Depending on how deep your knowledge of Python and programming in general is, you may or may not be familiar with classes and objects. These two important <term>Object-Oriented Programming</term> (<term>OOP</term>) concepts will briefly be discussed. If you already have a good understanding of classes and objects in Python, this section may be skipped.
1313
</p>
1414

1515
<p>

source/ch4_conditionals.ptx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -389,8 +389,8 @@ The <c>switch</c> statement is not used very often, and we recommend you do not
389389
<section xml:id="boolean-operators">
390390
<title>Boolean Operators</title>
391391

392-
<p><idx>Boolean operators</idx>
393-
The conditionals used in the if statement can be Boolean variables, simple comparisons, and compound Boolean expressions.
392+
<p><idx>Boolean operators</idx> <idx>simple comparisons</idx> <idx>compound Boolean expressions</idx>
393+
The conditionals used in the if statement can be <term>Boolean variables</term>, <term>simple comparisons</term>, and <term>compound Boolean expressions</term>.
394394
</p>
395395

396396
<p><idx>ternary operator</idx>
@@ -408,7 +408,7 @@ of an assignment statement. The following table summarizes how this works:
408408
</row>
409409
<row>
410410
<cell><c>condition</c></cell>
411-
<cell>The Boolean expression that is evaluated (e.g., <c>a % 2 == 0</c>).</cell>
411+
<cell>The <c>boolean</c> expression that is evaluated (e.g., <c>a % 2 == 0</c>).</cell>
412412
</row>
413413
<row>
414414
<cell><c>?</c></cell>

source/ch5_loopsanditeration.ptx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -321,7 +321,6 @@ public class DoWhileExample {
321321
</choice>
322322
</choices>
323323
</exercise>
324-
325324
</reading-questions>
326325
</section>
327326
</chapter>

source/ch8_filehandling.ptx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@
8585
<section xml:id="create-file">
8686
<title>Creating Files</title>
8787
<p>
88-
Now lets learn how to make a file in Java. In Python files can be made using the <c>open()</c> function on a file path that doesn't exist yet. Similarly, in Java you create a file by using the <c>createNewFile()</c> method on a <c>File</c> object. This method actually does the work of creating a file and saving it in the current working directory, and returns a boolean value of either true or false if the file is successfully created. We can use this method's possible return values in tandem with an try/catch structure to determine if the file was created, or catch the error if a file with that file name already exists in the directory.
88+
Now let's learn how to make a file in Java. In Python. files can be made using the <c>open()</c> function on a file path that doesn't exist yet. Similarly, in Java you create a file by using the <c>createNewFile()</c> method on a <c>File</c> object. This method actually does the work of creating a file and saving it in the current working directory, and returns a boolean value of either true or false if the file is successfully created. We can use this method's possible return values in tandem with an try/catch structure to determine if the file was created, or catch the error if a file with that file name already exists in the directory.
8989
</p>
9090

9191
<p>
@@ -515,15 +515,15 @@
515515
</note>
516516

517517
<p>
518-
Speaking of overwriting data, what if we want to append text to the end of any text already in <c>myfile.txt</c>? To accomplish this, we can pass a boolean argument along with the file name when creating a new data argument:
518+
Speaking of overwriting data, what if we want to append text to the end of any text already in <c>myfile.txt</c>? To accomplish this, we can pass a <c>boolean</c> argument along with the file name when creating a new data argument:
519519
</p>
520520

521521
<pre>
522522
FileWriter myWriter = new FileWriter("myfile.txt", true); // true enables append mode
523523
</pre>
524524

525525
<p>
526-
Now, when we use <c>write()</c> method like before, the text will be appended if there is already text in the document. If we were to update our code to include the boolean argument:
526+
Now, when we use <c>write()</c> method like before, the text will be appended if there is already text in the document. If we were to update our code to include the <c>boolean</c> argument:
527527
</p>
528528
<datafile label="my-file-8-4-6" filename="myfile.txt" xml:id= "my-file-8-4-6" editable="yes">
529529
<pre>

0 commit comments

Comments
 (0)