diff --git a/book/src/main/java/ru/molokoin/Book.java b/book/src/main/java/ru/molokoin/Book.java index 937d17b..f8b2fab 100644 --- a/book/src/main/java/ru/molokoin/Book.java +++ b/book/src/main/java/ru/molokoin/Book.java @@ -98,7 +98,7 @@ public class Book { throw new NullPointerException("в случае, если массив authors еще не создан и писать нового автора некуда, создаем пустой массив, пишем в него данные нового автора ..."); } catch (NullPointerException e) { //e.printStackTrace(); - System.out.println(e); + System.out.println(e.getMessage()); result = new String[1]; result[0] = author; setAuthors(result); diff --git a/book/target/classes/ru/molokoin/Book.class b/book/target/classes/ru/molokoin/Book.class index 42f9f1a..eeaaba2 100644 Binary files a/book/target/classes/ru/molokoin/Book.class and b/book/target/classes/ru/molokoin/Book.class differ diff --git a/practice/src/main/java/ru/molokoin/App.java b/practice/src/main/java/ru/molokoin/App.java index a0cf042..e98cee2 100644 --- a/practice/src/main/java/ru/molokoin/App.java +++ b/practice/src/main/java/ru/molokoin/App.java @@ -1,6 +1,11 @@ package ru.molokoin; + public class App { public static void main(String[] args) { - System.out.println("qq"); + //int[] array = {10, 2, 120,324,8,0}; + Person[] array = new Person[2]; + array[0] = new Person("Ivan", "Ivanov"); + array[1] = new Soldier("Aleksey", "Alekseev", MilitarySpeciality.GUNLAYER); + array[1].toString(); } } diff --git a/practice/src/main/java/ru/molokoin/Employe.java b/practice/src/main/java/ru/molokoin/Employe.java new file mode 100644 index 0000000..0f32a92 --- /dev/null +++ b/practice/src/main/java/ru/molokoin/Employe.java @@ -0,0 +1,5 @@ +package ru.molokoin; + +public class Employe { + +} diff --git a/practice/src/main/java/ru/molokoin/MilitarySpeciality.java b/practice/src/main/java/ru/molokoin/MilitarySpeciality.java new file mode 100644 index 0000000..f9c4724 --- /dev/null +++ b/practice/src/main/java/ru/molokoin/MilitarySpeciality.java @@ -0,0 +1,9 @@ +package ru.molokoin; + +public enum MilitarySpeciality { + RADIOOPERATOR, + TANKMAN, + GUNLAYER, + DRIVER; + +} diff --git a/practice/src/main/java/ru/molokoin/Person.java b/practice/src/main/java/ru/molokoin/Person.java new file mode 100644 index 0000000..c20b801 --- /dev/null +++ b/practice/src/main/java/ru/molokoin/Person.java @@ -0,0 +1,27 @@ +package ru.molokoin; + +public class Person { + private String firstname; + private String lastname; + public Person(String firstname, String lastname){ + setFirstname(firstname); + setLastname(lastname); + } + + public String getFirstname() { + return firstname; + } + public void setFirstname(String firstname) { + this.firstname = firstname; + } + public String getLastname() { + return lastname; + } + public void setLastname(String lastname) { + this.lastname = lastname; + } + @Override + public String toString(){ + return "firstname: " + getFirstname() + " : " + "Lastname: " + getLastname(); + } +} diff --git a/practice/src/main/java/ru/molokoin/Soldier.java b/practice/src/main/java/ru/molokoin/Soldier.java new file mode 100644 index 0000000..58df2ce --- /dev/null +++ b/practice/src/main/java/ru/molokoin/Soldier.java @@ -0,0 +1,16 @@ +package ru.molokoin; + +public class Soldier extends Person{ + private MilitarySpeciality militarySpeciality; + public Soldier(String firstname, String lastname, MilitarySpeciality militarySpeciality){ + super(firstname, lastname); + setMilitarySpeciality(militarySpeciality); + + } + public MilitarySpeciality getMilitarySpeciality() { + return militarySpeciality; + } + public void setMilitarySpeciality(MilitarySpeciality militarySpeciality) { + this.militarySpeciality = militarySpeciality; + } +} diff --git a/practice/target/classes/ru/molokoin/App.class b/practice/target/classes/ru/molokoin/App.class index fb4e1e4..3e11983 100644 Binary files a/practice/target/classes/ru/molokoin/App.class and b/practice/target/classes/ru/molokoin/App.class differ diff --git a/practice/target/classes/ru/molokoin/Employe.class b/practice/target/classes/ru/molokoin/Employe.class new file mode 100644 index 0000000..5345f99 Binary files /dev/null and b/practice/target/classes/ru/molokoin/Employe.class differ diff --git a/practice/target/classes/ru/molokoin/MilitarySpeciality.class b/practice/target/classes/ru/molokoin/MilitarySpeciality.class new file mode 100644 index 0000000..fdc792a Binary files /dev/null and b/practice/target/classes/ru/molokoin/MilitarySpeciality.class differ diff --git a/practice/target/classes/ru/molokoin/Person.class b/practice/target/classes/ru/molokoin/Person.class new file mode 100644 index 0000000..5d91567 Binary files /dev/null and b/practice/target/classes/ru/molokoin/Person.class differ diff --git a/practice/target/classes/ru/molokoin/Soldier.class b/practice/target/classes/ru/molokoin/Soldier.class new file mode 100644 index 0000000..7e2b76d Binary files /dev/null and b/practice/target/classes/ru/molokoin/Soldier.class differ