diff --git a/country/ru/molokoin/Country.java b/country/ru/molokoin/Country.java deleted file mode 100644 index 1e6e6e0..0000000 --- a/country/ru/molokoin/Country.java +++ /dev/null @@ -1,44 +0,0 @@ -package country.ru.molokoin; - -public class Country extends Area{ - private Area capital; - - Country(String name, int population, int square, String capitalName, int capitalPopulation, int capitalSquare){ - this.init(name, population, square); - this.capital = new Area(); - getCapital().init(capitalName, capitalPopulation, capitalSquare); - } - public Country() { - } - public void init(String name, int population, int square, String capitalName, int capitalPopulation, int capitalSquare){ - - - /** - * setCapital(capitalName, capitalPopulation, capitalSquare); - setName(name); - setPopulation(population); - setSquare(square); - */ - - } - - - /** - * @param сapital the сapital to set - */ - public void setCapital(String name, int population, int square) { - this.capital = new Area(name, population, square); - } - - /** - * @return the сapital - */ - public Area getCapital() { - return capital; - } - - public static void main(String[] args) { - System.out.println("Country.main()"); - - } -} diff --git a/country/ru/molokoin/Map.java b/country/ru/molokoin/Map.java deleted file mode 100644 index 96d4838..0000000 --- a/country/ru/molokoin/Map.java +++ /dev/null @@ -1,17 +0,0 @@ -package country.ru.molokoin; - -public class Map { - private Country[] map = new Country[5]; - public void initDefaults(){ - map[0] = new Country(); - map[0].init("Russia", 17100000, 146700000, "Moscow", 12600000, 0); - } - public static void main(String[] args) { - System.out.println("App.main()"); - Map m = new Map(); - m.initDefaults(); - m.map[0].print(); - m.map[0].getCapital().print(); - - } -} diff --git a/country/ru/molokoin/Area.java b/country/src/main/java/ru/molokoin/Area.java similarity index 93% rename from country/ru/molokoin/Area.java rename to country/src/main/java/ru/molokoin/Area.java index 8f3bba0..35d3130 100644 --- a/country/ru/molokoin/Area.java +++ b/country/src/main/java/ru/molokoin/Area.java @@ -1,4 +1,4 @@ -package country.ru.molokoin; +package ru.molokoin; public class Area { private String name; diff --git a/country/src/main/java/ru/molokoin/Country.java b/country/src/main/java/ru/molokoin/Country.java new file mode 100644 index 0000000..0d99b03 --- /dev/null +++ b/country/src/main/java/ru/molokoin/Country.java @@ -0,0 +1,26 @@ +package ru.molokoin; + +public class Country extends Area{ + private Area capital; + + public Country() { + } + Country(String name, int population, int square, String capitalName, int capitalPopulation, int capitalSquare){ + this.init(name, population, square); + setCapital(new Area(capitalName, capitalPopulation, capitalSquare)); + } + + /** + * @param сapital the сapital to set + */ + public void setCapital(Area capital) { + this.capital = capital; + } + + /** + * @return the сapital + */ + public Area getCapital() { + return capital; + } +} diff --git a/country/src/main/java/ru/molokoin/Map.java b/country/src/main/java/ru/molokoin/Map.java new file mode 100644 index 0000000..65bc8ca --- /dev/null +++ b/country/src/main/java/ru/molokoin/Map.java @@ -0,0 +1,32 @@ +package ru.molokoin; + +public class Map { + private Country[] map = new Country[5]; + public void initDefaults(){ + System.out.println("map.length: " + map.length + " ..."); + //заполняем поля данными + map[0] = new Country("Russia", 17100000, 146700000, "Moscow", 12600000, 0); + map[1] = new Country("Russia", 17100000, 146700000, "Moscow", 12600000, 0); + map[2] = new Country("Russia", 17100000, 146700000, "Moscow", 12600000, 0); + map[3] = new Country("Russia", 17100000, 146700000, "Moscow", 12600000, 0); + map[4] = new Country("Russia", 17100000, 146700000, "Moscow", 12600000, 0); + } + public static void print(Country[] map){ + System.out.println("Количество государств, данные о которых включены в terra: " + map.length); + int i = 0; + while (i < map.length) { + System.out.println("-------------------------------------------"); + map[i].print(); + map[i].getCapital().print(); + System.out.println("-------------------------------------------"); + i++; + } + + } + public static void main(String[] args) { + System.out.println("App.main()"); + Map terra = new Map(); + terra.initDefaults(); + print(terra.map); + } +} diff --git a/country/target/classes/ru/molokoin/Area.class b/country/target/classes/ru/molokoin/Area.class new file mode 100644 index 0000000..77a38b1 Binary files /dev/null and b/country/target/classes/ru/molokoin/Area.class differ diff --git a/country/target/classes/ru/molokoin/Country.class b/country/target/classes/ru/molokoin/Country.class new file mode 100644 index 0000000..8645ca3 Binary files /dev/null and b/country/target/classes/ru/molokoin/Country.class differ diff --git a/country/target/classes/ru/molokoin/Map.class b/country/target/classes/ru/molokoin/Map.class new file mode 100644 index 0000000..c17d921 Binary files /dev/null and b/country/target/classes/ru/molokoin/Map.class differ