diff --git a/build.gradle b/build.gradle index ed0d18c..d584d6d 100644 --- a/build.gradle +++ b/build.gradle @@ -9,17 +9,6 @@ repositories { mavenCentral() } -sourceSets { - main { - java { - srcDirs = ['src'] - } - } - test{ - java{ - } - } -} dependencies { testImplementation platform('org.junit:junit-bom:5.10.0') diff --git a/src/ru/mentee/power/Calculator.java b/src/main/java/ru/mentee/power/Calculator.java similarity index 100% rename from src/ru/mentee/power/Calculator.java rename to src/main/java/ru/mentee/power/Calculator.java diff --git a/src/ru/mentee/power/CurrencyConverter.java b/src/main/java/ru/mentee/power/CurrencyConverter.java similarity index 100% rename from src/ru/mentee/power/CurrencyConverter.java rename to src/main/java/ru/mentee/power/CurrencyConverter.java diff --git a/src/ru/mentee/power/DataTypeBoundaries.java b/src/main/java/ru/mentee/power/DataTypeBoundaries.java similarity index 100% rename from src/ru/mentee/power/DataTypeBoundaries.java rename to src/main/java/ru/mentee/power/DataTypeBoundaries.java diff --git a/src/ru/mentee/power/DataTypesInAction.java b/src/main/java/ru/mentee/power/DataTypesInAction.java similarity index 100% rename from src/ru/mentee/power/DataTypesInAction.java rename to src/main/java/ru/mentee/power/DataTypesInAction.java diff --git a/src/ru/mentee/power/Greeting.java b/src/main/java/ru/mentee/power/Greeting.java similarity index 100% rename from src/ru/mentee/power/Greeting.java rename to src/main/java/ru/mentee/power/Greeting.java diff --git a/src/ru/mentee/power/HelloGit.java b/src/main/java/ru/mentee/power/HelloGit.java similarity index 100% rename from src/ru/mentee/power/HelloGit.java rename to src/main/java/ru/mentee/power/HelloGit.java diff --git a/src/ru/mentee/power/HelloWorld.java b/src/main/java/ru/mentee/power/HelloWorld.java similarity index 100% rename from src/ru/mentee/power/HelloWorld.java rename to src/main/java/ru/mentee/power/HelloWorld.java diff --git a/src/ru/mentee/power/SmartCalculator.java b/src/main/java/ru/mentee/power/SmartCalculator.java similarity index 100% rename from src/ru/mentee/power/SmartCalculator.java rename to src/main/java/ru/mentee/power/SmartCalculator.java diff --git a/src/ru/mentee/power/TypePuzzle.java b/src/main/java/ru/mentee/power/TypePuzzle.java similarity index 100% rename from src/ru/mentee/power/TypePuzzle.java rename to src/main/java/ru/mentee/power/TypePuzzle.java diff --git a/src/main/java/ru/mentee/power/datatype/Mentee.java b/src/main/java/ru/mentee/power/datatype/Mentee.java new file mode 100644 index 0000000..0447224 --- /dev/null +++ b/src/main/java/ru/mentee/power/datatype/Mentee.java @@ -0,0 +1,69 @@ +package ru.mentee.power.datatype; + +public class Mentee { + private String name; + private String surname; + private int age; + private double avgGrade; + private int level; + + public Mentee(String name, String surname, int age, double avgGrade, int level) { + this.name = name; + this.surname = surname; + this.age = age; + this.avgGrade = avgGrade; + this.level = level > 5 || level < 1 ? 1 : level; + } + + public void displayInfo() { + System.out.printf("Менти: %s %s\n Возраст: %d\n Средний балл: %f\n Уровень: %d\n" + , this.name, this.surname, this.age, this.avgGrade, this.level); + + } + + public boolean isExcellent() { + return avgGrade >= 4.5; + } + + public boolean advanceToNextLevel() { + if (level < 5) { + level++; + return true; + } + return false; + } + + public int calculateScholarship() { + if (avgGrade >= 4.5) + return 2000; + else if (avgGrade >= 4.0) + return 1500; + else return 1000; + } + + // Геттеры и сеттеры для доступа к приватным полям + public String getFirstName() { + return name; + } + + public String getLastName() { + return surname; + } + + public int getAge() { + return age; + } + + public double getAverageGrade() { + return avgGrade; + } + + public void setAverageGrade(double averageGrade) { + this.avgGrade = averageGrade; + } + + public int getLevel() { + return level; + } + +} diff --git a/src/main/java/ru/mentee/power/datatype/MenteeDemo.java b/src/main/java/ru/mentee/power/datatype/MenteeDemo.java new file mode 100644 index 0000000..ac294ff --- /dev/null +++ b/src/main/java/ru/mentee/power/datatype/MenteeDemo.java @@ -0,0 +1,22 @@ +package ru.mentee.power.datatype; + +import java.util.ArrayList; +import java.util.List; + +public class MenteeDemo { + public static void main(String[] args) { + List menteeList = new ArrayList<>(); + + menteeList.add( new Mentee("Alexandr", "Poltavets", 25, 4.7, 1)); + menteeList.add(new Mentee("Ivan", "Ivanov", 23, 3.5, 2)); + menteeList.add( new Mentee("Sveta", "Igoreva", 27, 4.1, 3)); + + for (Mentee mentee : menteeList){ + mentee.displayInfo(); + System.out.printf("%s является отличником? %b\n", mentee.getFirstName(), mentee.isExcellent()); + mentee.advanceToNextLevel(); + } + + + } +} diff --git a/src/ru/mentee/power/datatypes/DataTypesExample.java b/src/main/java/ru/mentee/power/datatypes/DataTypesExample.java similarity index 100% rename from src/ru/mentee/power/datatypes/DataTypesExample.java rename to src/main/java/ru/mentee/power/datatypes/DataTypesExample.java diff --git a/src/ru/mentee/power/variables/ConstantsAndScope.java b/src/main/java/ru/mentee/power/variables/ConstantsAndScope.java similarity index 100% rename from src/ru/mentee/power/variables/ConstantsAndScope.java rename to src/main/java/ru/mentee/power/variables/ConstantsAndScope.java diff --git a/src/ru/mentee/power/variables/PersonalCard.java b/src/main/java/ru/mentee/power/variables/PersonalCard.java similarity index 100% rename from src/ru/mentee/power/variables/PersonalCard.java rename to src/main/java/ru/mentee/power/variables/PersonalCard.java diff --git a/src/ru/mentee/power/variables/StringOperations.java b/src/main/java/ru/mentee/power/variables/StringOperations.java similarity index 100% rename from src/ru/mentee/power/variables/StringOperations.java rename to src/main/java/ru/mentee/power/variables/StringOperations.java diff --git a/src/ru/mentee/power/variables/TemperatureConverter.java b/src/main/java/ru/mentee/power/variables/TemperatureConverter.java similarity index 100% rename from src/ru/mentee/power/variables/TemperatureConverter.java rename to src/main/java/ru/mentee/power/variables/TemperatureConverter.java diff --git a/src/ru/mentee/power/variables/TypeCalculator.java b/src/main/java/ru/mentee/power/variables/TypeCalculator.java similarity index 100% rename from src/ru/mentee/power/variables/TypeCalculator.java rename to src/main/java/ru/mentee/power/variables/TypeCalculator.java diff --git a/src/ru/mentee/power/variables/Variables.java b/src/main/java/ru/mentee/power/variables/Variables.java similarity index 100% rename from src/ru/mentee/power/variables/Variables.java rename to src/main/java/ru/mentee/power/variables/Variables.java