From 4b97dbbeb7f0c90e3611171ac7f6ac956b76f3ae Mon Sep 17 00:00:00 2001 From: Achyut Dahal Date: Mon, 16 May 2016 10:46:10 +0545 Subject: [PATCH 1/5] #2 #3 #5 Assignments for php java --- .../com/programs/MultiplierProgram.java | 54 +++++++++++++++++++ .../com/programs/PalindromeProgram.java | 52 ++++++++++++++++++ .../com/programs/SalutationProgram.java | 49 +++++++++++++++++ .../com/lftechnology/one/DefaultTest.java | 15 ------ .../main/java/com/lftechnology/one/Main.java | 10 ---- .../com/lftechnology/runner/Executer.java | 25 +++++++++ .../java/com/lftechnology/runner/Menu.java | 22 ++++++++ .../com/lftechnology/runner/TaskSwitcher.java | 42 +++++++++++++++ .../com/lftechnology/two/PackageTwoMain.java | 12 ----- 9 files changed, 244 insertions(+), 37 deletions(-) create mode 100644 achyut/src/main/java/com/lftechnology/com/programs/MultiplierProgram.java create mode 100644 achyut/src/main/java/com/lftechnology/com/programs/PalindromeProgram.java create mode 100644 achyut/src/main/java/com/lftechnology/com/programs/SalutationProgram.java delete mode 100644 achyut/src/main/java/com/lftechnology/one/DefaultTest.java delete mode 100644 achyut/src/main/java/com/lftechnology/one/Main.java create mode 100644 achyut/src/main/java/com/lftechnology/runner/Executer.java create mode 100644 achyut/src/main/java/com/lftechnology/runner/Menu.java create mode 100644 achyut/src/main/java/com/lftechnology/runner/TaskSwitcher.java delete mode 100644 achyut/src/main/java/com/lftechnology/two/PackageTwoMain.java diff --git a/achyut/src/main/java/com/lftechnology/com/programs/MultiplierProgram.java b/achyut/src/main/java/com/lftechnology/com/programs/MultiplierProgram.java new file mode 100644 index 0000000..8084e14 --- /dev/null +++ b/achyut/src/main/java/com/lftechnology/com/programs/MultiplierProgram.java @@ -0,0 +1,54 @@ +package com.lftechnology.com.programs; + +import java.util.Scanner; + +public class MultiplierProgram { + + private int numberOfMultiple; + private int firstMultiplier; + private int secondMultiplier; + private Scanner scanner; + + public MultiplierProgram() { + + } + + public void run() { + this.initiateRun(); + System.out.println("Please Enter the Number of Multiplier"); + scanner = new Scanner(System.in); + this.numberOfMultiple = scanner.nextInt(); + System.out.println("Please Enter First Multiplier"); + this.firstMultiplier = scanner.nextInt(); + System.out.println("Please Enter Second Multiplier"); + this.secondMultiplier = scanner.nextInt(); + int sum = calculateMultiplier(); + System.out.println("Sum of multiple by " + this.firstMultiplier + " and " + this.secondMultiplier + " below " + + this.numberOfMultiple + "=" + sum); + System.out.println("Executing Multiplier"); + this.endRun(); + } + + public int calculateMultiplier() { + + int sum = 0; + for (int i = 0; i < this.numberOfMultiple; i++) { + if ((i % this.firstMultiplier) == 0 || (i % this.secondMultiplier) == 0) { + sum += i; + } + } + return sum; + } + + public void initiateRun() { + System.out.println("\n"); + System.out.println("Executing Multiplier"); + + } + + public void endRun() { + System.out.println("-----------------------------------------"); + System.out.println("-----------------------------------------\n\n"); + } + +} diff --git a/achyut/src/main/java/com/lftechnology/com/programs/PalindromeProgram.java b/achyut/src/main/java/com/lftechnology/com/programs/PalindromeProgram.java new file mode 100644 index 0000000..ebd0b4b --- /dev/null +++ b/achyut/src/main/java/com/lftechnology/com/programs/PalindromeProgram.java @@ -0,0 +1,52 @@ +package com.lftechnology.com.programs; + +import java.util.Scanner; + +public class PalindromeProgram { + + private String number; + private Scanner scanner; + + public PalindromeProgram() { + + } + + public void run() { + this.initiateRun(); + System.out.println("Please Enter the Number of Multiplier"); + scanner = new Scanner(System.in); + this.number = scanner.nextLine(); + Boolean isPalindrome = this.isPalindrome(); + if (isPalindrome == true) { + System.out.println("The number is a palindrome number"); + } else { + System.out.println("The number is not a palindrome number"); + } + this.endRun(); + } + + public Boolean isPalindrome() { + String reverse = ""; + int length = this.number.length(); + for (int i = length - 1; i >= 0; i--) + reverse = reverse + this.number.charAt(i); + + if (this.number.equals(reverse)) + return true; + else + return false; + + } + + public void initiateRun() { + System.out.println("\n"); + System.out.println("Executing Palindrome Program"); + + } + + public void endRun() { + System.out.println("-----------------------------------------"); + System.out.println("-----------------------------------------\n\n"); + } + +} diff --git a/achyut/src/main/java/com/lftechnology/com/programs/SalutationProgram.java b/achyut/src/main/java/com/lftechnology/com/programs/SalutationProgram.java new file mode 100644 index 0000000..b7db2ed --- /dev/null +++ b/achyut/src/main/java/com/lftechnology/com/programs/SalutationProgram.java @@ -0,0 +1,49 @@ +package com.lftechnology.com.programs; + +import java.util.Scanner; + +public class SalutationProgram { + + private Scanner fullNameWithSalutationInput; + private String fullNameWithSalutation; + private String salutation; + + public SalutationProgram() { + + } + + public void run() { + this.initiateRun(); + this.askForInput(); + if (this.fullNameWithSalutation.length() <= 0) { + System.out.println("Input can't be empty! Enter again"); + this.askForInput(); + } + this.splitInput(); + System.out.println("Salutation = " + this.salutation); + System.out.println("FullName = " + this.fullNameWithSalutation); + this.endRun(); + } + + public void initiateRun() { + System.out.println("\n"); + System.out.println("Executing Salutation"); + System.out.println("Please Enter Your Full Name with Salutation (e.g, Mr. John Doe\n\n"); + } + + public void endRun() { + System.out.println("-----------------------------------------"); + System.out.println("-----------------------------------------\n\n"); + } + + public void splitInput() { + String[] splited = this.fullNameWithSalutation.split("\\s+"); + this.salutation = splited[1]; + } + + public void askForInput() { + fullNameWithSalutationInput = new Scanner(System.in); + this.fullNameWithSalutation = fullNameWithSalutationInput.nextLine(); + } + +} diff --git a/achyut/src/main/java/com/lftechnology/one/DefaultTest.java b/achyut/src/main/java/com/lftechnology/one/DefaultTest.java deleted file mode 100644 index a52199c..0000000 --- a/achyut/src/main/java/com/lftechnology/one/DefaultTest.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.lftechnology.one; - -class DefaultTest { - - private String name; - - public DefaultTest(){ - this.name = "Achyut"; - } - - public String getName(){ - return this.name; - } - -} diff --git a/achyut/src/main/java/com/lftechnology/one/Main.java b/achyut/src/main/java/com/lftechnology/one/Main.java deleted file mode 100644 index 35bac88..0000000 --- a/achyut/src/main/java/com/lftechnology/one/Main.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.lftechnology.one; - -public class Main { - - public static void main(String []args){ - DefaultTest testobj = new DefaultTest(); - System.out.println("Name: " +testobj.getName()); - } - -} diff --git a/achyut/src/main/java/com/lftechnology/runner/Executer.java b/achyut/src/main/java/com/lftechnology/runner/Executer.java new file mode 100644 index 0000000..ab0de40 --- /dev/null +++ b/achyut/src/main/java/com/lftechnology/runner/Executer.java @@ -0,0 +1,25 @@ +package com.lftechnology.runner; + +import java.util.Scanner; + +public class Executer { + + private static Scanner userInput; + public static int chosenOption; + + public static void main(String[] args) { + Menu menu = new Menu(); + menu.showmenu(); + } + + public void askForInputAndRun() { + /** + * @todo Check if user input is empty in all the subsequent classes + */ + userInput = new Scanner(System.in); + Executer.chosenOption = userInput.nextInt(); + TaskSwitcher taskSwitcher = new TaskSwitcher(Executer.chosenOption); + taskSwitcher.switchAndRun(); + } + +} diff --git a/achyut/src/main/java/com/lftechnology/runner/Menu.java b/achyut/src/main/java/com/lftechnology/runner/Menu.java new file mode 100644 index 0000000..257a873 --- /dev/null +++ b/achyut/src/main/java/com/lftechnology/runner/Menu.java @@ -0,0 +1,22 @@ +package com.lftechnology.runner; + +public class Menu { + + public Menu() { + + } + + public void showmenu() { + System.out.println("Please hit the options below to play with us"); + System.out.println("Options Program"); + System.out.println("1 Salutation"); + System.out.println("2 Multiplier"); + System.out.println("3 Palindrome"); + System.out.println("0 Exit"); + System.out.println("......................"); + System.out.print("Press the option above to continue: "); + Executer executor = new Executer(); + executor.askForInputAndRun(); + } + +} diff --git a/achyut/src/main/java/com/lftechnology/runner/TaskSwitcher.java b/achyut/src/main/java/com/lftechnology/runner/TaskSwitcher.java new file mode 100644 index 0000000..a87e6ad --- /dev/null +++ b/achyut/src/main/java/com/lftechnology/runner/TaskSwitcher.java @@ -0,0 +1,42 @@ +package com.lftechnology.runner; + +import com.lftechnology.com.programs.MultiplierProgram; +import com.lftechnology.com.programs.PalindromeProgram; +import com.lftechnology.com.programs.SalutationProgram; + +public class TaskSwitcher { + + protected int chosenOption; + + public TaskSwitcher(int option) { + this.chosenOption = option; + + } + + public void switchAndRun() { + + switch (this.chosenOption) { + case 1: + SalutationProgram salutationProgram = new SalutationProgram(); + salutationProgram.run(); + break; + case 2: + MultiplierProgram multiplierProgram = new MultiplierProgram(); + multiplierProgram.run(); + break; + case 3: + PalindromeProgram palindromeProgram = new PalindromeProgram(); + palindromeProgram.run(); + break; + case 0: + System.out.println("You are exiting the program now..."); + System.out.println("Exited"); + System.exit(0); + default: + System.out.println("Invalid grade"); + } + System.out.println("Program Completed."); + Menu menu = new Menu(); + menu.showmenu(); + } +} diff --git a/achyut/src/main/java/com/lftechnology/two/PackageTwoMain.java b/achyut/src/main/java/com/lftechnology/two/PackageTwoMain.java deleted file mode 100644 index f76e5dd..0000000 --- a/achyut/src/main/java/com/lftechnology/two/PackageTwoMain.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.lftechnology.two; - - - -public class PackageTwoMain { - - public static void main(String []args){ - - System.out.println("Name: " ); - } - -} From d73d0a341c43a10a3a845551266d7f40cbde4090 Mon Sep 17 00:00:00 2001 From: Achyut Dahal Date: Mon, 16 May 2016 16:06:08 +0545 Subject: [PATCH 2/5] Updated the default block on switch statement to have the menu shown up with invalid input message --- .../main/java/com/lftechnology/runner/TaskSwitcher.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/achyut/src/main/java/com/lftechnology/runner/TaskSwitcher.java b/achyut/src/main/java/com/lftechnology/runner/TaskSwitcher.java index a87e6ad..fe5709f 100644 --- a/achyut/src/main/java/com/lftechnology/runner/TaskSwitcher.java +++ b/achyut/src/main/java/com/lftechnology/runner/TaskSwitcher.java @@ -14,7 +14,7 @@ public TaskSwitcher(int option) { } public void switchAndRun() { - + Menu menu = new Menu(); switch (this.chosenOption) { case 1: SalutationProgram salutationProgram = new SalutationProgram(); @@ -33,10 +33,12 @@ public void switchAndRun() { System.out.println("Exited"); System.exit(0); default: - System.out.println("Invalid grade"); + System.out.println("Invalid Input"); + System.out.println("\n"); + menu.showmenu(); } System.out.println("Program Completed."); - Menu menu = new Menu(); + menu.showmenu(); } } From bb9794ff27a8d3ec944b5595b7fcab7c97b7ad07 Mon Sep 17 00:00:00 2001 From: Achyut Dahal Date: Mon, 16 May 2016 16:16:56 +0545 Subject: [PATCH 3/5] Made changes on the system message to enter the full name with an example --- .../java/com/lftechnology/com/programs/SalutationProgram.java | 2 +- achyut/src/main/java/com/lftechnology/runner/TaskSwitcher.java | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/achyut/src/main/java/com/lftechnology/com/programs/SalutationProgram.java b/achyut/src/main/java/com/lftechnology/com/programs/SalutationProgram.java index b7db2ed..dbdf42d 100644 --- a/achyut/src/main/java/com/lftechnology/com/programs/SalutationProgram.java +++ b/achyut/src/main/java/com/lftechnology/com/programs/SalutationProgram.java @@ -28,7 +28,7 @@ public void run() { public void initiateRun() { System.out.println("\n"); System.out.println("Executing Salutation"); - System.out.println("Please Enter Your Full Name with Salutation (e.g, Mr. John Doe\n\n"); + System.out.println("Please Enter Your Full Name with Salutation (e.g, Mr. John Doe)\n\n"); } public void endRun() { diff --git a/achyut/src/main/java/com/lftechnology/runner/TaskSwitcher.java b/achyut/src/main/java/com/lftechnology/runner/TaskSwitcher.java index fe5709f..66f60a1 100644 --- a/achyut/src/main/java/com/lftechnology/runner/TaskSwitcher.java +++ b/achyut/src/main/java/com/lftechnology/runner/TaskSwitcher.java @@ -10,7 +10,6 @@ public class TaskSwitcher { public TaskSwitcher(int option) { this.chosenOption = option; - } public void switchAndRun() { @@ -38,7 +37,6 @@ public void switchAndRun() { menu.showmenu(); } System.out.println("Program Completed."); - menu.showmenu(); } } From 871f4e80aca4616db6e45d553ea4865b1288fb75 Mon Sep 17 00:00:00 2001 From: Achyut Dahal Date: Mon, 16 May 2016 16:20:50 +0545 Subject: [PATCH 4/5] Renamed the package which was not of standard --- .../lftechnology/{com => }/programs/MultiplierProgram.java | 2 +- .../lftechnology/{com => }/programs/PalindromeProgram.java | 2 +- .../lftechnology/{com => }/programs/SalutationProgram.java | 2 +- .../src/main/java/com/lftechnology/runner/TaskSwitcher.java | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) rename achyut/src/main/java/com/lftechnology/{com => }/programs/MultiplierProgram.java (97%) rename achyut/src/main/java/com/lftechnology/{com => }/programs/PalindromeProgram.java (97%) rename achyut/src/main/java/com/lftechnology/{com => }/programs/SalutationProgram.java (97%) diff --git a/achyut/src/main/java/com/lftechnology/com/programs/MultiplierProgram.java b/achyut/src/main/java/com/lftechnology/programs/MultiplierProgram.java similarity index 97% rename from achyut/src/main/java/com/lftechnology/com/programs/MultiplierProgram.java rename to achyut/src/main/java/com/lftechnology/programs/MultiplierProgram.java index 8084e14..f6a1c0b 100644 --- a/achyut/src/main/java/com/lftechnology/com/programs/MultiplierProgram.java +++ b/achyut/src/main/java/com/lftechnology/programs/MultiplierProgram.java @@ -1,4 +1,4 @@ -package com.lftechnology.com.programs; +package com.lftechnology.programs; import java.util.Scanner; diff --git a/achyut/src/main/java/com/lftechnology/com/programs/PalindromeProgram.java b/achyut/src/main/java/com/lftechnology/programs/PalindromeProgram.java similarity index 97% rename from achyut/src/main/java/com/lftechnology/com/programs/PalindromeProgram.java rename to achyut/src/main/java/com/lftechnology/programs/PalindromeProgram.java index ebd0b4b..6823878 100644 --- a/achyut/src/main/java/com/lftechnology/com/programs/PalindromeProgram.java +++ b/achyut/src/main/java/com/lftechnology/programs/PalindromeProgram.java @@ -1,4 +1,4 @@ -package com.lftechnology.com.programs; +package com.lftechnology.programs; import java.util.Scanner; diff --git a/achyut/src/main/java/com/lftechnology/com/programs/SalutationProgram.java b/achyut/src/main/java/com/lftechnology/programs/SalutationProgram.java similarity index 97% rename from achyut/src/main/java/com/lftechnology/com/programs/SalutationProgram.java rename to achyut/src/main/java/com/lftechnology/programs/SalutationProgram.java index dbdf42d..5dc35e1 100644 --- a/achyut/src/main/java/com/lftechnology/com/programs/SalutationProgram.java +++ b/achyut/src/main/java/com/lftechnology/programs/SalutationProgram.java @@ -1,4 +1,4 @@ -package com.lftechnology.com.programs; +package com.lftechnology.programs; import java.util.Scanner; diff --git a/achyut/src/main/java/com/lftechnology/runner/TaskSwitcher.java b/achyut/src/main/java/com/lftechnology/runner/TaskSwitcher.java index 66f60a1..cf72840 100644 --- a/achyut/src/main/java/com/lftechnology/runner/TaskSwitcher.java +++ b/achyut/src/main/java/com/lftechnology/runner/TaskSwitcher.java @@ -1,8 +1,8 @@ package com.lftechnology.runner; -import com.lftechnology.com.programs.MultiplierProgram; -import com.lftechnology.com.programs.PalindromeProgram; -import com.lftechnology.com.programs.SalutationProgram; +import com.lftechnology.programs.MultiplierProgram; +import com.lftechnology.programs.PalindromeProgram; +import com.lftechnology.programs.SalutationProgram; public class TaskSwitcher { From 99ff64e23e45ef7cf0aeae157ce269f34dd45405 Mon Sep 17 00:00:00 2001 From: Achyut Dahal Date: Mon, 16 May 2016 16:53:40 +0545 Subject: [PATCH 5/5] Improved the console messages for user experience --- .../com/lftechnology/programs/MultiplierProgram.java | 11 +++++------ .../com/lftechnology/programs/PalindromeProgram.java | 4 ++-- .../com/lftechnology/programs/SalutationProgram.java | 6 +++--- .../src/main/java/com/lftechnology/runner/Menu.java | 4 ++-- .../java/com/lftechnology/runner/TaskSwitcher.java | 9 ++++----- 5 files changed, 16 insertions(+), 18 deletions(-) diff --git a/achyut/src/main/java/com/lftechnology/programs/MultiplierProgram.java b/achyut/src/main/java/com/lftechnology/programs/MultiplierProgram.java index f6a1c0b..6047746 100644 --- a/achyut/src/main/java/com/lftechnology/programs/MultiplierProgram.java +++ b/achyut/src/main/java/com/lftechnology/programs/MultiplierProgram.java @@ -15,17 +15,16 @@ public MultiplierProgram() { public void run() { this.initiateRun(); - System.out.println("Please Enter the Number of Multiplier"); + System.out.println("->Please Enter the Number of Multiplier"); scanner = new Scanner(System.in); this.numberOfMultiple = scanner.nextInt(); - System.out.println("Please Enter First Multiplier"); + System.out.println("->Please Enter First Multiplier"); this.firstMultiplier = scanner.nextInt(); - System.out.println("Please Enter Second Multiplier"); + System.out.println("->Please Enter Second Multiplier"); this.secondMultiplier = scanner.nextInt(); int sum = calculateMultiplier(); System.out.println("Sum of multiple by " + this.firstMultiplier + " and " + this.secondMultiplier + " below " - + this.numberOfMultiple + "=" + sum); - System.out.println("Executing Multiplier"); + + this.numberOfMultiple + "=" + sum); this.endRun(); } @@ -42,7 +41,7 @@ public int calculateMultiplier() { public void initiateRun() { System.out.println("\n"); - System.out.println("Executing Multiplier"); + System.out.println("->Executing Multiplier"); } diff --git a/achyut/src/main/java/com/lftechnology/programs/PalindromeProgram.java b/achyut/src/main/java/com/lftechnology/programs/PalindromeProgram.java index 6823878..091b5e0 100644 --- a/achyut/src/main/java/com/lftechnology/programs/PalindromeProgram.java +++ b/achyut/src/main/java/com/lftechnology/programs/PalindromeProgram.java @@ -13,7 +13,7 @@ public PalindromeProgram() { public void run() { this.initiateRun(); - System.out.println("Please Enter the Number of Multiplier"); + System.out.println("->Please Enter the Number of Multiplier"); scanner = new Scanner(System.in); this.number = scanner.nextLine(); Boolean isPalindrome = this.isPalindrome(); @@ -40,7 +40,7 @@ public Boolean isPalindrome() { public void initiateRun() { System.out.println("\n"); - System.out.println("Executing Palindrome Program"); + System.out.println("->Executing Palindrome Program"); } diff --git a/achyut/src/main/java/com/lftechnology/programs/SalutationProgram.java b/achyut/src/main/java/com/lftechnology/programs/SalutationProgram.java index 5dc35e1..f3916b8 100644 --- a/achyut/src/main/java/com/lftechnology/programs/SalutationProgram.java +++ b/achyut/src/main/java/com/lftechnology/programs/SalutationProgram.java @@ -16,7 +16,7 @@ public void run() { this.initiateRun(); this.askForInput(); if (this.fullNameWithSalutation.length() <= 0) { - System.out.println("Input can't be empty! Enter again"); + System.out.println("->Input can't be empty! Enter again"); this.askForInput(); } this.splitInput(); @@ -27,8 +27,8 @@ public void run() { public void initiateRun() { System.out.println("\n"); - System.out.println("Executing Salutation"); - System.out.println("Please Enter Your Full Name with Salutation (e.g, Mr. John Doe)\n\n"); + System.out.println("->Executing Salutation"); + System.out.println("->Please Enter Your Full Name with Salutation (e.g, Mr. John Doe)\n\n"); } public void endRun() { diff --git a/achyut/src/main/java/com/lftechnology/runner/Menu.java b/achyut/src/main/java/com/lftechnology/runner/Menu.java index 257a873..d7c87df 100644 --- a/achyut/src/main/java/com/lftechnology/runner/Menu.java +++ b/achyut/src/main/java/com/lftechnology/runner/Menu.java @@ -7,14 +7,14 @@ public Menu() { } public void showmenu() { - System.out.println("Please hit the options below to play with us"); + System.out.println("->Please hit the options below to play with us"); System.out.println("Options Program"); System.out.println("1 Salutation"); System.out.println("2 Multiplier"); System.out.println("3 Palindrome"); System.out.println("0 Exit"); System.out.println("......................"); - System.out.print("Press the option above to continue: "); + System.out.print("->Press the option above to continue: "); Executer executor = new Executer(); executor.askForInputAndRun(); } diff --git a/achyut/src/main/java/com/lftechnology/runner/TaskSwitcher.java b/achyut/src/main/java/com/lftechnology/runner/TaskSwitcher.java index cf72840..424a0af 100644 --- a/achyut/src/main/java/com/lftechnology/runner/TaskSwitcher.java +++ b/achyut/src/main/java/com/lftechnology/runner/TaskSwitcher.java @@ -28,15 +28,14 @@ public void switchAndRun() { palindromeProgram.run(); break; case 0: - System.out.println("You are exiting the program now..."); - System.out.println("Exited"); + System.out.println("->You are exiting the program now..."); + System.out.println("->Exited"); System.exit(0); default: - System.out.println("Invalid Input"); + System.out.println("->Invalid Input"); System.out.println("\n"); menu.showmenu(); - } - System.out.println("Program Completed."); + } menu.showmenu(); } }