diff --git a/README.md b/README.md index 2bf6e44..aa98b90 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,6 @@ # Modern Java [![codefactor](https://img.shields.io/codefactor/grade/github/together-java/modernjava)](https://www.codefactor.io/repository/github/together-java/modernjava) -![Java](https://img.shields.io/badge/Java-19-ff696c) [![license](https://img.shields.io/github/license/Together-Java/ModernJava)](https://github.com/Together-Java/ModernJava/blob/master/LICENSE) Book teaching how to write modern and effective Java. It is maintained by the community, anyone can contribute. diff --git a/book.toml b/book.toml index 0666248..7c59f82 100644 --- a/book.toml +++ b/book.toml @@ -1,7 +1,7 @@ [book] title = "Modern Java" -description = " Book teaching how to write modern and effective Java. It is maintained by the community, anyone can contribute." -authors = ["Together Java", "Contributions from the Java Community"] +description = "Book teaching how to write modern and effective Java." +authors = ["Ethan McCue", "Together Java", "Contributions from the Java Community"] language = "en" multilingual = false @@ -21,5 +21,3 @@ editable = true [output.html.code.hidelines] java = "~" -[output.html.code.hidelines] -java = "~" diff --git a/ferris.js b/ferris.js index f78ce4a..5a7f1f6 100644 --- a/ferris.js +++ b/ferris.js @@ -53,8 +53,12 @@ function createFerris(type, size) { // a.setAttribute('href', 'ch00-00-introduction.html#ferris') a.setAttribute('target', '_blank') + var toFileName = function (t) { + return '../img/' + t.attr + '.svg'; + } + var img = document.createElement('img') - img.setAttribute('src', '../img/' + type.attr + '.svg') + img.setAttribute('src', toFileName(type)) img.setAttribute('title', type.title) img.classList.add('ferris') img.classList.add('ferris-' + size) diff --git a/src/SUMMARY.md b/src/SUMMARY.md index 725b3cd..173903d 100644 --- a/src/SUMMARY.md +++ b/src/SUMMARY.md @@ -99,11 +99,9 @@ - [If](./branching_logic/if.md) - [Nested Ifs](./branching_logic/nested_ifs.md) - [Else](./branching_logic/else.md) - - [Else](./branching_logic/else.md) - [Else If](./branching_logic/else_if.md) - [Relation to Delayed Assignment](./branching_logic/relation_to_delayed_assignment.md) - [Scoped Variables](./branching_logic/scoped_variables.md) - - [Scoped Variables](./branching_logic/scoped_variables.md) - [Conditional Operator](./branching_logic/conditional_operator.md) - [Boolean Expressions](./branching_logic/boolean_expressions.md) - [Challenges](./branching_logic/challenges.md) @@ -209,7 +207,6 @@ - [Boxing Conversion](./boxed_primitives/boxing_conversion.md) - [Arrays of Boxed Primitives](./boxed_primitives/arrays_of_boxed_primitives.md) - [Challenges](./boxed_primitives/challenges.md) - - [Challenges](./boxed_primitives/challenges.md) - [Arrays II](./arrays_ii.md) - [Initializion with Size](./arrays_ii/initialization_with_size.md) - [Default Values](./arrays_ii/default_values.md) @@ -249,6 +246,13 @@ - [Usage](./enums/usage.md) - [Equality](./enums/equality.md) - [Comparison to boolean](./enums/comparison_to_boolean.md) +- [Strings II](./strings_ii.md) + - [lowercase](./strings_ii/lowercase.md) + - [UPPERCASE](./strings_ii/UPPERCASE.md) + - [Equality ignoring case](./strings_ii/equality_ignoring_case.md) + - [Check if empty](./strings_ii/check_if_empty.md) + - [Check if blank](./strings_ii/check_if_blank.md) + - [Strip extra whitespace](./strings_ii/strip_extra_whitespace.md) # Control Flow III @@ -277,28 +281,302 @@ - [Invariants](./constructors/invariants.md) - [Overloads](./constructors/overloads.md) - [Delegation](./constructors/delegation.md) +- [Global Fields](./global_fields.md) + - [Default Values](./global_fields/default_values.md) + - [Final Fields](./global_fields/final_fields.md) + - [Field Access](./global_fields/field_access.md) + - [Inferred Types](./global_fields/inferred_types.md) + +# Concepts + +- [Code is Read more than Written](./code_is_read_more_than_written.md) + - [Meaning](./code_is_read_more_than_written/meaning.md) + - [Implications](./code_is_read_more_than_written/implications.md) + - [Information Density](./code_is_read_more_than_written/information_density.md) + - [Audience](./code_is_read_more_than_written/audience.md) + - [Practice](./code_is_read_more_than_written/practice.md) + +# Interactive Programs + +- [Standard Input](./standard_input.md) + - [Prompting](./standard_input/prompting.md) + - [Interpreting Input](./standard_input/interpreting_input.md) + - [Reprompting](./standard_input/reprompting.md) + - [Leniency](./standard_input/leniency.md) + - [Delayed Assignment](./standard_input/delayed_assignment.md) + - [Transporting Data](./standard_input/transporting_data.md) + +# The Computing Environment + +- [Hardware](./hardware.md) + - [CPU](./hardware/cpu.md) + - [RAM](./hardware/ram.md) + - [Hard Drives](./hardware/hard_drives.md) + - [Motherboard](./hardware/motherboard.md) +- [Operating Systems](./operating_systems.md) + - [Personal Computers](./operating_systems/personal_computers.md) + - [Servers](./operating_systems/servers.md) + - [Mobile Phones](./operating_systems/mobile_phones.md) + - [Game Consoles](./operating_systems/game_consoles.md) + - [Abstractions](./operating_systems/abstractions.md) + - [Defaults](./operating_systems/defaults.md) +- [The Terminal](./the_terminal.md) + - [Bash](./the_terminal/bash.md) + - [Windows Subsystem for Linux](./the_terminal/windows_subsystem_for_linux.md) + - [Chromebooks and School Computers](./the_terminal/chromebooks_and_school_computers.md) + - [Commands](./the_terminal/commands.md) + - [Directories](./the_terminal/directories.md) + - [Listing Files](./the_terminal/listing_files.md) + - [Creating Directories](./the_terminal/creating_directories.md) + - [Changing Directories](./the_terminal/changing_directories.md) + - [Creating Files](./the_terminal/creating_files.md) + - [Run Java Programs](./the_terminal/run_java_programs.md) + - [Getting Used to it](./the_terminal/getting_used_to_it.md) +# Control Flow III - + + +