From 0da9cd303c22425790091b61df688599c8a37e1d Mon Sep 17 00:00:00 2001 From: Matteo Mara Date: Wed, 30 Mar 2022 21:31:24 +0200 Subject: [PATCH 1/7] second commit --- src/com/company/Main.java | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/src/com/company/Main.java b/src/com/company/Main.java index 01942bc..c450126 100644 --- a/src/com/company/Main.java +++ b/src/com/company/Main.java @@ -14,17 +14,10 @@ public class Main { @Deprecated(since = "1.0") private static final String DEPRECATED_STRING_2 = "deprecatedString2"; - /** - * @deprecated (when, why, refactoring advice...) - */ - @Deprecated(since = "1.0") - private static final String DEPRECATED_STRING_3 = "deprecatedString3"; - public static void main(String[] args) { if (DEPRECATED_STRING_1.equals("deprecatedString1") - && DEPRECATED_STRING_2.equals("deprecatedString2") - && DEPRECATED_STRING_3.equals("deprecatedString3")) { + && DEPRECATED_STRING_2.equals("deprecatedString2")) { System.out.println("All Strings are deprecated!"); } From bb9fb2e11bbb2e2f573f941227db7306fc69bfdb Mon Sep 17 00:00:00 2001 From: Matteo Mara Date: Wed, 30 Mar 2022 22:19:59 +0200 Subject: [PATCH 2/7] third commit --- src/com/company/Main.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/com/company/Main.java b/src/com/company/Main.java index c450126..bc6698b 100644 --- a/src/com/company/Main.java +++ b/src/com/company/Main.java @@ -12,12 +12,12 @@ public class Main { * @deprecated (when, why, refactoring advice...) */ @Deprecated(since = "1.0") - private static final String DEPRECATED_STRING_2 = "deprecatedString2"; + private static final String DEPRECATED_STRING_4 = "deprecatedString4"; public static void main(String[] args) { if (DEPRECATED_STRING_1.equals("deprecatedString1") - && DEPRECATED_STRING_2.equals("deprecatedString2")) { + && DEPRECATED_STRING_4.equals("deprecatedString4")) { System.out.println("All Strings are deprecated!"); } From 33e80ec5d4c13c22d345bc6cbb9db6355824e16a Mon Sep 17 00:00:00 2001 From: Matteo Mara Date: Wed, 30 Mar 2022 22:23:12 +0200 Subject: [PATCH 3/7] fourth commit --- src/com/company/Main.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/com/company/Main.java b/src/com/company/Main.java index bc6698b..14b471c 100644 --- a/src/com/company/Main.java +++ b/src/com/company/Main.java @@ -12,12 +12,12 @@ public class Main { * @deprecated (when, why, refactoring advice...) */ @Deprecated(since = "1.0") - private static final String DEPRECATED_STRING_4 = "deprecatedString4"; + private static final String DEPRECATED_STRING_2 = "deprecatedString2"; public static void main(String[] args) { if (DEPRECATED_STRING_1.equals("deprecatedString1") - && DEPRECATED_STRING_4.equals("deprecatedString4")) { + && DEPRECATED_STRING_2.equals("deprecatedString2") && true) { System.out.println("All Strings are deprecated!"); } From 356f0531b1fa7b00c3ed322ec21a36019719214a Mon Sep 17 00:00:00 2001 From: Matteo Mara Date: Wed, 30 Mar 2022 22:24:37 +0200 Subject: [PATCH 4/7] fifth commit --- src/com/company/Main.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/com/company/Main.java b/src/com/company/Main.java index 14b471c..c450126 100644 --- a/src/com/company/Main.java +++ b/src/com/company/Main.java @@ -17,7 +17,7 @@ public class Main { public static void main(String[] args) { if (DEPRECATED_STRING_1.equals("deprecatedString1") - && DEPRECATED_STRING_2.equals("deprecatedString2") && true) { + && DEPRECATED_STRING_2.equals("deprecatedString2")) { System.out.println("All Strings are deprecated!"); } From 0811492443eee3dbf9b96fac89e1c6573a5a1997 Mon Sep 17 00:00:00 2001 From: Matteo Mara Date: Wed, 30 Mar 2022 22:26:12 +0200 Subject: [PATCH 5/7] sixth commit --- src/com/company/Main.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/com/company/Main.java b/src/com/company/Main.java index c450126..2a0339c 100644 --- a/src/com/company/Main.java +++ b/src/com/company/Main.java @@ -16,8 +16,9 @@ public class Main { public static void main(String[] args) { - if (DEPRECATED_STRING_1.equals("deprecatedString1") - && DEPRECATED_STRING_2.equals("deprecatedString2")) { + if ( + DEPRECATED_STRING_2.equals("deprecatedString2") && + DEPRECATED_STRING_1.equals("deprecatedString1")) { System.out.println("All Strings are deprecated!"); } From 73571281d996de23733a04293237d1b0c0814b8f Mon Sep 17 00:00:00 2001 From: Matteo Mara Date: Thu, 31 Mar 2022 10:03:01 +0200 Subject: [PATCH 6/7] seventh commit --- src/com/company/Main.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/com/company/Main.java b/src/com/company/Main.java index 2a0339c..74ea781 100644 --- a/src/com/company/Main.java +++ b/src/com/company/Main.java @@ -16,6 +16,11 @@ public class Main { public static void main(String[] args) { + if (DEPRECATED_STRING_2.equals("deprecatedString2")) { + System.out.println("Another error incoming!"); + } + + if ( DEPRECATED_STRING_2.equals("deprecatedString2") && DEPRECATED_STRING_1.equals("deprecatedString1")) { From cbca33d9f42c9385d7d6e21c8672e741853d7e5a Mon Sep 17 00:00:00 2001 From: Matteo Mara Date: Thu, 31 Mar 2022 10:17:03 +0200 Subject: [PATCH 7/7] 8th commit --- src/com/company/Main.java | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/com/company/Main.java b/src/com/company/Main.java index 74ea781..f2351c2 100644 --- a/src/com/company/Main.java +++ b/src/com/company/Main.java @@ -14,17 +14,18 @@ public class Main { @Deprecated(since = "1.0") private static final String DEPRECATED_STRING_2 = "deprecatedString2"; + private static final String STRING_3 = "String3"; + public static void main(String[] args) { - if (DEPRECATED_STRING_2.equals("deprecatedString2")) { - System.out.println("Another error incoming!"); + if (DEPRECATED_STRING_1.equals("deprecatedString1") + && STRING_3.equals("Strin4") + && DEPRECATED_STRING_2.equals("deprecatedString2")) { + System.out.println("All Strings are deprecated!"); } - - if ( - DEPRECATED_STRING_2.equals("deprecatedString2") && - DEPRECATED_STRING_1.equals("deprecatedString1")) { - System.out.println("All Strings are deprecated!"); + if (DEPRECATED_STRING_2.equals("deprecatedString2")) { + System.out.println("Another error incoming!"); } }