Skip to content

Commit 07a0478

Browse files
authored
Merge pull request #143 from bowbahdoe/develop
Update
2 parents b6016b9 + 5ccd733 commit 07a0478

File tree

26 files changed

+90
-32
lines changed

26 files changed

+90
-32
lines changed

src/annotations/elements.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,4 +63,4 @@ class PersonInCharge {}
6363
}
6464
```
6565

66-
[^fulllist]: You can find the full list [here](https://docs.oracle.com/javase/specs/jls/se23/html/jls-9.html#jls-9.6). It is a short list.
66+
[^fulllist]: You can find the full list [here](https://docs.oracle.com/javase/specs/jls/se25/html/jls-9.html#jls-9.6). It is a short list.

src/annotations/override.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ is an annotation.
66
There's not much else to say besides "hey, thats what that was!" but I think its
77
worth noting.
88

9-
```java
9+
```java,no_run
1010
interface Num {
1111
boolean odd();
1212

src/annotations/target.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ The first of these "meta-annotations" you are likely to use is `@Target`.
77
By default an annotation can mark anything, but you can use `@Target` to
88
restrict what can be marked.[^typeuse]
99

10-
```java
10+
```java,no_run
1111
import java.lang.annotation.ElementType;
1212
import java.lang.annotation.Target;
1313

src/branching_logic/nested_ifs.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ if (age < 25) {
1717
When an `if` is inside another `if` we say that it is "nested".
1818

1919
If you find yourself nesting more than a few `if`s that might be a sign that
20-
you should reach out for help.
20+
you should reach out for help[^or].
2121

2222
```java,no_run
2323
if (...) {
@@ -30,3 +30,5 @@ if (...) {
3030
}
3131
}
3232
```
33+
34+
[^or]: Or a sign that you should keep reading. There are things I will show you that can help you avoid this - like "methods."

src/characters/conversion_to_integers.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Conversion to Integers
22

3-
All `char`s have a matching numeric value. `'a'` is `97`, `'b'` is `98`,
3+
All `char`s have a matching numeric value[^ascii]. `'a'` is `97`, `'b'` is `98`,
44
`'&'` is `38`, and so on.
55

66
Same as assigning an `int` to a `double`, you can perform a widening conversion
@@ -30,4 +30,6 @@ IO.println(isLetter);
3030
This can be useful if you are stranded on Mars[^onmars] or
3131
if you want to see if a character is in some range.
3232

33-
[^onmars]: https://www.youtube.com/watch?v=0xkP_FQUsuM
33+
[^ascii]: You can find some of these values in an "[ASCII Table](https://www.ascii-code.com/)."
34+
35+
[^onmars]: [https://www.youtube.com/watch?v=0xkP_FQUsuM](https://www.youtube.com/watch?v=0xkP_FQUsuM)

src/class_extension/challenges.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ class Main {
3939
## Challenge 2.
4040

4141
Rewrite your `Tree` class from above to instead extend `AbstractList<Apple>`.
42-
You can find the documentation for `AbstractList` [here](https://docs.oracle.com/javase/8/docs/api/java/util/AbstractList.html).
42+
You can find the documentation for `AbstractList` [here](https://docs.oracle.com/javase/25/docs/api/java/util/AbstractList.html).
4343

4444
## Challenge 3.
4545

src/conclusion/what_now.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ to in order to render websites.
117117
There are a lot of tools for this in Java. A lot a lot. I would recommend
118118
starting with the one that comes built-in: the `jdk.httpserver` module.
119119

120-
[Docs for `jdk.httpserver` here](https://docs.oracle.com/en/java/javase/24/docs/api/jdk.httpserver/module-summary.html)
120+
[Docs for `jdk.httpserver` here](https://docs.oracle.com/en/java/javase/25/docs/api/jdk.httpserver/module-summary.html)
121121

122122
Then you will need to learn about SQL databases and how to query from/insert into them from Java.
123123

@@ -147,7 +147,7 @@ two paths.
147147
Path #1 is to learn Java Swing. This is an old crusty GUI framework that is kinda difficult to use
148148
but has the pro of coming with Java and being able to run on every potato in existence.
149149

150-
[Docs for `java.desktop` (Swing) here](https://docs.oracle.com/en/java/javase/24/docs/api/java.desktop/module-summary.html)
150+
[Docs for `java.desktop` (Swing) here](https://docs.oracle.com/en/java/javase/25/docs/api/java.desktop/module-summary.html)
151151

152152
Path #2 is the learn JavaFX. By all accounts JavaFX is better software than Swing, but it was cursed
153153
by coming out at a point in history where desktop apps were no longer big business to develop. It

src/documentation/challenges.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,6 @@ Fix these by documenting that code enough that `javadoc` no longer gives you war
1919

2020
## Challenge 3.
2121

22-
Read the [documentation for java.util.StringJoiner](https://docs.oracle.com/en/java/javase/24/docs/api/java.base/java/util/StringJoiner.html).
22+
Read the [documentation for java.util.StringJoiner](https://docs.oracle.com/en/java/javase/25/docs/api/java.base/java/util/StringJoiner.html).
2323

2424
If you can, alter one of your projects to use it.

src/documentation/javadoc.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,6 @@ javadoc \
1717
This will produce a directory full of HTML files that contain all
1818
the documentation from the specified modules.
1919

20-
This is what is used to make [the official Java documenation](https://docs.oracle.com/en/java/javase/24/docs/api/index.html) as well as at least part of the documentation for most Java libraries.
20+
This is what is used to make [the official Java documenation](https://docs.oracle.com/en/java/javase/25/docs/api/index.html) as well as at least part of the documentation for most Java libraries.
2121

2222
[^theme]: As is a theme with command-line tools

src/floating_point_numbers/conversion_to_integers.md

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,21 @@ IO.println(z);
4848
~}
4949
```
5050

51+
Negative numbers will also have their decimal part dropped. So numbers like `-7.2`, `-7.6`, and `-7.9` will
52+
all be converted into `-7`.
53+
54+
```java
55+
~void main() {
56+
int x = (int) -7.2;
57+
int y = (int) -7.6;
58+
int z = (int) -7.9;
59+
60+
IO.println(x);
61+
IO.println(y);
62+
IO.println(z);
63+
~}
64+
```
65+
5166
Any number that is too big to store in an `int` will be converted to the biggest possible `int`, 2<sup>31</sup> - 1.
5267

5368
```java

0 commit comments

Comments
 (0)