Hw 2

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
 	}
 }

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();
+	}
 }

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());
+        }
+    }
+}

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);
 	}
 }

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);
 	}
 }

Lesson2/HomeWork/Task2/ReportActions.java

@@ -0,0 +1,3 @@
+public interface ReportActions {
+    void output(List<ReportItem> items);
+}