diff --git a/src/main/java/de/hdm_stuttgart/mi/sd1/weather/Forecast.java b/src/main/java/de/hdm_stuttgart/mi/sd1/weather/Forecast.java index ab3d5787705ce8c8e041cf426567e90bb7cb3a7e..50b7343bd62a5776311efeb5472a8956baab7e3a 100755 --- a/src/main/java/de/hdm_stuttgart/mi/sd1/weather/Forecast.java +++ b/src/main/java/de/hdm_stuttgart/mi/sd1/weather/Forecast.java @@ -23,8 +23,7 @@ public class Forecast { SearchingAndComparing.MethodSearchingAndComparing(); - - CopyToFile.CopyURLToFile("weatherCache\\" + SearchingAndComparing.GetID() + ".json"); + CopyToFile.CopyURLToFile("weatherCache\\" + SearchingAndComparing.GetID() + ".json"); CopyToFile.CopyFileToWeather(); diff --git a/src/main/java/de/hdm_stuttgart/mi/sd1/weather/model/CopyToFile.java b/src/main/java/de/hdm_stuttgart/mi/sd1/weather/model/CopyToFile.java index 470ca38ce1866ae5bd6a3553a284a29bfc5fd029..37e58421ef99e2ace167c252062e917cf6a0f193 100755 --- a/src/main/java/de/hdm_stuttgart/mi/sd1/weather/model/CopyToFile.java +++ b/src/main/java/de/hdm_stuttgart/mi/sd1/weather/model/CopyToFile.java @@ -9,7 +9,7 @@ import java.util.Calendar; public class CopyToFile { - public static String filePath; + static String filePath; public static void CopyURLToFile(String pathname) { @@ -41,10 +41,10 @@ public class CopyToFile { return weatherObject; } - public static long test() { + /* public static long test() { File fileTest = new File("weatherdata.json"); boolean ergebnis = fileTest.setLastModified(Calendar.getInstance().getTimeInMillis()); return fileTest.lastModified(); } - +*/ } \ No newline at end of file diff --git a/src/main/java/de/hdm_stuttgart/mi/sd1/weather/model/WeatherOutput.java b/src/main/java/de/hdm_stuttgart/mi/sd1/weather/model/WeatherOutput.java index 829557bb73735bd772cbfc1cf1d782ab9e31e859..b4dbbed152be8b7a65fddd341c112b404041bad4 100755 --- a/src/main/java/de/hdm_stuttgart/mi/sd1/weather/model/WeatherOutput.java +++ b/src/main/java/de/hdm_stuttgart/mi/sd1/weather/model/WeatherOutput.java @@ -15,22 +15,21 @@ public class WeatherOutput { for (int i = 0; i < weatherObject.getList().length - 1; i++) { - if ((weatherObject.getList()[i].getDtTxt().substring(11, 13).equals("00")) || i == 0 ) { + if ((weatherObject.getList()[i].getDtTxt().substring(11, 13).equals("00")) || i == 0) { System.out.println(weatherObject.getList()[i].getDtTxt().substring(0, 10)); } System.out.print(weatherObject.getList()[i].getDtTxt().substring(11, 13) + " Uhr: "); - // System.out.print(weatherObject.getList()[i].getDtTxt() + ": "); // output nicht wie bei Goik + // System.out.print(weatherObject.getList()[i].getDtTxt() + ": "); // output nicht wie bei Goik /* double timeStamp = weatherObject.getList()[i].getDt(); timeStamp = timeStamp; System.out.println(timeStamp); // January 1, 1970 00:00:00.000 GMT */ - Main MainWeatherData = weatherObject.getList()[i].getMain(); - System.out.print(Math.round(MainWeatherData.getTemp()) + "°C,"); - Clouds SkyCondition = weatherObject.getList()[i].getClouds(); - int SkyPercent = SkyCondition.getAll(); + System.out.print(Math.round(weatherObject.getList()[i].getMain().getTemp()) + "°C,"); + + int SkyPercent = weatherObject.getList()[i].getClouds().getAll(); if (SkyPercent < 25 && SkyPercent >= 0) { System.out.print(" Klarer Himmel" + "\n"); } else if (SkyPercent > 25 && SkyPercent < 50) {