From 3a2d2c4338604911a280ee773c2fce4c8f3819db Mon Sep 17 00:00:00 2001 From: dianasinenchenko Date: Thu, 24 Nov 2016 15:25:54 +0200 Subject: [PATCH 01/20] 1 done --- .../lemon/changerequest/java/introduction/hw2/Task1.java | 6 +++++- 1 file changed, 5 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 fb8a529..88ef733 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 @@ -2,6 +2,10 @@ public class Task1 { public static String makeTags(String tag, String text) { - return ""; + String opentag = "<" + tag + ">"; + String closetag = ""; + String html = opentag + text + closetag; + + return html; } } From 5fa297357d973928ca35d51b91dae5b69b3db78b Mon Sep 17 00:00:00 2001 From: dianasinenchenko Date: Thu, 24 Nov 2016 16:29:12 +0200 Subject: [PATCH 02/20] 2 not all (i have some trouble with null) --- .../java/introduction/hw2/Task2.java | 18 +++++++++++++++++- 1 file changed, 17 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..5dbd834 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,22 @@ public class Task2 { public static String firstTwo(String s) { - return ""; + + + StringBuilder shortstr = new StringBuilder(s); + + + if (s.length() == 0) { + return s; + } else if (s.length() == 1) { + return s; + } else if (s == null) { + return null; + } else { + shortstr.setLength(2); + String substring = shortstr.substring(0); + return substring; + } + } } From 59786c3a3e6f68026ea70f06b6df0dc34e6be61d Mon Sep 17 00:00:00 2001 From: dianasinenchenko Date: Thu, 24 Nov 2016 21:15:14 +0200 Subject: [PATCH 03/20] 2 done changed --- .../changerequest/java/introduction/hw2/Task2.java | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) 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 5dbd834..3668dbf 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 @@ -4,17 +4,14 @@ public class Task2 { public static String firstTwo(String s) { - + if (s == null) + return null; StringBuilder shortstr = new StringBuilder(s); + if (s.length() < 2) + return s; - if (s.length() == 0) { - return s; - } else if (s.length() == 1) { - return s; - } else if (s == null) { - return null; - } else { + else { shortstr.setLength(2); String substring = shortstr.substring(0); return substring; From dc94af145535846c8e10ac913e02753ab8cfd5fc Mon Sep 17 00:00:00 2001 From: dianasinenchenko Date: Thu, 24 Nov 2016 21:17:37 +0200 Subject: [PATCH 04/20] 3 done --- .../java/introduction/hw2/Task3.java | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) 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..5a3848c 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 @@ -3,6 +3,23 @@ public class Task3 { public static String comboString(String s1, String s2) { - return ""; + + + if (s1 == null) + + return null + s2 + null; + + else if (s2 == null) + return null + s1 + null; + + + if (s1.length() > s2.length()) + return s2 + s1 + s2; + + + else return s1 + s2 + s1; + + + } } From e1d526dc90e6ddd12753d513a06d8ac8c3eec07e Mon Sep 17 00:00:00 2001 From: dianasinenchenko Date: Fri, 25 Nov 2016 21:46:29 +0200 Subject: [PATCH 05/20] 1 done ( with String.format() ) --- .../changerequest/java/introduction/hw2/Task1.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 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 88ef733..6a2934d 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,11 +1,13 @@ package school.lemon.changerequest.java.introduction.hw2; +import java.util.Formatter; + public class Task1 { public static String makeTags(String tag, String text) { - String opentag = "<" + tag + ">"; - String closetag = ""; - String html = opentag + text + closetag; - return html; + + return String.format("%s", "<" + tag + ">" + + text + ""); + } } From 6cac7fce03467948a827e1be8025214e1323158c Mon Sep 17 00:00:00 2001 From: dianasinenchenko Date: Fri, 25 Nov 2016 22:15:21 +0200 Subject: [PATCH 06/20] 2 done ( check string for null and for length<2 together ) --- .../changerequest/java/introduction/hw2/Task2.java | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) 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 3668dbf..8977d36 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 @@ -4,18 +4,12 @@ public class Task2 { public static String firstTwo(String s) { - if (s == null) - return null; - StringBuilder shortstr = new StringBuilder(s); - if (s.length() < 2) + + if (s == null || s.length() < 2) return s; + return s.substring(0, 2); - else { - shortstr.setLength(2); - String substring = shortstr.substring(0); - return substring; - } } } From b096078b0bf5185154ee70512b9a0d736460d149 Mon Sep 17 00:00:00 2001 From: dianasinenchenko Date: Sat, 26 Nov 2016 20:52:06 +0200 Subject: [PATCH 07/20] 4 done --- .../java/introduction/hw2/Task4.java | 22 ++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/src/main/java/school/lemon/changerequest/java/introduction/hw2/Task4.java b/src/main/java/school/lemon/changerequest/java/introduction/hw2/Task4.java index 35edd98..2d88d1c 100644 --- a/src/main/java/school/lemon/changerequest/java/introduction/hw2/Task4.java +++ b/src/main/java/school/lemon/changerequest/java/introduction/hw2/Task4.java @@ -2,6 +2,26 @@ public class Task4 { public static String charAt(String s, int i) { - return ""; + + + if (i < 0 && Math.abs(i) <= s.length()) { + StringBuilder s1 = new StringBuilder(s); + s1.reverse(); + i = Math.abs(i) - 1; + return String.valueOf(s1.charAt(i)); + } + + + if (i < 0 && Math.abs(i) > s.length()) { + StringBuilder s1 = new StringBuilder(s); + s1.reverse(); + i = s.length() - (Math.abs(i) - 1); + return String.valueOf(s1.charAt(i)); + } + + if (i > 0 && i >= s.length()) { + i = i - s.length(); + } + return String.valueOf(s.charAt(i)); } } From ca9406c97a67caefa678a53d48cdffd02daf0353 Mon Sep 17 00:00:00 2001 From: dianasinenchenko Date: Sat, 26 Nov 2016 21:58:23 +0200 Subject: [PATCH 08/20] 5 done --- .../lemon/changerequest/java/introduction/hw2/Task5.java | 6 ++++++ 1 file changed, 6 insertions(+) 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..b3c2ac7 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,12 @@ public class Task5 { public static boolean commondEnd(int[] a, int[] b) { + int lengthA = a.length; + int lengthB = b.length; + + if (lengthA >= 1 && lengthB >= 1) { + 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]; + } return false; } } From 7b2f9bdf8d2cb2a631dc39460fe5a03ee0308b03 Mon Sep 17 00:00:00 2001 From: dianasinenchenko Date: Sun, 27 Nov 2016 20:22:18 +0200 Subject: [PATCH 09/20] 5 done (changed) --- .../changerequest/java/introduction/hw2/Task5.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) 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 b3c2ac7..c531684 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,12 +2,13 @@ public class Task5 { public static boolean commondEnd(int[] a, int[] b) { - int lengthA = a.length; - int lengthB = b.length; - if (lengthA >= 1 && lengthB >= 1) { - 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]; - } + + if (a[0] == b[0] || a[0] == b[b.length - 1] || a[a.length - 1] == b[0]) + return true; + return false; + + } } From 76c2630540bc15ef476534d9623617d38ef1e40e Mon Sep 17 00:00:00 2001 From: dianasinenchenko Date: Sun, 27 Nov 2016 21:34:07 +0200 Subject: [PATCH 10/20] 5 done (changed without if ) --- .../lemon/changerequest/java/introduction/hw2/Task5.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) 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 c531684..11564f8 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 @@ -4,10 +4,7 @@ public class Task5 { public static boolean commondEnd(int[] a, int[] b) { - if (a[0] == b[0] || a[0] == b[b.length - 1] || a[a.length - 1] == b[0]) - return true; - - return false; + return (a[0] == b[0] || a[0] == b[b.length - 1] || a[a.length - 1] == b[0] || a[a.length - 1] == b[b.length - 1]); } From f18903053597d46c57b287134327d9d180be1c79 Mon Sep 17 00:00:00 2001 From: dianasinenchenko Date: Mon, 28 Nov 2016 00:05:08 +0200 Subject: [PATCH 11/20] 6 done --- .../changerequest/java/introduction/hw2/Task6.java | 13 ++++++++++++- 1 file changed, 12 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..d88b423 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 @@ -1,8 +1,19 @@ package school.lemon.changerequest.java.introduction.hw2; +import com.sun.xml.internal.fastinfoset.util.CharArray; + public class Task6 { public static int[] reverse(int[] arr) { - return null; + if (arr == null) { + return null; + } + int reverseArr[] = new int[arr.length]; + int n = 0; + for (int i = arr.length - 1; i >= 0; --i) { + reverseArr[i] = arr[n]; + n++; + } + return reverseArr; } } From c70745ee268ae15cc9b112101470a8ca1e0ce52e Mon Sep 17 00:00:00 2001 From: dianasinenchenko Date: Mon, 28 Nov 2016 00:22:18 +0200 Subject: [PATCH 12/20] 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..06e7a0b 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; + if (arr == null) { + return 0; + } + int n = 0; + for (int i = arr.length - 1; i >= 0; --i) + if (arr[i] % 2 == 0 || arr[i] == 0) { + n++; + } + return n; } } From 0a8c37085011ce8e8a613f54fa4b98d192fea5c0 Mon Sep 17 00:00:00 2001 From: dianasinenchenko Date: Mon, 28 Nov 2016 14:18:56 +0200 Subject: [PATCH 13/20] 6 done --- .../lemon/changerequest/java/introduction/hw2/Task6.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) 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 d88b423..ccbfc33 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 @@ -9,10 +9,8 @@ public static int[] reverse(int[] arr) { return null; } int reverseArr[] = new int[arr.length]; - int n = 0; - for (int i = arr.length - 1; i >= 0; --i) { + for (int i = arr.length - 1, n=0; i >= 0 && n Date: Mon, 28 Nov 2016 14:20:04 +0200 Subject: [PATCH 14/20] 6 done (changed) --- .../school/lemon/changerequest/java/introduction/hw2/Task6.java | 2 +- 1 file changed, 1 insertion(+), 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 ccbfc33..2f1c554 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 @@ -9,7 +9,7 @@ public static int[] reverse(int[] arr) { return null; } int reverseArr[] = new int[arr.length]; - for (int i = arr.length - 1, n=0; i >= 0 && n= 0 && n < arr.length; i--, n++) { reverseArr[i] = arr[n]; } return reverseArr; From 8fd98d1adaeeeffc63721bb075402712e27269ae Mon Sep 17 00:00:00 2001 From: dianasinenchenko Date: Mon, 28 Nov 2016 14:31:30 +0200 Subject: [PATCH 15/20] 7 done (changed) --- .../school/lemon/changerequest/java/introduction/hw2/Task7.java | 2 +- 1 file changed, 1 insertion(+), 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 06e7a0b..9f304df 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 @@ -7,7 +7,7 @@ public static int countEvens(int[] arr) { } int n = 0; for (int i = arr.length - 1; i >= 0; --i) - if (arr[i] % 2 == 0 || arr[i] == 0) { + if (arr[i] % 2 == 0) { n++; } return n; From 22ea85df0ae6de682224417e00ff401b2b389cf0 Mon Sep 17 00:00:00 2001 From: dianasinenchenko Date: Wed, 30 Nov 2016 18:28:11 +0200 Subject: [PATCH 16/20] 8 done --- .../java/introduction/hw2/Task8.java | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/src/main/java/school/lemon/changerequest/java/introduction/hw2/Task8.java b/src/main/java/school/lemon/changerequest/java/introduction/hw2/Task8.java index 271facb..3fd7c04 100644 --- a/src/main/java/school/lemon/changerequest/java/introduction/hw2/Task8.java +++ b/src/main/java/school/lemon/changerequest/java/introduction/hw2/Task8.java @@ -3,6 +3,23 @@ public class Task8 { public static int[] evenOdd(int[] arr) { - return null; + if (arr == null) { + return null; + } + int newArr[] = new int[arr.length]; + int n = 0; + for (int i = 0; i < arr.length; i++) { + { + if (arr[i] % 2 == 0) + newArr[n++] = arr[i]; + } + } + for (int i = 0, m = 0; i < arr.length; i++) { + { + if (arr[i] % 2 != 0) + newArr[n + m++] = arr[i]; + } + } + return newArr; } } From 7bd5d21fdf5bb33163b260cf76b8c5e87da73be5 Mon Sep 17 00:00:00 2001 From: dianasinenchenko Date: Wed, 30 Nov 2016 21:14:42 +0200 Subject: [PATCH 17/20] 6 done (without import) --- .../school/lemon/changerequest/java/introduction/hw2/Task6.java | 2 +- 1 file changed, 1 insertion(+), 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 2f1c554..a5ecce8 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 @@ -1,7 +1,7 @@ package school.lemon.changerequest.java.introduction.hw2; -import com.sun.xml.internal.fastinfoset.util.CharArray; + public class Task6 { public static int[] reverse(int[] arr) { From 1b5a143c2216a3b8588a840583b972ba70d9f3dd Mon Sep 17 00:00:00 2001 From: dianasinenchenko Date: Thu, 1 Dec 2016 16:06:12 +0200 Subject: [PATCH 18/20] 9 not all (i have with this much problems ) --- .../java/introduction/hw2/Task9.java | 23 ++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/src/main/java/school/lemon/changerequest/java/introduction/hw2/Task9.java b/src/main/java/school/lemon/changerequest/java/introduction/hw2/Task9.java index 267a59d..cb8ec28 100644 --- a/src/main/java/school/lemon/changerequest/java/introduction/hw2/Task9.java +++ b/src/main/java/school/lemon/changerequest/java/introduction/hw2/Task9.java @@ -1,7 +1,28 @@ package school.lemon.changerequest.java.introduction.hw2; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + public class Task9 { public static String[] extractData(String URL) { - return new String[]{"", "", ""}; + if (URL == null) { + return new String[]{"", "", ""}; + } + + + String shema = "([a-z]+(?=\\:\\/\\/))"; // for all leters before :// + String host = "(([a-z0-9.-_])+ (?=\\:))"; // for all leters , numbers and . -_ before : (but if url dont have :port ?) + String port = "(?=\\:[0-9]+)"; // for all numbers after : + Pattern pshema = Pattern.compile(shema); + Pattern phost = Pattern.compile(host); + Pattern pport = Pattern.compile(port); + Matcher mshema = pshema.matcher(URL); + Matcher mhost = phost.matcher(URL); + Matcher mport = pport.matcher(URL); + + + return ; + + } } From 80f5ff3430723fd4e38d232a731f5397367861b6 Mon Sep 17 00:00:00 2001 From: dianasinenchenko Date: Thu, 1 Dec 2016 17:20:22 +0200 Subject: [PATCH 19/20] 9 not all --- .../java/introduction/hw2/Task9.java | 21 ++++++++----------- 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/src/main/java/school/lemon/changerequest/java/introduction/hw2/Task9.java b/src/main/java/school/lemon/changerequest/java/introduction/hw2/Task9.java index cb8ec28..5533e5c 100644 --- a/src/main/java/school/lemon/changerequest/java/introduction/hw2/Task9.java +++ b/src/main/java/school/lemon/changerequest/java/introduction/hw2/Task9.java @@ -10,18 +10,15 @@ public static String[] extractData(String URL) { } - String shema = "([a-z]+(?=\\:\\/\\/))"; // for all leters before :// - String host = "(([a-z0-9.-_])+ (?=\\:))"; // for all leters , numbers and . -_ before : (but if url dont have :port ?) - String port = "(?=\\:[0-9]+)"; // for all numbers after : - Pattern pshema = Pattern.compile(shema); - Pattern phost = Pattern.compile(host); - Pattern pport = Pattern.compile(port); - Matcher mshema = pshema.matcher(URL); - Matcher mhost = phost.matcher(URL); - Matcher mport = pport.matcher(URL); - - - return ; + +String url =" (([\\w]+(?=\\:\\/\\/)) ? (([\\w\\d.-_])+ (?=\\:)) (?=\\:[\\d]+))"; + Pattern purl = Pattern.compile(url); + Matcher murl = purl.matcher(URL); + StringBuilder surl = new StringBuilder(); + while (murl.find()){ + surl.append(murl.group()).append("\n");} + + return new String[]{surl.toString()}; } From 73057cef806afc0823bdd6da3b2c60baebcf0147 Mon Sep 17 00:00:00 2001 From: dianasinenchenko Date: Thu, 1 Dec 2016 20:58:04 +0200 Subject: [PATCH 20/20] 9 changed but smt wrong 10 done --- .../java/introduction/hw2/Task10.java | 16 ++++++++++++++++ .../java/introduction/hw2/Task9.java | 10 ++++++---- 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/src/main/java/school/lemon/changerequest/java/introduction/hw2/Task10.java b/src/main/java/school/lemon/changerequest/java/introduction/hw2/Task10.java index 95ec7eb..97826bb 100644 --- a/src/main/java/school/lemon/changerequest/java/introduction/hw2/Task10.java +++ b/src/main/java/school/lemon/changerequest/java/introduction/hw2/Task10.java @@ -1,7 +1,23 @@ package school.lemon.changerequest.java.introduction.hw2; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + public class Task10 { public static String trim(String text) { + if (text == null) { + return null; + } + // "" + String stext = "(((?<=[\\s])[\\w]+.*[^\\s]+)|([\\w]).*[^\\s])"; + + + Pattern ptext = Pattern.compile(stext); + Matcher mtext = ptext.matcher(text); + StringBuilder surl = new StringBuilder(); + if (mtext.find()) { + return mtext.group(); + } return ""; } } diff --git a/src/main/java/school/lemon/changerequest/java/introduction/hw2/Task9.java b/src/main/java/school/lemon/changerequest/java/introduction/hw2/Task9.java index 5533e5c..3c6eeda 100644 --- a/src/main/java/school/lemon/changerequest/java/introduction/hw2/Task9.java +++ b/src/main/java/school/lemon/changerequest/java/introduction/hw2/Task9.java @@ -11,15 +11,17 @@ public static String[] extractData(String URL) { -String url =" (([\\w]+(?=\\:\\/\\/)) ? (([\\w\\d.-_])+ (?=\\:)) (?=\\:[\\d]+))"; +String url =" ( (?<=\\:\\/\\/) [\\w] +.) ? ((?<= \\/\\/) [\\w\\d.-_] +.) ((?<=\\: ) [\\d] ) "; Pattern purl = Pattern.compile(url); Matcher murl = purl.matcher(URL); StringBuilder surl = new StringBuilder(); - while (murl.find()){ - surl.append(murl.group()).append("\n");} - + if (murl.find()){ + surl.append(murl.group()).append("\n"); return new String[]{surl.toString()}; + } + + return new String[]{"", "", ""}; } }