diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs
index 3a21537071bf4118b9e1ee864cb4bc258aa48211..a698e59674fc5acbc59d9c75892963a0115b7c26 100644
--- a/.settings/org.eclipse.jdt.core.prefs
+++ b/.settings/org.eclipse.jdt.core.prefs
@@ -1,5 +1,6 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
org.eclipse.jdt.core.compiler.compliance=1.8
diff --git a/src/charts/PieChartGenerator.java b/src/charts/PieChartGenerator.java
index 6269a0673bdb768fa62ff6e820c54966e82a5bf7..ec9f4f308cb96efa3b0c2cd4d344c3aeb626dc3f 100644
--- a/src/charts/PieChartGenerator.java
+++ b/src/charts/PieChartGenerator.java
@@ -11,6 +11,7 @@ import javafx.scene.Node;
import javafx.scene.chart.PieChart;
import javafx.scene.control.Tooltip;
import javafx.scene.input.MouseEvent;
+import tools.ConvertTo;
import core.LogObject;
import core.SQL;
@@ -51,7 +52,7 @@ public class PieChartGenerator
double percentage = (pieValue/total) * 100;
String percent = String.valueOf(percentage);
percent = percent.substring(0, percent.indexOf(".") + 2);
- String time = core.ConvertToTime.ConvertMillisToTime((long) pieValue);
+ String time = ConvertTo.ConvertMillisToTime((long) pieValue);
tooltip.setText(percent + " % \n" + time);
Tooltip.install(tool.getNode(), tooltip);
diff --git a/src/charts/SummaryGenerator.java b/src/charts/SummaryGenerator.java
index 842b13ef5504373a0ffbce6c5807d8b30af5abb2..91af6a918bece54363da32b3899d69e6e713d447 100644
--- a/src/charts/SummaryGenerator.java
+++ b/src/charts/SummaryGenerator.java
@@ -3,14 +3,14 @@ package charts;
import java.util.ArrayList;
import java.util.HashSet;
+import core.LogObject;
+import core.SQL;
import javafx.geometry.Insets;
import javafx.geometry.Pos;
import javafx.scene.control.Label;
import javafx.scene.layout.Priority;
import javafx.scene.layout.VBox;
-import core.ConvertToTime;
-import core.LogObject;
-import core.SQL;
+import tools.ConvertTo;
public class SummaryGenerator
{
@@ -49,7 +49,7 @@ public class SummaryGenerator
ArrayList<LogObject> objects = sql.getByProjectAndTask(project, task);
- Label labelTotalTime = new Label(ConvertToTime.ConvertMillisToTime(completeTime(objects)));
+ Label labelTotalTime = new Label(ConvertTo.ConvertMillisToTime(completeTime(objects)));
labelTotalTime.setStyle("-fx-font-size: 25;");
int days = workingDays(objects);
@@ -86,7 +86,7 @@ public class SummaryGenerator
ArrayList<LogObject> objects = sql.getByProjectAndTaskAndYear(project, task, year);
- Label labelTotalTime = new Label(ConvertToTime.ConvertMillisToTime(completeTime(objects)));
+ Label labelTotalTime = new Label(ConvertTo.ConvertMillisToTime(completeTime(objects)));
labelTotalTime.setStyle("-fx-font-size: 25;");
int days = workingDays(objects);
diff --git a/src/core/ConvertToTime.java b/src/core/ConvertToTime.java
deleted file mode 100644
index 850932cee5f755226735ea7516c9e16dea22e0d8..0000000000000000000000000000000000000000
--- a/src/core/ConvertToTime.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package core;
-
-/**
- * Klasse f�r die Umrechnung von Zeiten
- * @author Robert
- *
- */
-public class ConvertToTime
-{
- /**
- * Konvertiert Millisekunden in Stunden, Minuten und Sekunden
- * @param differenz long - Millisekunden
- * @return String - Stunden + Minuten + Sekunden
- */
- public static String ConvertMillisToTime(long differenz)
- {
- long sek = (differenz / 1000) % 60;
- long min = (differenz / (1000 * 60)) % 60;
- long hour = (differenz / (1000 * 60 * 60));
-
- return hour + " h " + min + " min " + sek + " sek";
- }
-
- /**
- * Berechnet die Differenz zwischen End- und Startzeit
- * @param start long - Startzeit in Millisekunden
- * @param end long - Endzeit in Millisekunden
- * @return long - Differenz
- */
- public static long CalculateDifference(long start, long end)
- {
- long difference = end - start;
-
- return difference;
- }
-}
\ No newline at end of file
diff --git a/src/core/Counter.java b/src/core/Counter.java
index baff59f5b40a54989297a61bec29623cc83f1520..aad65a54eb4dc334d38c5cda1f3668722217d30f 100644
--- a/src/core/Counter.java
+++ b/src/core/Counter.java
@@ -1,6 +1,7 @@
package core;
import javafx.application.Platform;
+import tools.ConvertTo;
import userInterface.UserInterfaceController;
/**
@@ -29,7 +30,7 @@ public class Counter extends Thread
//konvertiert die bereits verstrichenen Millisekunden in Stunden, Minuten und Sekunden
//und gibt diese auf dem Label aus
Platform.runLater(()->{
- uic.labelTime.setText(ConvertToTime.ConvertMillisToTime(ausgabe));
+ uic.labelTime.setText(ConvertTo.ConvertMillisToTime(ausgabe));
});
//schläft 1000 Millisekunden
diff --git a/src/core/LogObject.java b/src/core/LogObject.java
index 01b2fb6d180a586d9d3a518dff2744dcd62a8a35..dfd6da40c3bb37ea9569713a68ad5896ebd55273 100644
--- a/src/core/LogObject.java
+++ b/src/core/LogObject.java
@@ -3,6 +3,8 @@ package core;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
+import tools.ConvertTo;
+
/**
* Klasse "Logobject" - generiert Objekte, die alle wichtigen Eigenschaften für das Logfile enthalten
* @author Robert
@@ -38,7 +40,7 @@ public class LogObject
public String toString()
{
- return day + "." + month + "." + year + " " + startTime + " bis " + endTime + "\t" + project + "\t" + task +"\t" + duration + " (" + ConvertToTime.ConvertMillisToTime(duration)+ ")";
+ return day + "." + month + "." + year + " " + startTime + " bis " + endTime + "\t" + project + "\t" + task +"\t" + duration + " (" + ConvertTo.ConvertMillisToTime(duration)+ ")";
}
public void createStartTime()
diff --git a/src/core/LogObjectOld.java b/src/core/LogObjectOld.java
deleted file mode 100644
index 073c9a1f5c7c610b9f562e3243722d29ee5749d0..0000000000000000000000000000000000000000
--- a/src/core/LogObjectOld.java
+++ /dev/null
@@ -1,224 +0,0 @@
-package core;
-
-import java.text.SimpleDateFormat;
-import java.util.Calendar;
-import java.util.Date;
-
-/**
- * Klasse "Logobject" - generiert Objekte, die alle wichtigen Eigenschaften für das Logfile enthalten
- * @author Robert
- *
- */
-public class LogObjectOld
-{
- // Startzeit in Millisekunden
- private long starttime;
- // Startzeit als Uhrzeit
- private String startUhrzeit;
- // Endzeit in Millisekunden
- private long endtime;
- // Endzeit als Uhrzeit
- private String endUhrzeit;
- private String date;
- private String project;
- private String task;
- // Berechnete Differenz zwischen starttime und endtime
- private long differenz;
- // in Stunden, Minuten und Sekunden umgerechnete Differenz
- private String time;
-
- /**
- * Konstruktor nach dem Einlesen aus Datei (komplettes Objekt)
- * @param date String - Datum
- * @param start long - Startzeit in Millisekunden (Unixtime)
- * @param startUhrzeit String - Startuhrzeit
- * @param end long - Startzeit in Millisekunden (Unixtime)
- * @param endUhrzeit String- Enduhrzeit
- * @param project String - Projektname
- * @param task String - Aufgabenname
- * @param differenz long - verstrichene zeit in Millisekunden zwischen start und end
- * @param time String - Differenz umgerechnet in Stunden, Minuten und Sekunden
- */
- public LogObjectOld(String date, long start, String startUhrzeit, long end, String endUhrzeit, String project, String task, long differenz, String time)
- {
- this.date = date;
- starttime = start;
- this.startUhrzeit = startUhrzeit;
- endtime = end;
- this.endUhrzeit = endUhrzeit;
- this.project = project;
- this.task = task;
- this.differenz = differenz;
- this.time = time;
- }
-
- /**
- * leerer Konstruktor
- */
- public LogObjectOld()
- {
- }
-
- /**
- * toString für Ausgabe in Datei
- * @return String - date + starttime + endtime + startUhtzeit + endUhrzeit + project + task + differenz + time
- */
- public String toString()
- {
- return date + "\t" + starttime + "\t" + endtime + "\t" + startUhrzeit + "\t" + endUhrzeit + "\t" + project + "\t" + task + "\t" + differenz + "\t" + time;
- }
-
- /**
- * toString für Ausgabe im Programm
- * @return String - date + startUhtzeit + endUhrzeit + project + task + time
- */
- public String toString2()
- {
- return String.format("%-15s\t %-15s\t %-15s\t %-30s\t %-30s\t %s\t", date, startUhrzeit, endUhrzeit, project, task, time);
- }
-
- /**
- * erzeugt die Startzeit
- */
- public void createStarttime()
- {
- Calendar cal = Calendar.getInstance();
- starttime = cal.getTimeInMillis();
- startUhrzeit = new SimpleDateFormat("HH:mm:ss").format(new Date());
- }
-
- /**
- * erzeugt das Datum
- */
- public void createDate()
- {
- date = new SimpleDateFormat("dd-MM-yyyy").format(new Date());
- }
-
- /**
- * erzeugt die Endzeit
- */
- public void createEndtime()
- {
- Calendar cal = Calendar.getInstance();
- endtime = cal.getTimeInMillis();
- endUhrzeit = new SimpleDateFormat("HH:mm:ss").format(new Date());
- }
-
- /**
- * setzt das Projekt
- * @param p String - Projektname
- */
- public void setProject(String p)
- {
- project = p;
- }
-
- /**
- * setzt den Task
- * @param t String - Taskname
- */
- public void setTask(String t)
- {
- task = t;
- }
-
- /**
- * gibt den Projektnamen zurück
- * @return String - Projektname
- */
- public String getProject()
- {
- return project;
- }
-
- /**
- * gibt den Tasknamen zurück
- * @return String - Taskname
- */
- public String getTask()
- {
- return task;
- }
-
- /**
- * gibt die Differenz in Millisekundne zurück
- * @return long - Differenz
- */
- public long getDifferenz()
- {
- return differenz;
- }
-
- /**
- * gibt das Datum zurück
- * @return String - Datum
- */
- public String getDate()
- {
- return date;
- }
-
- /**
- * gibt die Startuhrzeit zurück
- * @return String - Startuhrzeit
- */
- public String getStartUhrzeit()
- {
- return startUhrzeit;
- }
-
- /**
- * gibt die Enduhrzeit zurück
- * @return String - Enduhrzeit
- */
- public String getEndUhrzeit()
- {
- return endUhrzeit;
- }
-
- /**
- * gibt die Differenz zurück
- * @return String - Differenz
- */
- public String getTime()
- {
- return time;
- }
-
- /**
- * setzt die Differenz
- * @param differenz long - Differenz
- */
- public void setDifferenz(long differenz)
- {
- this.differenz = differenz;
- }
-
- /**
- * gibt die Startuhrzeit zurück
- * @return String - Startuhrzeit
- */
- public long getStarttime()
- {
- return starttime;
- }
-
- /**
- * gibt die Enduhrzeit zurück
- * @return String - Enduhrzeit
- */
- public long getEndtime()
- {
- return endtime;
- }
-
- /**
- * setzt den Wert für die Differenz in Stunden, Minuten und Sekunden
- * @param time String - Zeit in der Form "Stunden + Minuten + Sekunden"
- */
- public void setTime(String time)
- {
- this.time = time;
- }
-}
\ No newline at end of file
diff --git a/src/core/ReadFromFile.java b/src/core/ReadFromFile.java
deleted file mode 100644
index e3d71513f555dc6afdd296c70923f690e722ef92..0000000000000000000000000000000000000000
--- a/src/core/ReadFromFile.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package core;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.util.ArrayList;
-
-/**
- * import old Logfiles
- * @author Robert
- *
- */
-public class ReadFromFile
-{
- public static void importFromSmartTime(File file)
- {
-
- }
-
- public static ArrayList<String> read(String directory) throws IOException
- {
- FileInputStream fis = new FileInputStream(directory + "/save.log");
- BufferedReader reader = new BufferedReader(new InputStreamReader(fis));
- ArrayList<String> list = new ArrayList<>();
-
- String line;
- while((line = reader.readLine()) != null)
- {
- list.add(line);
- }
-
- reader.close();
- return list;
- }
-}
\ No newline at end of file
diff --git a/src/userInterface/UserInterfaceController.java b/src/userInterface/UserInterfaceController.java
index 4976d5775ef81e1d4d63b799fb42263c9ef61713..af9a526f65a5eb3b0c9456a19a6ec8095ddbdbf4 100644
--- a/src/userInterface/UserInterfaceController.java
+++ b/src/userInterface/UserInterfaceController.java
@@ -13,7 +13,6 @@ import java.util.ResourceBundle;
import java.util.regex.Pattern;
import charts.ChartGUIController;
-import core.ConvertToTime;
import core.Exporter;
import core.Importer;
import core.LogObject;
@@ -58,6 +57,7 @@ import javafx.stage.Modality;
import javafx.stage.Stage;
import javafx.stage.WindowEvent;
import javafx.util.Callback;
+import tools.ConvertTo;
import tools.PathUtils;
@@ -409,7 +409,7 @@ public class UserInterfaceController
public ObservableValue<String> call(CellDataFeatures<LogObject, String> param)
{
StringProperty value = new SimpleStringProperty();
- value.set(ConvertToTime.ConvertMillisToTime(param.getValue().getDuration()));
+ value.set(ConvertTo.ConvertMillisToTime(param.getValue().getDuration()));
return value;
}
});
@@ -542,7 +542,7 @@ public class UserInterfaceController
total += current.getDuration();
}
- return ConvertToTime.ConvertMillisToTime(total);
+ return ConvertTo.ConvertMillisToTime(total);
}
public void insertTime()