From 20cb6769427295d9aed1e6bfe3004de9cda16fde Mon Sep 17 00:00:00 2001 From: "github-classroom[bot]" <66690702+github-classroom[bot]@users.noreply.github.com> Date: Thu, 29 Jun 2023 19:10:54 +0000 Subject: [PATCH 1/2] Setting up GitHub Classroom Feedback From 96ab5f0881513d3c186f3d41d32c28dec028d836 Mon Sep 17 00:00:00 2001 From: Jigalee Puff Date: Tue, 22 Aug 2023 19:27:09 +0100 Subject: [PATCH 2/2] summary updated to java.nio --- .../src/main/java/com/cbfacademy/App.java | 16 +++++- .../main/java/com/cbfacademy/FileReader.java | 5 ++ exercises/java-exceptions/README.md | 2 +- .../src/main/java/com/cbfacademy/App.java | 27 +++++++++- .../java/com/cbfacademy/FileExtension.java | 27 ++++++++++ .../java/com/cbfacademy/accounts/.gitkeep | 19 +++++++ .../java/com/cbfacademy/accounts/Account.java | 53 +++++++++++++++++++ .../cbfacademy/accounts/SavingsAccount.java | 20 +++++++ 8 files changed, 165 insertions(+), 4 deletions(-) create mode 100644 exercises/input-output/src/main/java/com/cbfacademy/FileReader.java create mode 100644 exercises/java-exceptions/src/main/java/com/cbfacademy/FileExtension.java create mode 100644 exercises/object-oriented-programming/src/main/java/com/cbfacademy/accounts/Account.java create mode 100644 exercises/object-oriented-programming/src/main/java/com/cbfacademy/accounts/SavingsAccount.java diff --git a/exercises/input-output/src/main/java/com/cbfacademy/App.java b/exercises/input-output/src/main/java/com/cbfacademy/App.java index f963d87..5b37805 100644 --- a/exercises/input-output/src/main/java/com/cbfacademy/App.java +++ b/exercises/input-output/src/main/java/com/cbfacademy/App.java @@ -1,7 +1,21 @@ package com.cbfacademy; +import java.io.BufferedReader; +import java.io.FileReader; +import java.io.InputStreamReader; +import java.io.LineNumberReader; +import java.io.Reader; +import java.nio.file.Paths; + public class App { public static void main(String[] args) { - System.out.println("Hello World!"); + String filePath = "c:/users/44774/cbfacademy/java-exercises-JigaleePuff/exercises/input-output/src/main/java/com/cbfacademy"; + try { + BufferedReader reader = new BufferedReader(new FileReader("exercise.txt")); + reader.read(""); + } catch (Exception e) { + // TODO: #2 handle exception + } } } + diff --git a/exercises/input-output/src/main/java/com/cbfacademy/FileReader.java b/exercises/input-output/src/main/java/com/cbfacademy/FileReader.java new file mode 100644 index 0000000..8d020f9 --- /dev/null +++ b/exercises/input-output/src/main/java/com/cbfacademy/FileReader.java @@ -0,0 +1,5 @@ +package com.cbfacademy; + +public class FileReader { + +} diff --git a/exercises/java-exceptions/README.md b/exercises/java-exceptions/README.md index dfb81eb..4ce65e8 100644 --- a/exercises/java-exceptions/README.md +++ b/exercises/java-exceptions/README.md @@ -120,7 +120,7 @@ For the following list of file names: `List.of("App.java", "App.txt", null, "App a map with the following entries ```txt -{"App.java", 1}, +{"App.java", 1}, {"App.txt", 0}, {null, -1}, {"App.md", 0} diff --git a/exercises/java-exceptions/src/main/java/com/cbfacademy/App.java b/exercises/java-exceptions/src/main/java/com/cbfacademy/App.java index 64f8ce6..681e36c 100644 --- a/exercises/java-exceptions/src/main/java/com/cbfacademy/App.java +++ b/exercises/java-exceptions/src/main/java/com/cbfacademy/App.java @@ -1,5 +1,9 @@ package com.cbfacademy; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + /** * Hello world! * @@ -7,7 +11,26 @@ public class App { public static void main( String[] args ) - { - System.out.println( "Hello World!" ); +{ List fileNamesList = List.of("App.java", "App.txt", null, "App.md"); +FileExtension fileExtension = new FileExtension(); + +Map FileExtensionMap = new HashMap <>(); + +Map resultMap; +for (String fileName : fileNames) { + try { + int result = fileExtension.check(fileName); + resultMap.put(fileName, result); + } catch (CustomException e) { + resultMap.put(fileName, -1); } } + +for (Map.Entry entry : resultMap.entrySet()) { + System.out.println(entry.getKey() + " -> " + entry.getValue()); +} +} +} + + + diff --git a/exercises/java-exceptions/src/main/java/com/cbfacademy/FileExtension.java b/exercises/java-exceptions/src/main/java/com/cbfacademy/FileExtension.java new file mode 100644 index 0000000..55c17ee --- /dev/null +++ b/exercises/java-exceptions/src/main/java/com/cbfacademy/FileExtension.java @@ -0,0 +1,27 @@ +import java.io.File; +import java.io.IOException; +import java.nio.file.Files; + +public class FileExtension ( + public int check(String fileName) + {if + (fileName == null || fileName.isEmpty() ) + {throw new InvalidFileNameException ("File name cannot be empty"); + } + String extension = getExtension(fileName); + if ( + fileName.endsWith(".java") + + ) + + {return 1;} + else {return 0;} + + + } + + @Override + public String toString() { + return "FileExtension []"; + } +) \ No newline at end of file diff --git a/exercises/object-oriented-programming/src/main/java/com/cbfacademy/accounts/.gitkeep b/exercises/object-oriented-programming/src/main/java/com/cbfacademy/accounts/.gitkeep index e69de29..77a457c 100644 --- a/exercises/object-oriented-programming/src/main/java/com/cbfacademy/accounts/.gitkeep +++ b/exercises/object-oriented-programming/src/main/java/com/cbfacademy/accounts/.gitkeep @@ -0,0 +1,19 @@ +public class Accounts extends { + + @override +public class SavingsAccount(Accounts) { + private float interest; + +public class CurrentAccount(Accounts) { + private int overdraftLimit; +} + + +} + + + + + + +} \ No newline at end of file diff --git a/exercises/object-oriented-programming/src/main/java/com/cbfacademy/accounts/Account.java b/exercises/object-oriented-programming/src/main/java/com/cbfacademy/accounts/Account.java new file mode 100644 index 0000000..3076b56 --- /dev/null +++ b/exercises/object-oriented-programming/src/main/java/com/cbfacademy/accounts/Account.java @@ -0,0 +1,53 @@ +package com.cbfacademy.accounts; + + +public class Account { + private int accountNumber; + private double balance; + + + + public Account(int accountNumber, double balance) { + this.accountNumber = accountNumber; + this.balance = balance; + + } + + public double withdraw (double amount ) { + double withdrawal = Math.abs(amount); + if (this.balance >= withdrawal ){ + System.out.println ("Withdrawn;"); + this.balance -= withdrawal; + return withdrawal; + } + else { + System.out.println ("Go make more money!"); + return 0; + } + + } public void deposit(double amount) { + if (amount > 0) { + balance += amount; + } else { + System.out.println("Cannot deposit a negative amount."); + } +} + +public double getBalance() { +return balance; +} + +public int getAccountNumber() { +return accountNumber; +} + +/** + * + */ +public void print() { +System.out.println("Account Number: " + accountNumber); +System.out.println("Balance: " + balance); + +} + + diff --git a/exercises/object-oriented-programming/src/main/java/com/cbfacademy/accounts/SavingsAccount.java b/exercises/object-oriented-programming/src/main/java/com/cbfacademy/accounts/SavingsAccount.java new file mode 100644 index 0000000..6f524be --- /dev/null +++ b/exercises/object-oriented-programming/src/main/java/com/cbfacademy/accounts/SavingsAccount.java @@ -0,0 +1,20 @@ +package com.cbfacademy.accounts; + +public class SavingsAccount { + private int accountNumber; + private double balance; +} + +public class SavingsAccount extends Account { + public SavingsAccount(int accountNumber, double balance) { + super(accountNumber, balance); + this.interest = 0.25; + this.balance = balance + interest; + } + @Override + public string getSavingsAccount() { + return "SavingsAccount" + super.getDetails(); + } + + +} \ No newline at end of file