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..b914b9e 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,13 @@ public class Task1 { public static String makeTags(String tag, String text) { - return ""; + + return "<" + tag + ">" + text + "<" + "/" + tag + ">"; + } + + public static void main(String[] args) { + System.out.println(makeTags("xml", "Text")); } + + } 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..9d33e76 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,15 @@ public class Task2 { public static String firstTwo(String s) { - return ""; + + if (s.length() == 0) + return null; + else if (s.length() <= 2) + return s; + else return (s.substring(0,2)); + } + + public static void main(String[] args) { + System.out.println(firstTwo("Hello")); } } 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..2508efe 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,25 @@ public class Task3 { - public static String comboString(String s1, String s2) { - return ""; + public static String comboString(String s1, String s2) + + + {if (s1 == null) + return null+ s2 + null; + + else if (s1.length() < s2.length()) + return s1 + s2 + s1; + + else if (s2.length() < s1.length()) + return s2 + s1 + s2; + + else + return null + s1 + null; } + + + + + public static void main(String[] args) { + System.out.println(comboString("123","txt1")); } }