From 3a841560e24b793cc214c283aabb2dd64c68206f Mon Sep 17 00:00:00 2001 From: Nicholas Date: Wed, 12 Jan 2022 11:27:10 -0600 Subject: [PATCH 1/6] fixed error --- src/Author.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/Author.java b/src/Author.java index 2057127..c25e218 100644 --- a/src/Author.java +++ b/src/Author.java @@ -4,6 +4,7 @@ import java.util.ArrayList; import java.util.List; + public class Author extends Person { private List books; @@ -28,8 +29,8 @@ public void addBook(String book) { books.add(book); } - @Override - public String sortName() { + //@Override + public String sortName(String firstName, String lastName) { return String.format("%s, %s", lastName, firstName); } } From c6c6045cf8960c8cb95a951c786e7b70edb8e315 Mon Sep 17 00:00:00 2001 From: Nicholas Date: Wed, 12 Jan 2022 11:35:05 -0600 Subject: [PATCH 2/6] fixed errors and one of my errors --- src/Author.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Author.java b/src/Author.java index c25e218..b8c0e9e 100644 --- a/src/Author.java +++ b/src/Author.java @@ -29,7 +29,7 @@ public void addBook(String book) { books.add(book); } - //@Override + @Override public String sortName(String firstName, String lastName) { return String.format("%s, %s", lastName, firstName); } From 1b7d4b6237ccfc6466da47d7942e8d49dd29d36d Mon Sep 17 00:00:00 2001 From: Nicholas Date: Wed, 12 Jan 2022 11:40:08 -0600 Subject: [PATCH 3/6] finished easy_fix --- src/Author.java | 4 ++-- src/Main.java | 1 + src/Person.java | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/Author.java b/src/Author.java index b8c0e9e..e9ecaab 100644 --- a/src/Author.java +++ b/src/Author.java @@ -4,7 +4,7 @@ import java.util.ArrayList; import java.util.List; - +@SuppressWarnings({"unchecked", "deprecation"}) public class Author extends Person { private List books; @@ -29,7 +29,7 @@ public void addBook(String book) { books.add(book); } - @Override + //@Override public String sortName(String firstName, String lastName) { return String.format("%s, %s", lastName, firstName); } diff --git a/src/Main.java b/src/Main.java index 08139ff..29594d4 100644 --- a/src/Main.java +++ b/src/Main.java @@ -1,3 +1,4 @@ +@SuppressWarnings("unchecked") public class Main { public static void main(String[] args) { Author author = new Author("Sandi", "Metz"); diff --git a/src/Person.java b/src/Person.java index e09b8b3..db0d626 100644 --- a/src/Person.java +++ b/src/Person.java @@ -1,6 +1,7 @@ /** * This source file is subject to the license that is bundled with this package in the file LICENSE. */ +@SuppressWarnings("unchecked") public class Person { protected String firstName; protected String lastName; From 3ab8fd6055f84cdf2d2463ee632d695400b54231 Mon Sep 17 00:00:00 2001 From: Nicholas Date: Wed, 12 Jan 2022 11:42:17 -0600 Subject: [PATCH 4/6] better_fix --- src/Author.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Author.java b/src/Author.java index e9ecaab..01bfb9f 100644 --- a/src/Author.java +++ b/src/Author.java @@ -28,7 +28,7 @@ public List publishedBooks() { public void addBook(String book) { books.add(book); } - + //I had to fix this in easy_fix?? //@Override public String sortName(String firstName, String lastName) { return String.format("%s, %s", lastName, firstName); From f50fcee80f1eea27b0fde0402b939e86692c262d Mon Sep 17 00:00:00 2001 From: Nicholas Date: Wed, 12 Jan 2022 11:46:23 -0600 Subject: [PATCH 5/6] finished better_fix --- src/Author.java | 2 +- src/Main.java | 4 ++-- src/Person.java | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Author.java b/src/Author.java index 01bfb9f..d1781cd 100644 --- a/src/Author.java +++ b/src/Author.java @@ -4,7 +4,7 @@ import java.util.ArrayList; import java.util.List; -@SuppressWarnings({"unchecked", "deprecation"}) +//@SuppressWarnings({"unchecked", "deprecation"}) public class Author extends Person { private List books; diff --git a/src/Main.java b/src/Main.java index 29594d4..061c844 100644 --- a/src/Main.java +++ b/src/Main.java @@ -1,4 +1,4 @@ -@SuppressWarnings("unchecked") +//@SuppressWarnings("unchecked") public class Main { public static void main(String[] args) { Author author = new Author("Sandi", "Metz"); @@ -6,7 +6,7 @@ public static void main(String[] args) { author.addBook("Practical Object-Oriented Design in Ruby"); author.addBook("99 Bottles of OOP"); - for (String book: author.getBooks()) { + for (String book: author.publishedBooks()) { System.out.println(book); } } diff --git a/src/Person.java b/src/Person.java index db0d626..1c488ad 100644 --- a/src/Person.java +++ b/src/Person.java @@ -1,7 +1,7 @@ /** * This source file is subject to the license that is bundled with this package in the file LICENSE. */ -@SuppressWarnings("unchecked") +//@SuppressWarnings("unchecked") public class Person { protected String firstName; protected String lastName; From f9417a3a7271450913a5e4720608509d37eb61fc Mon Sep 17 00:00:00 2001 From: Nicholas Date: Thu, 13 Jan 2022 10:05:56 -0600 Subject: [PATCH 6/6] fixed it --- src/Author.java | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/Author.java b/src/Author.java index d1781cd..4138f0e 100644 --- a/src/Author.java +++ b/src/Author.java @@ -6,13 +6,15 @@ //@SuppressWarnings({"unchecked", "deprecation"}) public class Author extends Person { - private List books; + private final List books; - public Author(String firstName, String lastName) { + public Author(String firstName, String lastName){ super(firstName, lastName); - books = new ArrayList(); + books = new ArrayList<>(); + } + /** * @deprecated Use publishedBooks instead */ @@ -26,11 +28,11 @@ public List publishedBooks() { } public void addBook(String book) { - books.add(book); + books.add(book); } //I had to fix this in easy_fix?? - //@Override - public String sortName(String firstName, String lastName) { + + public String sortName() { return String.format("%s, %s", lastName, firstName); } }