From c86c708e9f5192e205c98561ebbfe44aed853620 Mon Sep 17 00:00:00 2001 From: Michael Fudge Date: Thu, 29 Oct 2015 15:43:02 -0400 Subject: [PATCH] Fixed cosmetic issues with lessons 11 and 12 --- .../src/fudgebanking/ATM.java | 24 ++----------------- .../src/fudgebanking/ATM.java | 23 +++++++++++++++++- .../ChallengeActivity1-MinAndMax/build.xml | 0 .../manifest.mf | 0 .../nbproject/build-impl.xml | 0 .../nbproject/genfiles.properties | 0 .../nbproject/project.properties | 0 .../nbproject/project.xml | 0 .../src/minandmax/MinAndMax.java | 0 .../build.xml | 0 .../manifest.mf | 0 .../nbproject/build-impl.xml | 0 .../nbproject/genfiles.properties | 0 .../nbproject/project.properties | 0 .../nbproject/project.xml | 0 .../src/minandmax/MinAndMax.java | 0 16 files changed, 24 insertions(+), 23 deletions(-) rename Lesson-12/{SOLUTIONS => Activities}/ChallengeActivity1-MinAndMax/build.xml (100%) rename Lesson-12/Activities/{Solution-ChallengeActivity1-MinAndMax => ChallengeActivity1-MinAndMax}/manifest.mf (100%) rename Lesson-12/{SOLUTIONS => Activities}/ChallengeActivity1-MinAndMax/nbproject/build-impl.xml (100%) rename Lesson-12/{SOLUTIONS => Activities}/ChallengeActivity1-MinAndMax/nbproject/genfiles.properties (100%) rename Lesson-12/{SOLUTIONS => Activities}/ChallengeActivity1-MinAndMax/nbproject/project.properties (100%) rename Lesson-12/{SOLUTIONS => Activities}/ChallengeActivity1-MinAndMax/nbproject/project.xml (100%) rename Lesson-12/{SOLUTIONS => Activities}/ChallengeActivity1-MinAndMax/src/minandmax/MinAndMax.java (100%) rename Lesson-12/{Activities => SOLUTIONS}/Solution-ChallengeActivity1-MinAndMax/build.xml (100%) rename Lesson-12/SOLUTIONS/{ChallengeActivity1-MinAndMax => Solution-ChallengeActivity1-MinAndMax}/manifest.mf (100%) rename Lesson-12/{Activities => SOLUTIONS}/Solution-ChallengeActivity1-MinAndMax/nbproject/build-impl.xml (100%) rename Lesson-12/{Activities => SOLUTIONS}/Solution-ChallengeActivity1-MinAndMax/nbproject/genfiles.properties (100%) rename Lesson-12/{Activities => SOLUTIONS}/Solution-ChallengeActivity1-MinAndMax/nbproject/project.properties (100%) rename Lesson-12/{Activities => SOLUTIONS}/Solution-ChallengeActivity1-MinAndMax/nbproject/project.xml (100%) rename Lesson-12/{Activities => SOLUTIONS}/Solution-ChallengeActivity1-MinAndMax/src/minandmax/MinAndMax.java (100%) diff --git a/Lesson-11/Activities/ChallengeActivity1-ATMPin/src/fudgebanking/ATM.java b/Lesson-11/Activities/ChallengeActivity1-ATMPin/src/fudgebanking/ATM.java index 546fa80..9abad90 100644 --- a/Lesson-11/Activities/ChallengeActivity1-ATMPin/src/fudgebanking/ATM.java +++ b/Lesson-11/Activities/ChallengeActivity1-ATMPin/src/fudgebanking/ATM.java @@ -57,32 +57,12 @@ SAMPLE RUN (three invalid attempts) public class ATM { public static void main(String[] args) { - //TODO: Write your code here. System.out.printf("*********************************\n"); System.out.printf("*** Welcome to FudgeBank ATM! ***\n"); System.out.printf("*********************************\n\n"); Scanner input = new Scanner(System.in); - BankAccount myacct = new BankAccount("1234", 500); - int attempts = 0; - boolean success= false; - while(true) { - System.out.print("Enter PIN # ==> "); - String pin = input.nextLine(); - attempts++; - if (pin.equals(myacct.Pin())) { - success = true; - break; - } - if (attempts >= 3) { - success = false; - break; - } - } - if (success) { - menu(); - } else { - System.out.println("You entered an invalid pin 3 times!"); - } + //TODO: Write your code here. + } public static void menu() { diff --git a/Lesson-11/SOLUTIONS/Solution-ChallengeActivity1-ATMPin/src/fudgebanking/ATM.java b/Lesson-11/SOLUTIONS/Solution-ChallengeActivity1-ATMPin/src/fudgebanking/ATM.java index 96ecc58..a215a79 100644 --- a/Lesson-11/SOLUTIONS/Solution-ChallengeActivity1-ATMPin/src/fudgebanking/ATM.java +++ b/Lesson-11/SOLUTIONS/Solution-ChallengeActivity1-ATMPin/src/fudgebanking/ATM.java @@ -62,7 +62,28 @@ public static void main(String[] args) { System.out.printf("*********************************\n\n"); Scanner input = new Scanner(System.in); //TODO: Write your code here. - + BankAccount myacct = new BankAccount("1234", 500); + int attempts = 0; + boolean success= false; + while(true) { + System.out.print("Enter PIN # ==> "); + String pin = input.nextLine(); + attempts++; + if (pin.equals(myacct.Pin())) { + success = true; + break; + } + if (attempts >= 3) { + success = false; + break; + } + } + if (success) { + menu(); + } else { + System.out.println("You entered an invalid pin 3 times!"); + } + } /** main menu of ATM */ diff --git a/Lesson-12/SOLUTIONS/ChallengeActivity1-MinAndMax/build.xml b/Lesson-12/Activities/ChallengeActivity1-MinAndMax/build.xml similarity index 100% rename from Lesson-12/SOLUTIONS/ChallengeActivity1-MinAndMax/build.xml rename to Lesson-12/Activities/ChallengeActivity1-MinAndMax/build.xml diff --git a/Lesson-12/Activities/Solution-ChallengeActivity1-MinAndMax/manifest.mf b/Lesson-12/Activities/ChallengeActivity1-MinAndMax/manifest.mf similarity index 100% rename from Lesson-12/Activities/Solution-ChallengeActivity1-MinAndMax/manifest.mf rename to Lesson-12/Activities/ChallengeActivity1-MinAndMax/manifest.mf diff --git a/Lesson-12/SOLUTIONS/ChallengeActivity1-MinAndMax/nbproject/build-impl.xml b/Lesson-12/Activities/ChallengeActivity1-MinAndMax/nbproject/build-impl.xml similarity index 100% rename from Lesson-12/SOLUTIONS/ChallengeActivity1-MinAndMax/nbproject/build-impl.xml rename to Lesson-12/Activities/ChallengeActivity1-MinAndMax/nbproject/build-impl.xml diff --git a/Lesson-12/SOLUTIONS/ChallengeActivity1-MinAndMax/nbproject/genfiles.properties b/Lesson-12/Activities/ChallengeActivity1-MinAndMax/nbproject/genfiles.properties similarity index 100% rename from Lesson-12/SOLUTIONS/ChallengeActivity1-MinAndMax/nbproject/genfiles.properties rename to Lesson-12/Activities/ChallengeActivity1-MinAndMax/nbproject/genfiles.properties diff --git a/Lesson-12/SOLUTIONS/ChallengeActivity1-MinAndMax/nbproject/project.properties b/Lesson-12/Activities/ChallengeActivity1-MinAndMax/nbproject/project.properties similarity index 100% rename from Lesson-12/SOLUTIONS/ChallengeActivity1-MinAndMax/nbproject/project.properties rename to Lesson-12/Activities/ChallengeActivity1-MinAndMax/nbproject/project.properties diff --git a/Lesson-12/SOLUTIONS/ChallengeActivity1-MinAndMax/nbproject/project.xml b/Lesson-12/Activities/ChallengeActivity1-MinAndMax/nbproject/project.xml similarity index 100% rename from Lesson-12/SOLUTIONS/ChallengeActivity1-MinAndMax/nbproject/project.xml rename to Lesson-12/Activities/ChallengeActivity1-MinAndMax/nbproject/project.xml diff --git a/Lesson-12/SOLUTIONS/ChallengeActivity1-MinAndMax/src/minandmax/MinAndMax.java b/Lesson-12/Activities/ChallengeActivity1-MinAndMax/src/minandmax/MinAndMax.java similarity index 100% rename from Lesson-12/SOLUTIONS/ChallengeActivity1-MinAndMax/src/minandmax/MinAndMax.java rename to Lesson-12/Activities/ChallengeActivity1-MinAndMax/src/minandmax/MinAndMax.java diff --git a/Lesson-12/Activities/Solution-ChallengeActivity1-MinAndMax/build.xml b/Lesson-12/SOLUTIONS/Solution-ChallengeActivity1-MinAndMax/build.xml similarity index 100% rename from Lesson-12/Activities/Solution-ChallengeActivity1-MinAndMax/build.xml rename to Lesson-12/SOLUTIONS/Solution-ChallengeActivity1-MinAndMax/build.xml diff --git a/Lesson-12/SOLUTIONS/ChallengeActivity1-MinAndMax/manifest.mf b/Lesson-12/SOLUTIONS/Solution-ChallengeActivity1-MinAndMax/manifest.mf similarity index 100% rename from Lesson-12/SOLUTIONS/ChallengeActivity1-MinAndMax/manifest.mf rename to Lesson-12/SOLUTIONS/Solution-ChallengeActivity1-MinAndMax/manifest.mf diff --git a/Lesson-12/Activities/Solution-ChallengeActivity1-MinAndMax/nbproject/build-impl.xml b/Lesson-12/SOLUTIONS/Solution-ChallengeActivity1-MinAndMax/nbproject/build-impl.xml similarity index 100% rename from Lesson-12/Activities/Solution-ChallengeActivity1-MinAndMax/nbproject/build-impl.xml rename to Lesson-12/SOLUTIONS/Solution-ChallengeActivity1-MinAndMax/nbproject/build-impl.xml diff --git a/Lesson-12/Activities/Solution-ChallengeActivity1-MinAndMax/nbproject/genfiles.properties b/Lesson-12/SOLUTIONS/Solution-ChallengeActivity1-MinAndMax/nbproject/genfiles.properties similarity index 100% rename from Lesson-12/Activities/Solution-ChallengeActivity1-MinAndMax/nbproject/genfiles.properties rename to Lesson-12/SOLUTIONS/Solution-ChallengeActivity1-MinAndMax/nbproject/genfiles.properties diff --git a/Lesson-12/Activities/Solution-ChallengeActivity1-MinAndMax/nbproject/project.properties b/Lesson-12/SOLUTIONS/Solution-ChallengeActivity1-MinAndMax/nbproject/project.properties similarity index 100% rename from Lesson-12/Activities/Solution-ChallengeActivity1-MinAndMax/nbproject/project.properties rename to Lesson-12/SOLUTIONS/Solution-ChallengeActivity1-MinAndMax/nbproject/project.properties diff --git a/Lesson-12/Activities/Solution-ChallengeActivity1-MinAndMax/nbproject/project.xml b/Lesson-12/SOLUTIONS/Solution-ChallengeActivity1-MinAndMax/nbproject/project.xml similarity index 100% rename from Lesson-12/Activities/Solution-ChallengeActivity1-MinAndMax/nbproject/project.xml rename to Lesson-12/SOLUTIONS/Solution-ChallengeActivity1-MinAndMax/nbproject/project.xml diff --git a/Lesson-12/Activities/Solution-ChallengeActivity1-MinAndMax/src/minandmax/MinAndMax.java b/Lesson-12/SOLUTIONS/Solution-ChallengeActivity1-MinAndMax/src/minandmax/MinAndMax.java similarity index 100% rename from Lesson-12/Activities/Solution-ChallengeActivity1-MinAndMax/src/minandmax/MinAndMax.java rename to Lesson-12/SOLUTIONS/Solution-ChallengeActivity1-MinAndMax/src/minandmax/MinAndMax.java