From 04d85c1530a6435b078d6cb8e13af285f56784fb Mon Sep 17 00:00:00 2001
From: "mr.Blue" <yashinsergey125@gmail.com>
Date: Sun, 16 Feb 2020 10:50:38 +0300
Subject: [PATCH 1/2] First task

---
 Lesson2/HomeWork/Task1/MeteoStation.java |  6 +++--
 Lesson2/HomeWork/Task1/ST500Info.java    | 28 +++++++++++++++++++++++-
 2 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/Lesson2/HomeWork/Task1/MeteoStation.java b/Lesson2/HomeWork/Task1/MeteoStation.java
index 822f885..23f40e8 100644
--- a/Lesson2/HomeWork/Task1/MeteoStation.java
+++ b/Lesson2/HomeWork/Task1/MeteoStation.java
@@ -1,10 +1,12 @@
-public class MeteoStation{
+public class MeteoStation{
 	public static void main(String[] args){
 		MeteoStore meteoDb = new MeteoStore();
 		
 		MeteoSensor ms200_1 = new MS200(1);
 		meteoDb.save(ms200_1);
+
+		MeteoSensor st500 = new ST500Info();
+		meteoDb.save(st500);
 		
-		// Здесь надо вызвать метод getData у класса ST500Info. Полученные данные отправить в метод save объекта meteoDb
 	}
 }
\ No newline at end of file
diff --git a/Lesson2/HomeWork/Task1/ST500Info.java b/Lesson2/HomeWork/Task1/ST500Info.java
index 72d2bff..6702f12 100644
--- a/Lesson2/HomeWork/Task1/ST500Info.java
+++ b/Lesson2/HomeWork/Task1/ST500Info.java
@@ -1,6 +1,6 @@
 import java.time.*;
 
-class ST500Info{
+class ST500Info implements MeteoSensor{
 	public SensorTemperature getData(){
 		return new SensorTemperature(){
 				public int identifier(){
@@ -21,4 +21,30 @@ public int second(){
 				}
 		};
 	}
+
+	@Override
+	public int getId() {
+		return getData().identifier();
+	}
+
+	@Override
+	public Float getTemperature() {
+		double temperature = getData().temperature();
+		return (float) temperature;
+	}
+
+	@Override
+	public Float getHumidity() {
+		return null;
+	}
+
+	@Override
+	public Float getPressure() {
+		return null;
+	}
+
+	@Override
+	public LocalDateTime getDateTime() {
+		return LocalDateTime.now();
+	}
 }
\ No newline at end of file

From c7a817cb12688399ebb46520f062116589c58125 Mon Sep 17 00:00:00 2001
From: "mr.Blue" <yashinsergey125@gmail.com>
Date: Sun, 16 Feb 2020 11:11:43 +0300
Subject: [PATCH 2/2] Second task

---
 Lesson2/HomeWork/Task2/DisplayReport.java | 10 ++++++++++
 Lesson2/HomeWork/Task2/Programm.java      | 10 ++++++++--
 Lesson2/HomeWork/Task2/Report.java        |  7 +++----
 Lesson2/HomeWork/Task2/ReportActions.java |  3 +++
 4 files changed, 24 insertions(+), 6 deletions(-)
 create mode 100644 Lesson2/HomeWork/Task2/DisplayReport.java
 create mode 100644 Lesson2/HomeWork/Task2/ReportActions.java

diff --git a/Lesson2/HomeWork/Task2/DisplayReport.java b/Lesson2/HomeWork/Task2/DisplayReport.java
new file mode 100644
index 0000000..d4f00c2
--- /dev/null
+++ b/Lesson2/HomeWork/Task2/DisplayReport.java
@@ -0,0 +1,10 @@
+public class DisplayReport implements ReportActions {
+
+    @Override
+    public void output(List<ReportItem> items) {
+        System.out.println("Output on display");
+        for(ReportItem item : items){
+            System.out.format("display %s - %f \n\r", item.getDescription(), item.getAmount());
+        }
+    }
+}
diff --git a/Lesson2/HomeWork/Task2/Programm.java b/Lesson2/HomeWork/Task2/Programm.java
index e124be3..9324a8c 100644
--- a/Lesson2/HomeWork/Task2/Programm.java
+++ b/Lesson2/HomeWork/Task2/Programm.java
@@ -1,7 +1,13 @@
 class Programm{
-	public static void main(String[] args){
+		public static void main(String[] args){
+		
+		ReportActions print = new PrintReport();
+		ReportActions display = new DisplayReport();
+
 		Report report = new Report();
 		report.calculate();
-		report.output();
+
+		report.output(print);
+		report.output(display);
 	}
 }
\ No newline at end of file
diff --git a/Lesson2/HomeWork/Task2/Report.java b/Lesson2/HomeWork/Task2/Report.java
index c6bf1ec..b15bd4c 100644
--- a/Lesson2/HomeWork/Task2/Report.java
+++ b/Lesson2/HomeWork/Task2/Report.java
@@ -1,4 +1,4 @@
-import java.util.*;
+import java.util.*;
 class Report{
 	private List<ReportItem> items;	// Отчетные данные
 	
@@ -9,8 +9,7 @@ public void calculate(){
 		items.add(new ReportItem("Second", (float)6));
 	}
 	
-	public void output(){
-		PrintReport reportPrint = new PrintReport();
-		reportPrint.output(items);
+	public void output(ReportActions actions){
+		actions.output(items);
 	}
 }
\ No newline at end of file
diff --git a/Lesson2/HomeWork/Task2/ReportActions.java b/Lesson2/HomeWork/Task2/ReportActions.java
new file mode 100644
index 0000000..629170c
--- /dev/null
+++ b/Lesson2/HomeWork/Task2/ReportActions.java
@@ -0,0 +1,3 @@
+public interface ReportActions {
+    void output(List<ReportItem> items);
+}