From a4b250f10bbc0b5645cc1ad667b7b70f683069f6 Mon Sep 17 00:00:00 2001 From: KamaSK Date: Mon, 19 May 2025 12:24:59 +0300 Subject: [PATCH] =?UTF-8?q?=D0=A3=D0=BF=D1=80=D0=BE=D1=89=D0=B5=D0=BD=20?= =?UTF-8?q?=D0=B4=D0=BE=D1=81=D1=82=D1=83=D0=BF=20=D0=BA=20=D0=BC=D0=B5?= =?UTF-8?q?=D1=82=D0=BE=D0=B4=D0=B0=D0=BC=20=D0=B2=20=D0=BA=D0=BB=D0=B0?= =?UTF-8?q?=D1=81=D1=81=D0=B0=D1=85=20Task=20=D0=B8=20TodoApp,=20=D0=B8?= =?UTF-8?q?=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD=D1=8B=20=D0=BC=D0=BE=D0=B4?= =?UTF-8?q?=D0=B8=D1=84=D0=B8=D0=BA=D0=B0=D1=82=D0=BE=D1=80=D1=8B=20=D0=B4?= =?UTF-8?q?=D0=BE=D1=81=D1=82=D1=83=D0=BF=D0=B0=20=D1=81=20public=20=D0=BD?= =?UTF-8?q?=D0=B0=20private=20=D0=B4=D0=BB=D1=8F=20=D1=83=D0=BB=D1=83?= =?UTF-8?q?=D1=87=D1=88=D0=B5=D0=BD=D0=B8=D1=8F=20=D0=B8=D0=BD=D0=BA=D0=B0?= =?UTF-8?q?=D0=BF=D1=81=D1=83=D0=BB=D1=8F=D1=86=D0=B8=D0=B8.=20=D0=AD?= =?UTF-8?q?=D1=82=D0=BE=20=D0=BF=D0=BE=D0=B7=D0=B2=D0=BE=D0=BB=D1=8F=D0=B5?= =?UTF-8?q?=D1=82=20=D0=B7=D0=B0=D1=89=D0=B8=D1=82=D0=B8=D1=82=D1=8C=20?= =?UTF-8?q?=D0=B2=D0=BD=D1=83=D1=82=D1=80=D0=B5=D0=BD=D0=BD=D1=8E=D1=8E=20?= =?UTF-8?q?=D0=BB=D0=BE=D0=B3=D0=B8=D0=BA=D1=83=20=D0=BA=D0=BB=D0=B0=D1=81?= =?UTF-8?q?=D1=81=D0=BE=D0=B2=20=D0=BE=D1=82=20=D0=B2=D0=BD=D0=B5=D1=88?= =?UTF-8?q?=D0=BD=D0=B5=D0=B3=D0=BE=20=D0=B2=D0=BC=D0=B5=D1=88=D0=B0=D1=82?= =?UTF-8?q?=D0=B5=D0=BB=D1=8C=D1=81=D1=82=D0=B2=D0=B0=20=D0=B8=20=D1=83?= =?UTF-8?q?=D0=BB=D1=83=D1=87=D1=88=D0=B0=D0=B5=D1=82=20=D1=87=D0=B8=D1=82?= =?UTF-8?q?=D0=B0=D0=B5=D0=BC=D0=BE=D1=81=D1=82=D1=8C=20=D0=BA=D0=BE=D0=B4?= =?UTF-8?q?=D0=B0.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- todo/src/main/java/ru/kamask/pet/Task.java | 12 ++++++------ todo/src/main/java/ru/kamask/pet/TodoApp.java | 8 ++++---- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/todo/src/main/java/ru/kamask/pet/Task.java b/todo/src/main/java/ru/kamask/pet/Task.java index 6672d29..7d82d48 100644 --- a/todo/src/main/java/ru/kamask/pet/Task.java +++ b/todo/src/main/java/ru/kamask/pet/Task.java @@ -1,6 +1,6 @@ package ru.kamask.pet; -public class Task { +class Task { private int id; private String title; private String description; @@ -12,12 +12,12 @@ public class Task { this.description = description; } - public void printInfo() { + void printInfo() { String stringCompleted = completed ? "[х]" : "[ ]"; System.out.printf("%-3d | %-20s | %s\n", id, title, stringCompleted); } - public void printInfo(boolean full) { + void printInfo(boolean full) { if (!full) { printInfo(); return; @@ -38,15 +38,15 @@ public class Task { System.out.printf(template, id, stringCompleted, title, description); } - public void toggleCompleted() { + void toggleCompleted() { completed = !completed; } - public int getId() { + int getId() { return id; } - public boolean getCompleted() { + boolean getCompleted() { return completed; } } diff --git a/todo/src/main/java/ru/kamask/pet/TodoApp.java b/todo/src/main/java/ru/kamask/pet/TodoApp.java index 39301b7..1d97e13 100644 --- a/todo/src/main/java/ru/kamask/pet/TodoApp.java +++ b/todo/src/main/java/ru/kamask/pet/TodoApp.java @@ -13,7 +13,7 @@ public class TodoApp { displayMainMenu(); } - public static int requestIntFromInput(String template, int[] allowedInts) { + private static int requestIntFromInput(String template, int[] allowedInts) { do { System.out.print(template); int input; @@ -35,7 +35,7 @@ public class TodoApp { } while (true); } - public static void displayMainMenu() { + private static void displayMainMenu() { while (true) { String menu = """ @@ -126,7 +126,7 @@ public class TodoApp { } - public static Task getTaskById(int id) { + private static Task getTaskById(int id) { for (int i = 0; i < tasksCounter; i++) { if (tasks[i].getId() == id) return tasks[i]; @@ -134,7 +134,7 @@ public class TodoApp { return null; } - public static void displayTask(Task task) { + private static void displayTask(Task task) { task.printInfo(true); String firstOption = task.getCompleted() ? "[1]Не выполнено" : "[1]Выполнено"; int input = requestIntFromInput(firstOption + " [0]Главное меню\n\nВвод:",