From 7229a269d3262e9dfdb3202aa6010b521d92e833 Mon Sep 17 00:00:00 2001 From: rciphertext Date: Thu, 17 Jan 2019 09:34:10 +0530 Subject: [PATCH 1/6] Addition : Author Name : Ravindra Singh Pawar --- calculator.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/calculator.java b/calculator.java index f090575..f247121 100755 --- a/calculator.java +++ b/calculator.java @@ -1,3 +1,6 @@ +/* +author: Ravindra Singh Pawar (MT2018093) +*/ import java.util.Scanner; public class calculator From e7907286c1275ad81bbd5b162288ea6e284f214a Mon Sep 17 00:00:00 2001 From: Sagar2149 Date: Thu, 17 Jan 2019 09:39:13 +0530 Subject: [PATCH 2/6] Added author name and date --- calculator.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/calculator.java b/calculator.java index f090575..649dd98 100755 --- a/calculator.java +++ b/calculator.java @@ -1,3 +1,8 @@ + + +/****************Changes made by Saga2149*********************/ +/****************Date: 17/01/2019 ****************************/ + import java.util.Scanner; public class calculator From 376d4008b4bc17925603d3897ae0d3bfbf565c10 Mon Sep 17 00:00:00 2001 From: Sagar2149 Date: Thu, 17 Jan 2019 09:50:44 +0530 Subject: [PATCH 3/6] Commit by user1 --- calculator.java | 1 + 1 file changed, 1 insertion(+) diff --git a/calculator.java b/calculator.java index 649dd98..6475d39 100755 --- a/calculator.java +++ b/calculator.java @@ -24,6 +24,7 @@ public static void main(String args[]) choice = scan.next().charAt(0); switch(choice) { + /*This part added by user1*/ case '1' : System.out.print("Enter Two Number : "); a = scan.nextFloat(); b = scan.nextFloat(); From edb47ddc8ab389516341fa3760b0dfcbb5d62f62 Mon Sep 17 00:00:00 2001 From: Sagar2149 Date: Thu, 17 Jan 2019 09:54:23 +0530 Subject: [PATCH 4/6] added by user 2 --- calculator.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/calculator.java b/calculator.java index 6475d39..e8df682 100755 --- a/calculator.java +++ b/calculator.java @@ -30,7 +30,9 @@ public static void main(String args[]) b = scan.nextFloat(); res = a + b; System.out.print("Result = " + res); - break; + break; + + /*This is by user2*/ case '2' : System.out.print("Enter Two Number : "); a = scan.nextFloat(); b = scan.nextFloat(); From 5c3ca10d2506d48b1bdfc6bc5d2bcd20bed3d554 Mon Sep 17 00:00:00 2001 From: Sagar2149 Date: Thu, 17 Jan 2019 09:50:44 +0530 Subject: [PATCH 5/6] Commit by user1 --- calculator.java | 1 + 1 file changed, 1 insertion(+) diff --git a/calculator.java b/calculator.java index a68dab7..ab4f3f7 100755 --- a/calculator.java +++ b/calculator.java @@ -26,6 +26,7 @@ public static void main(String args[]) choice = scan.next().charAt(0); switch(choice) { + /*This part added by user1*/ case '1' : System.out.print("Enter Two Number : "); a = scan.nextFloat(); b = scan.nextFloat(); From 330ca61557fc4662d2a0f79619888332d26d36b4 Mon Sep 17 00:00:00 2001 From: Sagar2149 Date: Thu, 17 Jan 2019 09:54:23 +0530 Subject: [PATCH 6/6] added by user 2 --- calculator.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/calculator.java b/calculator.java index ab4f3f7..742c0c6 100755 --- a/calculator.java +++ b/calculator.java @@ -32,7 +32,9 @@ public static void main(String args[]) b = scan.nextFloat(); res = a + b; System.out.print("Result = " + res); - break; + break; + + /*This is by user2*/ case '2' : System.out.print("Enter Two Number : "); a = scan.nextFloat(); b = scan.nextFloat();