From bec21260dbe66ab9cf271e46b6fa026d9a0f127e Mon Sep 17 00:00:00 2001 From: Yaroslav Pavlinskiy Date: Tue, 22 Nov 2016 21:59:09 +0200 Subject: [PATCH 01/10] Task 1 done. --- .../lemon/changerequest/java/introduction/hw2/Task1.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/school/lemon/changerequest/java/introduction/hw2/Task1.java b/src/main/java/school/lemon/changerequest/java/introduction/hw2/Task1.java index fb8a529..b523910 100644 --- a/src/main/java/school/lemon/changerequest/java/introduction/hw2/Task1.java +++ b/src/main/java/school/lemon/changerequest/java/introduction/hw2/Task1.java @@ -1,7 +1,8 @@ package school.lemon.changerequest.java.introduction.hw2; public class Task1 { - public static String makeTags(String tag, String text) { - return ""; + public static String makeTags(String tag, String text) + { + return "<"+tag+">"+text+""; } } From db5294dbe5031915d72c97a0b9828378501910b0 Mon Sep 17 00:00:00 2001 From: Yaroslav Pavlinskiy Date: Tue, 22 Nov 2016 22:36:18 +0200 Subject: [PATCH 02/10] Task 2 done. --- .../changerequest/java/introduction/hw2/Task2.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/main/java/school/lemon/changerequest/java/introduction/hw2/Task2.java b/src/main/java/school/lemon/changerequest/java/introduction/hw2/Task2.java index fd4494e..72b61a0 100644 --- a/src/main/java/school/lemon/changerequest/java/introduction/hw2/Task2.java +++ b/src/main/java/school/lemon/changerequest/java/introduction/hw2/Task2.java @@ -3,6 +3,14 @@ public class Task2 { public static String firstTwo(String s) { - return ""; + if (s == null) + return null; + else if (s.equals("")) + return ""; + else + if (s.length() <= 2) { + return s.substring(0); + } + return s.substring(0, 2); } } From 757d25547e39eaca47521319a8a36130a157845e Mon Sep 17 00:00:00 2001 From: Yaroslav Pavlinskiy Date: Tue, 22 Nov 2016 22:53:24 +0200 Subject: [PATCH 03/10] Task 3 done. --- .../changerequest/java/introduction/hw2/Task3.java | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/src/main/java/school/lemon/changerequest/java/introduction/hw2/Task3.java b/src/main/java/school/lemon/changerequest/java/introduction/hw2/Task3.java index 4d2e987..0e36cc4 100644 --- a/src/main/java/school/lemon/changerequest/java/introduction/hw2/Task3.java +++ b/src/main/java/school/lemon/changerequest/java/introduction/hw2/Task3.java @@ -2,7 +2,17 @@ public class Task3 { - public static String comboString(String s1, String s2) { - return ""; + public static String comboString(String s1, String s2) + { + if(s1 == null) + return s1+s2+s1; + else + if(s2 == null) + return s2 + s1 + s2; + else + if(s1.length() < s2.length()) + return s1+s2+s1; + + return s2+s1+s2; } } From 010480493a87a9cf4cffbcb112004ece7e4a6e9b Mon Sep 17 00:00:00 2001 From: Yaroslav Pavlinskiy Date: Wed, 23 Nov 2016 00:00:06 +0200 Subject: [PATCH 04/10] Task 7 done, --- .../changerequest/java/introduction/hw2/Task7.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/main/java/school/lemon/changerequest/java/introduction/hw2/Task7.java b/src/main/java/school/lemon/changerequest/java/introduction/hw2/Task7.java index f95de42..43d9f3d 100644 --- a/src/main/java/school/lemon/changerequest/java/introduction/hw2/Task7.java +++ b/src/main/java/school/lemon/changerequest/java/introduction/hw2/Task7.java @@ -2,6 +2,14 @@ public class Task7 { public static int countEvens(int[] arr) { - return 0; + int count=0; + if(arr == null) + return 0; + for (int anArr : arr) { + if (anArr % 2 == 0) + count++; + + } + return count; } } From db13136db0e1ba814be8ba4d0d321be93c3d73b9 Mon Sep 17 00:00:00 2001 From: Yaroslav Pavlinskiy Date: Wed, 23 Nov 2016 22:56:08 +0200 Subject: [PATCH 05/10] Task 6 done, --- .../changerequest/java/introduction/hw2/Task6.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/main/java/school/lemon/changerequest/java/introduction/hw2/Task6.java b/src/main/java/school/lemon/changerequest/java/introduction/hw2/Task6.java index ee19236..f1da184 100644 --- a/src/main/java/school/lemon/changerequest/java/introduction/hw2/Task6.java +++ b/src/main/java/school/lemon/changerequest/java/introduction/hw2/Task6.java @@ -3,6 +3,15 @@ public class Task6 { public static int[] reverse(int[] arr) { - return null; + if (arr == null) { + return null; + } + int[]a = new int[arr.length]; + for(int i = 0;i < arr.length;i++) + { + a[arr.length-1-i] = arr[i]; + + } + return a; } } From cee03c38884a44ed9301923a5d53d6893f4d3ac5 Mon Sep 17 00:00:00 2001 From: Yaroslav Pavlinskiy Date: Wed, 23 Nov 2016 23:01:20 +0200 Subject: [PATCH 06/10] Task 5 done. --- .../lemon/changerequest/java/introduction/hw2/Task5.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/school/lemon/changerequest/java/introduction/hw2/Task5.java b/src/main/java/school/lemon/changerequest/java/introduction/hw2/Task5.java index 5e42b95..a227466 100644 --- a/src/main/java/school/lemon/changerequest/java/introduction/hw2/Task5.java +++ b/src/main/java/school/lemon/changerequest/java/introduction/hw2/Task5.java @@ -2,6 +2,7 @@ public class Task5 { public static boolean commondEnd(int[] a, int[] b) { - return false; + return (a[0] == b[0] || a[a.length-1] == b[b.length-1] || a[0] == b[b.length-1] || a[a.length-1] == b[0]); + } } From a74e1a27cb4bff8922fb98541409023419e22ad3 Mon Sep 17 00:00:00 2001 From: Yaroslav Pavlinskiy Date: Fri, 25 Nov 2016 23:46:11 +0200 Subject: [PATCH 07/10] Fixed Task 2 --- .../school/lemon/changerequest/java/introduction/hw2/Task2.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/school/lemon/changerequest/java/introduction/hw2/Task2.java b/src/main/java/school/lemon/changerequest/java/introduction/hw2/Task2.java index 72b61a0..b900c28 100644 --- a/src/main/java/school/lemon/changerequest/java/introduction/hw2/Task2.java +++ b/src/main/java/school/lemon/changerequest/java/introduction/hw2/Task2.java @@ -9,7 +9,7 @@ else if (s.equals("")) return ""; else if (s.length() <= 2) { - return s.substring(0); + return s; } return s.substring(0, 2); } From 36252c6e142b2e8a07af853b09bccd1d567c0fe0 Mon Sep 17 00:00:00 2001 From: Yaroslav Pavlinskiy Date: Fri, 25 Nov 2016 23:50:40 +0200 Subject: [PATCH 08/10] Some changes in Task 7. --- .../lemon/changerequest/java/introduction/hw2/Task7.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/school/lemon/changerequest/java/introduction/hw2/Task7.java b/src/main/java/school/lemon/changerequest/java/introduction/hw2/Task7.java index 43d9f3d..c626972 100644 --- a/src/main/java/school/lemon/changerequest/java/introduction/hw2/Task7.java +++ b/src/main/java/school/lemon/changerequest/java/introduction/hw2/Task7.java @@ -6,7 +6,8 @@ public static int countEvens(int[] arr) { if(arr == null) return 0; for (int anArr : arr) { - if (anArr % 2 == 0) + boolean b = anArr % 2 == 0; + if (b) count++; } From c5177a588fb36cda6fd987b54b1e3d3b3aa34a50 Mon Sep 17 00:00:00 2001 From: Yaroslav Pavlinskiy Date: Sat, 26 Nov 2016 01:18:59 +0200 Subject: [PATCH 09/10] Fixed Task 1 --- .../lemon/changerequest/java/introduction/hw2/Task1.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/school/lemon/changerequest/java/introduction/hw2/Task1.java b/src/main/java/school/lemon/changerequest/java/introduction/hw2/Task1.java index b523910..203b985 100644 --- a/src/main/java/school/lemon/changerequest/java/introduction/hw2/Task1.java +++ b/src/main/java/school/lemon/changerequest/java/introduction/hw2/Task1.java @@ -1,8 +1,10 @@ package school.lemon.changerequest.java.introduction.hw2; +import static java.lang.String.format; + public class Task1 { public static String makeTags(String tag, String text) { - return "<"+tag+">"+text+""; + return format("%1$s%2$s%3$s%4$s%5$s%2$s%3$s", "<", tag, ">", text, ""); } } From 0e6450d1742314048c649b00d2fe26195c4a1599 Mon Sep 17 00:00:00 2001 From: Yaroslav Pavlinskiy Date: Sat, 26 Nov 2016 01:20:26 +0200 Subject: [PATCH 10/10] Fixed Task 1 --- .../lemon/changerequest/java/introduction/hw2/Task1.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/main/java/school/lemon/changerequest/java/introduction/hw2/Task1.java b/src/main/java/school/lemon/changerequest/java/introduction/hw2/Task1.java index 203b985..68aa7d9 100644 --- a/src/main/java/school/lemon/changerequest/java/introduction/hw2/Task1.java +++ b/src/main/java/school/lemon/changerequest/java/introduction/hw2/Task1.java @@ -1,10 +1,8 @@ package school.lemon.changerequest.java.introduction.hw2; -import static java.lang.String.format; - public class Task1 { public static String makeTags(String tag, String text) { - return format("%1$s%2$s%3$s%4$s%5$s%2$s%3$s", "<", tag, ">", text, ""); + return String.format("%1$s%2$s%3$s%4$s%5$s%2$s%3$s", "<", tag, ">", text, ""); } }