From 74248b2c41f2f46f3b0fb1bd99e1580fb1a0989e Mon Sep 17 00:00:00 2001 From: Eugene Date: Mon, 14 Sep 2020 18:31:24 +0300 Subject: [PATCH 1/7] =?UTF-8?q?=D0=BC=D0=B5=D1=82=D0=BE=D0=B4=20main?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PhoneBook/src/PhoneBook.java | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/PhoneBook/src/PhoneBook.java b/PhoneBook/src/PhoneBook.java index 27594a5..f213b1e 100644 --- a/PhoneBook/src/PhoneBook.java +++ b/PhoneBook/src/PhoneBook.java @@ -1,8 +1,28 @@ +import java.util.Scanner; + public class PhoneBook { public static void main(String[] args) { - //Добавить считывание ввода пользователя в цикле - } + int i = 0; + String[][] book = new String[20][2]; + while (true) { + String name = ""; + boolean mark = true; + String number = ""; + System.out.println("Введите ФИО"); + Scanner scanner = new Scanner(System.in); + boolean isCorrectName = false; + while (!isCorrectName) { + name = scanner.nextLine(); //Считывает строку из System.in + isCorrectName = checkName(name); + if (!isCorrectName) { + System.out.println("Введите корректное ФИО!"); + } else { + name = formatName(name); + } + } + + public static boolean checkPhoneNumber(String phoneNumber) { return true; From 97cc8a225630945e8ae482d03df8c85c5083471d Mon Sep 17 00:00:00 2001 From: Eugene Date: Mon, 14 Sep 2020 18:33:05 +0300 Subject: [PATCH 2/7] =?UTF-8?q?=D0=BC=D0=B5=D1=82=D0=BE=D0=B4=20printPhone?= =?UTF-8?q?Number?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PhoneBook/src/PhoneBook.java | 99 +++++++++++++++++++++++------------- 1 file changed, 65 insertions(+), 34 deletions(-) diff --git a/PhoneBook/src/PhoneBook.java b/PhoneBook/src/PhoneBook.java index f213b1e..8ac0106 100644 --- a/PhoneBook/src/PhoneBook.java +++ b/PhoneBook/src/PhoneBook.java @@ -3,48 +3,79 @@ public class PhoneBook { public static void main(String[] args) { - int i = 0; - String[][] book = new String[20][2]; - while (true) { - String name = ""; - boolean mark = true; - String number = ""; - System.out.println("Введите ФИО"); + public static void main (String[]args){ + int i = 0; + String[][] book = new String[20][2]; + while (true) { + String name = ""; + boolean mark = true; + String number = ""; + System.out.println("Введите ФИО"); + Scanner scanner = new Scanner(System.in); + boolean isCorrectName = false; + while (!isCorrectName) { + name = scanner.nextLine(); //Считывает строку из System.in + isCorrectName = checkName(name); + if (!isCorrectName) { + System.out.println("Введите корректное ФИО!"); + } else { + name = formatName(name); + } + } + + for (int r = 0; r < book.length; r++) { + if (name.equals(book[r][0])) { + System.out.println(book[r][0] + ":" + " " + book[r][1]); + mark = false; + break; + } + } + while (mark) { + number = printPhoneNumber(number); + book = add(book, name, number, i); + i++; + mark = false; + } + } + } + + public static String printPhoneNumber (String number){ + System.out.println("Введите номер"); Scanner scanner = new Scanner(System.in); - boolean isCorrectName = false; - while (!isCorrectName) { - name = scanner.nextLine(); //Считывает строку из System.in - isCorrectName = checkName(name); - if (!isCorrectName) { - System.out.println("Введите корректное ФИО!"); + boolean isCorrectNumber = false; + while (!isCorrectNumber) { + number = scanner.nextLine(); //Считывает строку из System.in + isCorrectNumber = checkPhoneNumber(number); + if (!isCorrectNumber) { + System.out.println("Введите корректный номер!"); } else { - name = formatName(name); + number = formatPhoneNumber(number); } } + return number; + } + public static boolean checkPhoneNumber (String phoneNumber){ + return true; + } + public static boolean checkName (String name){ + return true; + } - public static boolean checkPhoneNumber(String phoneNumber) { - return true; - } + public static String formatName (String name){ + return ""; + } - public static boolean checkName(String name) { - return true; - } - - public static String formatName(String name) { - return ""; - } + public static String formatPhoneNumber (String number){ + return ""; + } - public static String formatPhoneNumber(String number) { - return ""; - } - - public static void add(String[][] book, String name, String number) { - //add logic - } + public static void add (String[][]book, String name, String number){ + //add logic + } - public static void list(String[][] book) { - //print phone book + public static void list (String[][]book){ + //print phone book + } } -} From cfd41417df53cf5598c4203833f376bcc02942cb Mon Sep 17 00:00:00 2001 From: Eugene Date: Mon, 14 Sep 2020 18:34:44 +0300 Subject: [PATCH 3/7] =?UTF-8?q?=D0=BC=D0=B5=D1=82=D0=BE=D0=B4=20checkName?= =?UTF-8?q?=20=D0=B8=20checkPhoneNumber?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PhoneBook/src/PhoneBook.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/PhoneBook/src/PhoneBook.java b/PhoneBook/src/PhoneBook.java index 8ac0106..2b0a5cd 100644 --- a/PhoneBook/src/PhoneBook.java +++ b/PhoneBook/src/PhoneBook.java @@ -55,12 +55,16 @@ public static String printPhoneNumber (String number){ return number; } - public static boolean checkPhoneNumber (String phoneNumber){ - return true; + public static boolean checkPhoneNumber (String number){ + String check = number.replaceAll("[^0-9]", ""); + return check.length() == 11; + } - public static boolean checkName (String name){ - return true; + public static boolean checkName(String name) { + String[] check = name.split(" "); + return check.length == 3; + } public static String formatName (String name){ From 9ed7153c85311f148fca9f40859016b80110cbc0 Mon Sep 17 00:00:00 2001 From: Eugene Date: Mon, 14 Sep 2020 18:35:37 +0300 Subject: [PATCH 4/7] =?UTF-8?q?=D0=BC=D0=B5=D1=82=D0=BE=D0=B4=D1=8B=20?= =?UTF-8?q?=D0=B4=D0=BB=D1=8F=20=D1=84=D0=BE=D1=80=D0=BC=D0=B0=D1=82=D0=B8?= =?UTF-8?q?=D1=80=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D1=8F=20=D0=B8=D0=BC=D0=B5?= =?UTF-8?q?=D0=BD=D0=B3=D0=B8=20=D0=B8=20=D0=BD=D0=BE=D0=BC=D0=B5=D1=80?= =?UTF-8?q?=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PhoneBook/src/PhoneBook.java | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/PhoneBook/src/PhoneBook.java b/PhoneBook/src/PhoneBook.java index 2b0a5cd..675cf63 100644 --- a/PhoneBook/src/PhoneBook.java +++ b/PhoneBook/src/PhoneBook.java @@ -67,12 +67,18 @@ public static boolean checkName(String name) { } - public static String formatName (String name){ - return ""; + public static String formatName(String name) { + String[] format = name.split(" "); + return (format[0].substring(0, 1).toUpperCase() + format[0].substring(1) + " " + format[1].substring(0, 1).toUpperCase() + + format[1].substring(1) + " " + format[2].substring(0, 1).toUpperCase() + format[2].substring(1)); + + } - public static String formatPhoneNumber (String number){ - return ""; + public static String formatPhoneNumber(String number) { + String format = number.replaceAll("[^0-9]", ""); + + return ("+7" + " " + format.substring(1, 4) + " " + format.substring(4, 7) + " " + format.substring(7, 9) + " " + format.substring(9)); } public static void add (String[][]book, String name, String number){ From df9fb32c61a793440a2fe62c8c499f3a7c74b712 Mon Sep 17 00:00:00 2001 From: Eugene Date: Mon, 14 Sep 2020 18:39:28 +0300 Subject: [PATCH 5/7] =?UTF-8?q?=D0=BF=D1=80=D0=BE=D0=B3=D1=80=D0=B0=D0=BC?= =?UTF-8?q?=D0=BC=D0=B0=20PhoneBook=20=D0=B3=D0=BE=D1=82=D0=BE=D0=B2=D0=B0?= =?UTF-8?q?=20=D0=B4=D0=BB=D1=8F=20=D1=80=D0=B5=D0=B2=D1=8C=D1=8E=20=D0=B8?= =?UTF-8?q?=20=D0=BF=D1=80=D0=BE=D0=B2=D0=B5=D1=80=D0=BA=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PhoneBook/src/PhoneBook.java | 137 ++++++++++++++++++----------------- 1 file changed, 72 insertions(+), 65 deletions(-) diff --git a/PhoneBook/src/PhoneBook.java b/PhoneBook/src/PhoneBook.java index 675cf63..58164f9 100644 --- a/PhoneBook/src/PhoneBook.java +++ b/PhoneBook/src/PhoneBook.java @@ -3,89 +3,96 @@ public class PhoneBook { public static void main(String[] args) { - public static void main (String[]args){ - int i = 0; - String[][] book = new String[20][2]; - while (true) { - String name = ""; - boolean mark = true; - String number = ""; - System.out.println("Введите ФИО"); - Scanner scanner = new Scanner(System.in); - boolean isCorrectName = false; - while (!isCorrectName) { - name = scanner.nextLine(); //Считывает строку из System.in - isCorrectName = checkName(name); - if (!isCorrectName) { - System.out.println("Введите корректное ФИО!"); - } else { - name = formatName(name); - } + int i = 0; + String[][] book = new String[20][2]; + while (true) { + String name = ""; + boolean mark = true; + String number = ""; + System.out.println("Введите ФИО"); + Scanner scanner = new Scanner(System.in); + boolean isCorrectName = false; + while (!isCorrectName) { + name = scanner.nextLine(); //Считывает строку из System.in + isCorrectName = checkName(name); + if (!isCorrectName) { + System.out.println("Введите корректное ФИО!"); + } else { + name = formatName(name); } + } - for (int r = 0; r < book.length; r++) { - if (name.equals(book[r][0])) { - System.out.println(book[r][0] + ":" + " " + book[r][1]); - mark = false; - break; - } - } - while (mark) { - number = printPhoneNumber(number); - book = add(book, name, number, i); - i++; + for (int r = 0; r < book.length; r++) { + if (name.equals(book[r][0])) { + System.out.println(book[r][0] + ":" + " " + book[r][1]); mark = false; + break; } } + while (mark) { + number = printPhoneNumber(number); + book = add(book, name, number, i); + i++; + mark = false; + } } + } - public static String printPhoneNumber (String number){ - System.out.println("Введите номер"); - Scanner scanner = new Scanner(System.in); - boolean isCorrectNumber = false; - while (!isCorrectNumber) { - number = scanner.nextLine(); //Считывает строку из System.in - isCorrectNumber = checkPhoneNumber(number); - if (!isCorrectNumber) { - System.out.println("Введите корректный номер!"); - } else { - number = formatPhoneNumber(number); - } + public static String printPhoneNumber(String number) { + System.out.println("Введите номер"); + Scanner scanner = new Scanner(System.in); + boolean isCorrectNumber = false; + while (!isCorrectNumber) { + number = scanner.nextLine(); //Считывает строку из System.in + isCorrectNumber = checkPhoneNumber(number); + if (!isCorrectNumber) { + System.out.println("Введите корректный номер!"); + } else { + number = formatPhoneNumber(number); } - return number; } + return number; + } - public static boolean checkPhoneNumber (String number){ - String check = number.replaceAll("[^0-9]", ""); - return check.length() == 11; - } + public static boolean checkPhoneNumber(String number) { + String check = number.replaceAll("[^0-9]", ""); + return check.length() == 11; - public static boolean checkName(String name) { - String[] check = name.split(" "); - return check.length == 3; + } - } + public static boolean checkName(String name) { + String[] check = name.split(" "); + return check.length == 3; - public static String formatName(String name) { - String[] format = name.split(" "); - return (format[0].substring(0, 1).toUpperCase() + format[0].substring(1) + " " + format[1].substring(0, 1).toUpperCase() - + format[1].substring(1) + " " + format[2].substring(0, 1).toUpperCase() + format[2].substring(1)); + } + public static String formatName(String name) { + String[] format = name.split(" "); + return (format[0].substring(0, 1).toUpperCase() + format[0].substring(1) + " " + format[1].substring(0, 1).toUpperCase() + + format[1].substring(1) + " " + format[2].substring(0, 1).toUpperCase() + format[2].substring(1)); - } - public static String formatPhoneNumber(String number) { - String format = number.replaceAll("[^0-9]", ""); + } - return ("+7" + " " + format.substring(1, 4) + " " + format.substring(4, 7) + " " + format.substring(7, 9) + " " + format.substring(9)); - } + public static String formatPhoneNumber(String number) { + String format = number.replaceAll("[^0-9]", ""); - public static void add (String[][]book, String name, String number){ - //add logic - } + return ("+7" + " " + format.substring(1, 4) + " " + format.substring(4, 7) + " " + format.substring(7, 9) + " " + format.substring(9)); + } - public static void list (String[][]book){ - //print phone book - } + public static String[][] add(String[][] book, String name, String number, int i) { + book[i][0] = name; + book[i][1] = number; + list(book); + return book; + } + + public static void list(String[][] book) { + for (int r = 0; r < book.length; r++) { + if (book[r][0] != null) { + System.out.println(book[r][0] + ":" + " " + book[r][1]); + } + }//print phone book } +} From 2e46d2eb3663f84f3a468d6bb5b1cab48c22dbe2 Mon Sep 17 00:00:00 2001 From: Eugene Date: Tue, 15 Sep 2020 18:46:15 +0300 Subject: [PATCH 6/7] =?UTF-8?q?=D0=94=D0=BE=D0=BC=D0=B0=D1=88=D0=BD=D0=B5?= =?UTF-8?q?=D0=B5=20=D0=B7=D0=B0=D0=B4=D0=B0=D0=BD=D0=B8=D0=B5=202=20?= =?UTF-8?q?=D0=B3=D0=BE=D1=82=D0=BE=D0=B2=D0=BE=20=D0=B4=D0=BB=D1=8F=20?= =?UTF-8?q?=D0=B4=D0=BB=D1=8F=20=D0=BF=D1=80=D0=BE=D0=B2=D0=B5=D1=80=D0=BA?= =?UTF-8?q?=D0=B8=20=D0=B8=20=D1=80=D0=B5=D0=B2=D1=8C=D1=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- StudentList/src/AutoChecked.java | 6 ++ StudentList/src/DragAndDrop.java | 19 ++++++ StudentList/src/Main.java | 82 ++++++++++++++++-------- StudentList/src/Mentor.java | 30 +++++++++ StudentList/src/Person.java | 26 ++++++++ StudentList/src/Staff.java | 8 +++ StudentList/src/Student.java | 105 +++++++++++++++++++------------ StudentList/src/Task.java | 19 ++++++ StudentList/src/Test.java | 9 +++ StudentList/src/WriteCode.java | 9 +++ 10 files changed, 245 insertions(+), 68 deletions(-) create mode 100644 StudentList/src/AutoChecked.java create mode 100644 StudentList/src/DragAndDrop.java create mode 100644 StudentList/src/Mentor.java create mode 100644 StudentList/src/Person.java create mode 100644 StudentList/src/Staff.java create mode 100644 StudentList/src/Task.java create mode 100644 StudentList/src/Test.java create mode 100644 StudentList/src/WriteCode.java diff --git a/StudentList/src/AutoChecked.java b/StudentList/src/AutoChecked.java new file mode 100644 index 0000000..cfa474a --- /dev/null +++ b/StudentList/src/AutoChecked.java @@ -0,0 +1,6 @@ +public interface AutoChecked { + + default void checkAutomatically() { + System.out.println("Задание без проверки метором"); + } +} diff --git a/StudentList/src/DragAndDrop.java b/StudentList/src/DragAndDrop.java new file mode 100644 index 0000000..cb8c197 --- /dev/null +++ b/StudentList/src/DragAndDrop.java @@ -0,0 +1,19 @@ +class DragAndDrop extends Task implements AutoChecked { + + private String[][] var; + + public DragAndDrop(int numberOfTask, String task) { + super(numberOfTask, task); + + // String [] s = new String[2]; + // [0] [1] + // String [][] ss = new String[2][3]; + // [[0] [1] [2]] [[0] [1] [2]] + + this.var = new String[2][2]; + var[0][0] = "вариант1"; + var[0][1] = "вариант2"; + var[1][0] = "вариант3"; + var[1][1] = "вариант4"; + } +} diff --git a/StudentList/src/Main.java b/StudentList/src/Main.java index fd1ead7..6fa6ab4 100644 --- a/StudentList/src/Main.java +++ b/StudentList/src/Main.java @@ -1,35 +1,63 @@ -import java.util.Scanner; +import java.util.Random; public class Main { - private static String addCommand = "add Василий Петров " + - "vasily.petrov@gmail.com +79787775747"; - private static String commandExamples = "\t" + addCommand + "\n" + - "\tlist\n\tcount\n\tremove Василий Петров"; - private static String commandError = "Wrong command! Available command examples: \n" + - commandExamples; - private static String helpText = "Command examples:\n" + commandExamples; public static void main(String[] args) { - Scanner scanner = new Scanner(System.in); - StudentStorage executor = new StudentStorage(); - while (true) { - String command = scanner.nextLine(); - String[] tokens = command.split("\\s+", 2); - if (tokens[0].equals("add")) { - executor.addStudent(tokens[1]); - } else if (tokens[0].equals("list")) { - executor.listStudent(); - } else if (tokens[0].equals("get")) { - executor.getStudentByName(tokens[1]).toString(); - } else if (tokens[0].equals("remove")) { - executor.removeStudent(tokens[1]); - } else if (tokens[0].equals("count")) { - System.out.println("There are " + executor.getCount() + " customers"); - } else if (tokens[0].equals("help")) { - System.out.println(helpText); - } else { - System.out.println(commandError); + Task[] tasks = generateTasks(); + + Mentor firstMentor = new Mentor("Egor", 35); + Mentor secondMentor = new Mentor("Igor", 40); + + Student[] students = new Student[4]; + + students[0] = new Student("Antonio",89, firstMentor); + students[1] = new Student("Andrey", 35, secondMentor); + students[2] = new Student("Eugene", 30, secondMentor); + students[3] = new Student("Viktor", 30, firstMentor); + + while (!doesNotEachStudentSolveAllTasks(students)) { + /*for (int i = 0; i < students.length - 1; i++) { + Student students = students[i]; + }*/ + for (Student student : students) { + int tasksToSolve = randomInt(5, tasks.length - 1); + student.solveTasks(tasks, tasksToSolve); } } } + + private static boolean doesNotEachStudentSolveAllTasks(Student[] students) { + boolean done = true; + for(Student student : students){ + boolean d = student.isAreAllTasksDone(); + done &= d; + } + return done; + + } + + private static Task[] generateTasks() { + Task[] tasks = new Task[31]; + for (int i = 0; i < 7; i++) { + Task t = new Test(i + 1, "Test Task " + (i + 1) + "text"); + tasks[i] = t; + } + for (int i = 7; i < 18; i++) { + Task t = new DragAndDrop(i + 1, "DragAndDrop Task" + (i + 1) + "text"); + tasks[i] = t; + } + for (int i = 18; i < 31; i++) { + Task t = new WriteCode(i + 1, "Write Code Task " + (i + 1) + " text"); + tasks[i] = t; + } + return tasks; + } + + public static int randomInt(int min, int max) { + Random random = new Random(); + int diff = max - min; + int result = random.nextInt(diff + 1); + result += min; + return result; + } } diff --git a/StudentList/src/Mentor.java b/StudentList/src/Mentor.java new file mode 100644 index 0000000..430df9d --- /dev/null +++ b/StudentList/src/Mentor.java @@ -0,0 +1,30 @@ +import java.util.Random; + +public class Mentor extends Person implements Staff { + + private boolean mood; // ? + private Random random = new Random(); // ? + + public Mentor(String name, int age) { + super(name, age); + this.mood = true; + } + + @Override + public void helpStudent(Student student) { + System.out.println(student.getName() + ", не унывай, все получится"); + } + + public boolean checkCode(Task task) { + int number = Main.randomInt(0, 2000); + if (number > 1000) { + mood = true; + System.out.println("[" + task.getTask() + "] was checked by [" + getName() + "]") ; + return true; + } + mood = false; + System.out.println("[" + task.getTask() + "] was not checked by [" + getName() + "]"); + return false; + } +} + diff --git a/StudentList/src/Person.java b/StudentList/src/Person.java new file mode 100644 index 0000000..9374693 --- /dev/null +++ b/StudentList/src/Person.java @@ -0,0 +1,26 @@ +public class Person { + + private String name; + private int age; + + public Person(String name, int age) { + this.name = name; + this.age = age; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public int getAge() { + return age; + } + + public void setAge(int age) { + this.age = age; + } +} diff --git a/StudentList/src/Staff.java b/StudentList/src/Staff.java new file mode 100644 index 0000000..b4ce099 --- /dev/null +++ b/StudentList/src/Staff.java @@ -0,0 +1,8 @@ +public interface Staff { + + void helpStudent(Student student); + + default void addMaterials() { + System.out.println("https://habr.com/ru/all/"); + } +} diff --git a/StudentList/src/Student.java b/StudentList/src/Student.java index f061c4e..971b4a3 100644 --- a/StudentList/src/Student.java +++ b/StudentList/src/Student.java @@ -1,41 +1,64 @@ -import java.util.UUID; - -public class Student { - - /** - * id студента - */ - private String id; - - /** - * Имя студента - */ - private String name; - - /** - * Телефон студента - */ - private String phone; - - /** - * Почта студента - */ - private String eMail; - - public Student(String name, String phone, String eMail) { - this.id = UUID.randomUUID().toString(); - this.name = name; - this.phone = phone; - this.eMail = eMail; - } - - @Override - public String toString() { - return "Student{" + - "id='" + id + '\'' + - ", name='" + name + '\'' + - ", phone='" + phone + '\'' + - ", eMail='" + eMail + '\'' + - '}'; - } -} +public class Student extends Person { + + public static int tasksSum; + + public int solvedTasks; + public Mentor mentor; + public boolean allTasksSolved = false; + + public Student(String name, int age, Mentor mentor) { + super(name, age); + this.mentor = mentor; + this.solvedTasks = 0; + } + + public int getSolvedTasks() { + return solvedTasks; + } + + public void setSolvedTasks(int solvedTasks) { + this.solvedTasks = solvedTasks; + } + + public Mentor getMentor() { + return mentor; + } + + public void setMentor(Mentor mentor) { + this.mentor = mentor; + } + + public boolean isAreAllTasksDone() { + return allTasksSolved; + } + + public void solveTasks(Task[] tasks, int tasksToSolve) { + // solvedTasks = 2 + // tasksToSolve = 2 + // [0] [1] [2] [3] [4] [5] + System.out.println("[" + getName() + "] already solved ["+solvedTasks+"] and ["+ tasksToSolve+"] new tasks to solve"); + for (int i = solvedTasks; i < solvedTasks + tasksToSolve; i++) { + + solveTask(tasks[i]); + if (solvedTasks >= tasks.length) { + allTasksSolved = true; + System.out.println("[" + getName() + "] solved all tasks!"); + return; + } else { + allTasksSolved = false; + } + } + + } + + private void solveTask(Task task) { + if (task instanceof AutoChecked) { + ((AutoChecked) task).checkAutomatically(); + } else { + while (!mentor.checkCode(task)) { + } + } + solvedTasks++; + tasksSum++; + } +} \ No newline at end of file diff --git a/StudentList/src/Task.java b/StudentList/src/Task.java new file mode 100644 index 0000000..ba413f4 --- /dev/null +++ b/StudentList/src/Task.java @@ -0,0 +1,19 @@ +abstract class Task { + + private int number; + private String task; + + public Task(int number, String task) { + this.number = number; + this.task = task; + } + + public int getNumber() { + return number; + } + + public String getTask() { + return task; + } +} + diff --git a/StudentList/src/Test.java b/StudentList/src/Test.java new file mode 100644 index 0000000..38f0b8f --- /dev/null +++ b/StudentList/src/Test.java @@ -0,0 +1,9 @@ +class Test extends Task implements AutoChecked { + + String[] answer; + + public Test(int numberOfTask, String task) { + super(numberOfTask, task); + this.answer = new String[]{"a", "b", "c"}; + } +} diff --git a/StudentList/src/WriteCode.java b/StudentList/src/WriteCode.java new file mode 100644 index 0000000..6796a53 --- /dev/null +++ b/StudentList/src/WriteCode.java @@ -0,0 +1,9 @@ +class WriteCode extends Task { + + String code; + + public WriteCode(int numberOfTask, String task) { + super(numberOfTask, task); + this.code = "c"; + } +} From 9462ce605866a6834d098ec4538064b177131b4c Mon Sep 17 00:00:00 2001 From: Eugene Date: Tue, 15 Sep 2020 18:47:40 +0300 Subject: [PATCH 7/7] =?UTF-8?q?Main,=20Mentor,=20student=20=D0=BE=D1=82?= =?UTF-8?q?=D1=84=D0=BE=D1=80=D0=BC=D0=B0=D1=82=D0=B8=D1=80=D0=BE=D0=B2?= =?UTF-8?q?=D0=B0=D0=BD=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- StudentList/src/Main.java | 4 ++-- StudentList/src/Mentor.java | 2 +- StudentList/src/Student.java | 2 +- StudentList/src/StudentStorage.java | 31 ----------------------------- 4 files changed, 4 insertions(+), 35 deletions(-) delete mode 100644 StudentList/src/StudentStorage.java diff --git a/StudentList/src/Main.java b/StudentList/src/Main.java index 6fa6ab4..6c458bf 100644 --- a/StudentList/src/Main.java +++ b/StudentList/src/Main.java @@ -10,7 +10,7 @@ public static void main(String[] args) { Student[] students = new Student[4]; - students[0] = new Student("Antonio",89, firstMentor); + students[0] = new Student("Antonio", 89, firstMentor); students[1] = new Student("Andrey", 35, secondMentor); students[2] = new Student("Eugene", 30, secondMentor); students[3] = new Student("Viktor", 30, firstMentor); @@ -28,7 +28,7 @@ public static void main(String[] args) { private static boolean doesNotEachStudentSolveAllTasks(Student[] students) { boolean done = true; - for(Student student : students){ + for (Student student : students) { boolean d = student.isAreAllTasksDone(); done &= d; } diff --git a/StudentList/src/Mentor.java b/StudentList/src/Mentor.java index 430df9d..406ed5d 100644 --- a/StudentList/src/Mentor.java +++ b/StudentList/src/Mentor.java @@ -19,7 +19,7 @@ public boolean checkCode(Task task) { int number = Main.randomInt(0, 2000); if (number > 1000) { mood = true; - System.out.println("[" + task.getTask() + "] was checked by [" + getName() + "]") ; + System.out.println("[" + task.getTask() + "] was checked by [" + getName() + "]"); return true; } mood = false; diff --git a/StudentList/src/Student.java b/StudentList/src/Student.java index 971b4a3..396f728 100644 --- a/StudentList/src/Student.java +++ b/StudentList/src/Student.java @@ -36,7 +36,7 @@ public void solveTasks(Task[] tasks, int tasksToSolve) { // solvedTasks = 2 // tasksToSolve = 2 // [0] [1] [2] [3] [4] [5] - System.out.println("[" + getName() + "] already solved ["+solvedTasks+"] and ["+ tasksToSolve+"] new tasks to solve"); + System.out.println("[" + getName() + "] already solved [" + solvedTasks + "] and [" + tasksToSolve + "] new tasks to solve"); for (int i = solvedTasks; i < solvedTasks + tasksToSolve; i++) { solveTask(tasks[i]); diff --git a/StudentList/src/StudentStorage.java b/StudentList/src/StudentStorage.java deleted file mode 100644 index 3e95210..0000000 --- a/StudentList/src/StudentStorage.java +++ /dev/null @@ -1,31 +0,0 @@ -import java.util.HashMap; - -public class StudentStorage { - private HashMap storage; - - public StudentStorage() { - storage = new HashMap<>(); - } - - public void addStudent(String data) { - String[] components = data.split("\\s+"); - String name = components[0] + " " + components[1]; - storage.put(name, new Student(name, components[3], components[2])); - } - - public void listStudent() { - storage.values().forEach(System.out::println); - } - - public void removeStudent(String name) { - storage.remove(name); - } - - public Student getStudentByName(String name) { - return storage.get(name); - } - - public int getCount() { - return storage.size(); - } -} \ No newline at end of file