diff --git a/src/de/deadlocker8/budgetmaster/main/Main.java b/src/de/deadlocker8/budgetmaster/main/Main.java
index 2c59fb7efc79105646a4401279ab53b193d16410..818daa0efe9b370f6457887988a83e9a688ceb1c 100644
--- a/src/de/deadlocker8/budgetmaster/main/Main.java
+++ b/src/de/deadlocker8/budgetmaster/main/Main.java
@@ -41,7 +41,7 @@ public class Main extends Application
}
catch(Exception e)
{
- Logger.log(LogLevel.ERROR, Logger.exceptionToString(e));
+ Logger.error(e);
}
}
@@ -50,15 +50,16 @@ public class Main extends Application
if(Arrays.asList(args).contains("debug"))
{
Logger.setLevel(LogLevel.ALL);
- Logger.log(LogLevel.INFO, "Running in Debug Mode");
+ Logger.info("Running in Debug Mode");
}
else
{
Logger.setLevel(LogLevel.ERROR);
}
- Logger.log(LogLevel.INFO, bundle.getString("app.name") + " - v" + bundle.getString("version.name") + " - (versioncode: " + bundle.getString("version.code") + ") from " + bundle.getString("version.date"));
-
+ Logger.appInfo(bundle.getString("app.name"), bundle.getString("version.name"), bundle.getString("version.code"), bundle.getString("version.date"));
+
launch(args);
}
+
}
\ No newline at end of file
diff --git a/src/de/deadlocker8/budgetmaster/ui/CategoryController.java b/src/de/deadlocker8/budgetmaster/ui/CategoryController.java
index 968316888eecfce8fcfac45f9e3ca161a248743b..413622a226caa0e82bfd862e6686638741cf1b62 100644
--- a/src/de/deadlocker8/budgetmaster/ui/CategoryController.java
+++ b/src/de/deadlocker8/budgetmaster/ui/CategoryController.java
@@ -24,7 +24,6 @@ import javafx.scene.layout.AnchorPane;
import javafx.stage.Modality;
import javafx.stage.Stage;
import javafx.util.Callback;
-import logger.LogLevel;
import logger.Logger;
public class CategoryController implements Refreshable
@@ -130,7 +129,7 @@ public class CategoryController implements Refreshable
}
catch(IOException e)
{
- Logger.log(LogLevel.ERROR, Logger.exceptionToString(e));
+ Logger.error(e);
}
}
diff --git a/src/de/deadlocker8/budgetmaster/ui/ColorView.java b/src/de/deadlocker8/budgetmaster/ui/ColorView.java
index 846235ada90bf4bc478890d10c7e4d01c5d4a26e..df4996921d05b3deee559ac1dfd0b92dfbed1171 100644
--- a/src/de/deadlocker8/budgetmaster/ui/ColorView.java
+++ b/src/de/deadlocker8/budgetmaster/ui/ColorView.java
@@ -101,7 +101,7 @@ public class ColorView extends GridPane
}
catch(Exception e)
{
- Logger.log(LogLevel.ERROR, Logger.exceptionToString(e));
+ Logger.error(e);
}
});
diff --git a/src/de/deadlocker8/budgetmaster/ui/Controller.java b/src/de/deadlocker8/budgetmaster/ui/Controller.java
index d13842f785116fff34aadb2094de7a7396bb6d36..b2570461174e25186f7c2ba8c87ddafd17cdf4ff 100644
--- a/src/de/deadlocker8/budgetmaster/ui/Controller.java
+++ b/src/de/deadlocker8/budgetmaster/ui/Controller.java
@@ -33,7 +33,6 @@ import javafx.scene.image.Image;
import javafx.scene.layout.AnchorPane;
import javafx.stage.Stage;
import javafx.util.Duration;
-import logger.LogLevel;
import logger.Logger;
import tools.AlertGenerator;
@@ -119,7 +118,7 @@ public class Controller implements Refreshable
catch(IOException e)
{
// ERRORHANDLING
- Logger.log(LogLevel.ERROR, Logger.exceptionToString(e));
+ Logger.error(e);
}
FontIcon iconPrevious = new FontIcon(FontIconType.CHEVRON_LEFT);
diff --git a/src/de/deadlocker8/budgetmaster/ui/NewPaymentController.java b/src/de/deadlocker8/budgetmaster/ui/NewPaymentController.java
index 44c2cb37bda7645df7c53544d94322c377cd8cd3..86b7357c0e8e11b66a04c1bb902d2e5abaae5a4f 100644
--- a/src/de/deadlocker8/budgetmaster/ui/NewPaymentController.java
+++ b/src/de/deadlocker8/budgetmaster/ui/NewPaymentController.java
@@ -30,7 +30,6 @@ import javafx.scene.control.TextField;
import javafx.scene.control.ToggleGroup;
import javafx.scene.paint.Color;
import javafx.stage.Stage;
-import logger.LogLevel;
import logger.Logger;
import tools.AlertGenerator;
import tools.ConvertTo;
@@ -276,7 +275,7 @@ public class NewPaymentController
}
catch(Exception e)
{
- Logger.log(LogLevel.ERROR, Logger.exceptionToString(e));
+ Logger.error(e);
controller.showConnectionErrorAlert();
}
}
@@ -290,7 +289,7 @@ public class NewPaymentController
}
catch(Exception e)
{
- Logger.log(LogLevel.ERROR, Logger.exceptionToString(e));
+ Logger.error(e);
controller.showConnectionErrorAlert();
}
}
@@ -316,7 +315,7 @@ public class NewPaymentController
}
catch(Exception e)
{
- Logger.log(LogLevel.ERROR, Logger.exceptionToString(e));
+ Logger.error(e);
controller.showConnectionErrorAlert();
}
}
@@ -330,7 +329,7 @@ public class NewPaymentController
}
catch(Exception e)
{
- Logger.log(LogLevel.ERROR, Logger.exceptionToString(e));
+ Logger.error(e);
controller.showConnectionErrorAlert();
}
}
diff --git a/src/de/deadlocker8/budgetmaster/ui/PaymentController.java b/src/de/deadlocker8/budgetmaster/ui/PaymentController.java
index d44cd935a990f9be07d948c3e6863e1fccf06741..f663082c9386ccdbeaad7d88ba119a436a304820 100644
--- a/src/de/deadlocker8/budgetmaster/ui/PaymentController.java
+++ b/src/de/deadlocker8/budgetmaster/ui/PaymentController.java
@@ -32,7 +32,6 @@ import javafx.scene.layout.AnchorPane;
import javafx.stage.Modality;
import javafx.stage.Stage;
import javafx.util.Callback;
-import logger.LogLevel;
import logger.Logger;
public class PaymentController implements Refreshable
@@ -152,7 +151,7 @@ public class PaymentController implements Refreshable
}
catch(IOException e)
{
- Logger.log(LogLevel.ERROR, Logger.exceptionToString(e));
+ Logger.error(e);
}
}
diff --git a/src/de/deadlocker8/budgetmasterserver/main/DatabaseHandler.java b/src/de/deadlocker8/budgetmasterserver/main/DatabaseHandler.java
index 236880714029d9c354e71c50f0a0fa3b02960111..05a55fd475a7308ba1b6fe7206f41a5808d1c3b0 100644
--- a/src/de/deadlocker8/budgetmasterserver/main/DatabaseHandler.java
+++ b/src/de/deadlocker8/budgetmasterserver/main/DatabaseHandler.java
@@ -19,7 +19,6 @@ import de.deadlocker8.budgetmaster.logic.NormalPayment;
import de.deadlocker8.budgetmaster.logic.RepeatingPayment;
import de.deadlocker8.budgetmaster.logic.RepeatingPaymentEntry;
import javafx.scene.paint.Color;
-import logger.LogLevel;
import logger.Logger;
import tools.ConvertTo;
@@ -36,7 +35,7 @@ public class DatabaseHandler
}
catch(Exception e)
{
- Logger.log(LogLevel.ERROR, Logger.exceptionToString(e));
+ Logger.error(e);
throw new IllegalStateException("Cannot connect the database!", e);
}
}
@@ -81,7 +80,7 @@ public class DatabaseHandler
}
catch(SQLException e)
{
- Logger.log(LogLevel.ERROR, Logger.exceptionToString(e));
+ Logger.error(e);
}
finally
{
@@ -143,7 +142,7 @@ public class DatabaseHandler
}
catch(SQLException e)
{
- Logger.log(LogLevel.ERROR, Logger.exceptionToString(e));
+ Logger.error(e);
}
finally
{
@@ -182,7 +181,7 @@ public class DatabaseHandler
}
catch(SQLException e)
{
- Logger.log(LogLevel.ERROR, Logger.exceptionToString(e));
+ Logger.error(e);
}
finally
{
@@ -221,7 +220,7 @@ public class DatabaseHandler
}
catch(SQLException e)
{
- Logger.log(LogLevel.ERROR, Logger.exceptionToString(e));
+ Logger.error(e);
}
finally
{
@@ -265,7 +264,7 @@ public class DatabaseHandler
// }
// catch(SQLException e)
// {
-// Logger.log(LogLevel.ERROR, Logger.exceptionToString(e));
+// Logger.error(e);
// }
// finally
// {
@@ -308,7 +307,7 @@ public class DatabaseHandler
}
catch(SQLException e)
{
- Logger.log(LogLevel.ERROR, Logger.exceptionToString(e));
+ Logger.error(e);
}
finally
{
@@ -351,7 +350,7 @@ public class DatabaseHandler
}
catch(SQLException e)
{
- Logger.log(LogLevel.ERROR, Logger.exceptionToString(e));
+ Logger.error(e);
}
finally
{
@@ -398,7 +397,7 @@ public class DatabaseHandler
}
catch(SQLException e)
{
- Logger.log(LogLevel.ERROR, Logger.exceptionToString(e));
+ Logger.error(e);
}
finally
{
@@ -444,7 +443,7 @@ public class DatabaseHandler
}
catch(SQLException e)
{
- Logger.log(LogLevel.ERROR, Logger.exceptionToString(e));
+ Logger.error(e);
}
finally
{
@@ -485,7 +484,7 @@ public class DatabaseHandler
}
catch(SQLException e)
{
- Logger.log(LogLevel.ERROR, Logger.exceptionToString(e));
+ Logger.error(e);
}
finally
{
@@ -529,7 +528,7 @@ public class DatabaseHandler
}
catch(SQLException e)
{
- Logger.log(LogLevel.ERROR, Logger.exceptionToString(e));
+ Logger.error(e);
}
finally
{
@@ -562,7 +561,7 @@ public class DatabaseHandler
}
catch(SQLException e)
{
- Logger.log(LogLevel.ERROR, Logger.exceptionToString(e));
+ Logger.error(e);
}
finally
{
@@ -590,7 +589,7 @@ public class DatabaseHandler
}
catch(SQLException e)
{
- Logger.log(LogLevel.ERROR, Logger.exceptionToString(e));
+ Logger.error(e);
}
finally
{
@@ -618,7 +617,7 @@ public class DatabaseHandler
}
catch(SQLException e)
{
- Logger.log(LogLevel.ERROR, Logger.exceptionToString(e));
+ Logger.error(e);
}
finally
{
@@ -649,7 +648,7 @@ public class DatabaseHandler
}
catch(SQLException e)
{
- Logger.log(LogLevel.ERROR, Logger.exceptionToString(e));
+ Logger.error(e);
}
finally
{
@@ -677,7 +676,7 @@ public class DatabaseHandler
}
catch(SQLException e)
{
- Logger.log(LogLevel.ERROR, Logger.exceptionToString(e));
+ Logger.error(e);
}
finally
{
@@ -716,7 +715,7 @@ public class DatabaseHandler
}
catch(SQLException e)
{
- Logger.log(LogLevel.ERROR, Logger.exceptionToString(e));
+ Logger.error(e);
}
finally
{
@@ -745,7 +744,7 @@ public class DatabaseHandler
}
catch(SQLException e)
{
- Logger.log(LogLevel.ERROR, Logger.exceptionToString(e));
+ Logger.error(e);
}
finally
{
@@ -776,7 +775,7 @@ public class DatabaseHandler
}
catch(SQLException e)
{
- Logger.log(LogLevel.ERROR, Logger.exceptionToString(e));
+ Logger.error(e);
}
finally
{
@@ -804,7 +803,7 @@ public class DatabaseHandler
}
catch(SQLException e)
{
- Logger.log(LogLevel.ERROR, Logger.exceptionToString(e));
+ Logger.error(e);
}
finally
{
diff --git a/src/de/deadlocker8/budgetmasterserver/server/updater/RepeatingPaymentUpdater.java b/src/de/deadlocker8/budgetmasterserver/server/updater/RepeatingPaymentUpdater.java
index a206cd4ff4812ef137179543610572e110126834..facd9aaf152d1e6a7b1dba4af98737cd8f5201b6 100644
--- a/src/de/deadlocker8/budgetmasterserver/server/updater/RepeatingPaymentUpdater.java
+++ b/src/de/deadlocker8/budgetmasterserver/server/updater/RepeatingPaymentUpdater.java
@@ -9,7 +9,6 @@ import org.joda.time.Months;
import de.deadlocker8.budgetmaster.logic.LatestRepeatingPayment;
import de.deadlocker8.budgetmaster.logic.RepeatingPayment;
import de.deadlocker8.budgetmasterserver.main.DatabaseHandler;
-import logger.LogLevel;
import logger.Logger;
public class RepeatingPaymentUpdater
@@ -68,7 +67,7 @@ public class RepeatingPaymentUpdater
}
catch(IllegalStateException ex)
{
- Logger.log(LogLevel.ERROR, Logger.exceptionToString(ex));
+ Logger.error(ex);
}
}