diff --git a/country/src/main/java/ru/molokoin/Area.java b/country/src/main/java/ru/molokoin/Area.java index 7671d74..1ddfc0a 100644 --- a/country/src/main/java/ru/molokoin/Area.java +++ b/country/src/main/java/ru/molokoin/Area.java @@ -12,10 +12,10 @@ public class Area { //Area (Object name, Object population, Object square){} } - Area(String name, int population, int square){ + Area(Object name, int population, int square){ init(name, population, square); } - public void init(String name, int population, int square){ + public void init(Object name, int population, int square){ setName(name); setPopulation(population); setSquare(square); @@ -28,20 +28,29 @@ public class Area { /** * @param name the name to set */ - public void setName(String name) { + public void setName(Object name) { + //преобразование Object try { - if(name == "")throw new IllegalArgumentException(name); + if (name == null) throw new NullPointerException(getName()); + } catch (Exception e) { + System.out.println("Наименвание не должно быть пустым. "); + e.printStackTrace(); + this.name = ""; + } + try { + if((String)name == "")throw new IllegalArgumentException((String)name); } catch (IllegalArgumentException e) { System.out.println("Наименвание не должно быть пустым. "); e.printStackTrace(); - this.name = name; + this.name = ""; } - this.name = name; + if (name != null) this.name = (String)name; } /** * @param population the population to set */ public void setPopulation(int population) { + //население не может быть отрицательным if (population < 0) throw new IllegalArgumentException("Население не может быть отрицательным ..."); this.population = population; diff --git a/country/src/main/java/ru/molokoin/Conversion.java b/country/src/main/java/ru/molokoin/Conversion.java new file mode 100644 index 0000000..b2706d9 --- /dev/null +++ b/country/src/main/java/ru/molokoin/Conversion.java @@ -0,0 +1,24 @@ +package ru.molokoin; + +public class Conversion { + /** + * Проверяем содержимое объекта. + * + * @param object + * @return + */ + public static Object checknull(Object object){ + Object result = new Object(); + if (object == null)throw new NullPointerException("Обнаружено пустое поле данных ..."); + + return (Object)result; + } + public static int toint(Object object){ + String s = (String) object; + return Integer.parseInt(s); + } + public static String toString(Object object){ + + return ""; + } +} diff --git a/country/src/main/java/ru/molokoin/Map.java b/country/src/main/java/ru/molokoin/Map.java index c5dbd7b..af12201 100644 --- a/country/src/main/java/ru/molokoin/Map.java +++ b/country/src/main/java/ru/molokoin/Map.java @@ -28,7 +28,7 @@ public class Map { } } public static void main(String[] args) { - System.out.println("App.main()"); + System.out.println("Map.main()"); Map terra = new Map(); terra.initDefaults(); printAll(terra.map); diff --git a/country/target/classes/ru/molokoin/Area.class b/country/target/classes/ru/molokoin/Area.class index 3b8f2fa..513758e 100644 Binary files a/country/target/classes/ru/molokoin/Area.class and b/country/target/classes/ru/molokoin/Area.class differ diff --git a/country/target/classes/ru/molokoin/Conversion.class b/country/target/classes/ru/molokoin/Conversion.class new file mode 100644 index 0000000..4ff1b4f Binary files /dev/null and b/country/target/classes/ru/molokoin/Conversion.class differ diff --git a/country/target/classes/ru/molokoin/Country.class b/country/target/classes/ru/molokoin/Country.class index 128210a..9d18c28 100644 Binary files a/country/target/classes/ru/molokoin/Country.class 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 index f6ef87f..0e476c0 100644 Binary files a/country/target/classes/ru/molokoin/Map.class and b/country/target/classes/ru/molokoin/Map.class differ