From 5d1107fa6ee1d41ec54f55f5fe8cfdce2889a222 Mon Sep 17 00:00:00 2001 From: Phillip Pavlich Date: Sat, 11 Jan 2020 14:59:02 -0500 Subject: [PATCH 01/10] Update file v0 This change is for testing purposes only. do not merge leave the PR open --- Example_v0.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Example_v0.java b/Example_v0.java index 05dc9ea..64db422 100644 --- a/Example_v0.java +++ b/Example_v0.java @@ -15,14 +15,14 @@ public int test(){ } public int test(){ - return 15 + 26; + return 25 + 31; } public int test3(){ return 999 - 25; } - public int test4(){ + public int test5(){ return 999 - 25; } } From c5496e8819bff72090d6df9a6fc3ed1c2612fd03 Mon Sep 17 00:00:00 2001 From: Phillip Pavlich Date: Sat, 11 Jan 2020 15:00:30 -0500 Subject: [PATCH 02/10] Update v1 file This change is for testing purposes only. do not merge leave the PR open --- Example_v1.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Example_v1.java b/Example_v1.java index 69e97d8..092964b 100644 --- a/Example_v1.java +++ b/Example_v1.java @@ -4,11 +4,11 @@ public class B { private static int third = 52; public B(){ - B.first = 21; + B.first = 45; } - public int add(){ - return B.first + B.second; + public int subtract(){ + return B.first - B.second; } public int mult(){ From 0634545bb2a02cda7563e21e611579192eba89a1 Mon Sep 17 00:00:00 2001 From: Phillip Pavlich Date: Tue, 17 Mar 2020 23:11:12 -0400 Subject: [PATCH 03/10] Create Bexamples.java --- other files/Bexamples.java | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 other files/Bexamples.java diff --git a/other files/Bexamples.java b/other files/Bexamples.java new file mode 100644 index 0000000..77d92a5 --- /dev/null +++ b/other files/Bexamples.java @@ -0,0 +1,8 @@ +public class F { + private static int Z; + + public F() { + F.Z = 11; + } + +} From c55e87013f55b56dc140b6e3a7152900f0044c95 Mon Sep 17 00:00:00 2001 From: Phillip Pavlich Date: Tue, 17 Mar 2020 23:15:00 -0400 Subject: [PATCH 04/10] Create newCode.java --- newCode.java | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 newCode.java diff --git a/newCode.java b/newCode.java new file mode 100644 index 0000000..ba1a530 --- /dev/null +++ b/newCode.java @@ -0,0 +1,4 @@ +public class K { + private static int L; + +} From dc150a3d33727dbe01e9c6385e9ff035b0fa9668 Mon Sep 17 00:00:00 2001 From: Phillip Pavlich Date: Fri, 10 Apr 2020 14:37:10 -0400 Subject: [PATCH 05/10] Update again v0 --- Example_v0.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Example_v0.java b/Example_v0.java index 64db422..cd696c5 100644 --- a/Example_v0.java +++ b/Example_v0.java @@ -1,3 +1,6 @@ +/** +Class A that supports adding and subtracting +*/ public class A { private static int X; private static int Y = 5; @@ -6,6 +9,10 @@ public A(){ A.X = 5; } + /**Javadoc + Multiplication of field X and Y + @return int multiplication result + */ public int fcn(){ return A.X * A.Y; } From 52a977ee788f7e9c7c3e332f33ae114c5569e278 Mon Sep 17 00:00:00 2001 From: Phillip Pavlich Date: Sat, 11 Apr 2020 11:59:37 -0400 Subject: [PATCH 06/10] Update v1 with import and class change --- Example_v1.java | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/Example_v1.java b/Example_v1.java index 092964b..23f323e 100644 --- a/Example_v1.java +++ b/Example_v1.java @@ -1,17 +1,19 @@ -public class B { +import java.util.ArrayList; + +public class C { private static int first; private static int second = 5; private static int third = 52; - public B(){ - B.first = 45; + public C(){ + C.first = 45; } public int subtract(){ - return B.first - B.second; + return C.first - C.second; } - public int mult(){ - return B.first * B.second; + public int multiply(){ + return C.first * C.second; } } From 7f9b897906607d6b7c6b9ef281c0ad21ba03805d Mon Sep 17 00:00:00 2001 From: Phillip Pavlich Date: Sat, 11 Apr 2020 12:27:06 -0400 Subject: [PATCH 07/10] v0 no two identical methods --- Example_v0.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Example_v0.java b/Example_v0.java index cd696c5..20734e3 100644 --- a/Example_v0.java +++ b/Example_v0.java @@ -21,7 +21,7 @@ public int test(){ return A.X * A.Y; } - public int test(){ + public int test2(){ return 25 + 31; } From 926c25cc94665744a76771364236db28af5f40e0 Mon Sep 17 00:00:00 2001 From: Phillip Pavlich Date: Sat, 11 Apr 2020 17:14:18 -0400 Subject: [PATCH 08/10] v1 import mods --- Example_v1.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Example_v1.java b/Example_v1.java index 23f323e..b0c908f 100644 --- a/Example_v1.java +++ b/Example_v1.java @@ -1,4 +1,6 @@ import java.util.ArrayList; +import java.io.*; +import java.awt.*; public class C { private static int first; From 9d5c4cf4617c30841ad3bceb989e61cd7314354f Mon Sep 17 00:00:00 2001 From: Phillip Pavlich Date: Sat, 11 Apr 2020 19:03:32 -0400 Subject: [PATCH 09/10] v1 field decl --- Example_v1.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Example_v1.java b/Example_v1.java index b0c908f..078460f 100644 --- a/Example_v1.java +++ b/Example_v1.java @@ -3,19 +3,19 @@ import java.awt.*; public class C { - private static int first; + private static int firstVal; private static int second = 5; private static int third = 52; public C(){ - C.first = 45; + C.firstVal = 45; } public int subtract(){ - return C.first - C.second; + return C.firstVal - C.second; } public int multiply(){ - return C.first * C.second; + return C.firstVal * C.second; } } From 03733ecb843bae004fdbc5bee73bb0f558c6278b Mon Sep 17 00:00:00 2001 From: Phillip Pavlich Date: Sat, 11 Apr 2020 19:05:36 -0400 Subject: [PATCH 10/10] v0 change modifier --- Example_v0.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Example_v0.java b/Example_v0.java index 20734e3..149575a 100644 --- a/Example_v0.java +++ b/Example_v0.java @@ -17,7 +17,7 @@ public int fcn(){ return A.X * A.Y; } - public int test(){ + private int test(){ return A.X * A.Y; }