diff --git a/src/de/deadlocker8/budgetmaster/logic/Category.java b/src/de/deadlocker8/budgetmaster/logic/Category.java
index 96a2f3df86918678577bb9eb579b55cef78a7d72..8c958bd05423425d659b10231613d6b0d6155922 100644
--- a/src/de/deadlocker8/budgetmaster/logic/Category.java
+++ b/src/de/deadlocker8/budgetmaster/logic/Category.java
@@ -1,22 +1,21 @@
package de.deadlocker8.budgetmaster.logic;
import de.deadlocker8.budgetmaster.logic.utils.Strings;
-import javafx.scene.paint.Color;
import tools.Localization;
public class Category
{
private int ID;
private String name;
- private Color color;
+ private String color;
- public Category(String name, Color color)
+ public Category(String name, String color)
{
this.name = name;
this.color = color;
}
- public Category(int ID, String name, Color color)
+ public Category(int ID, String name, String color)
{
this.ID = ID;
this.name = name;
@@ -43,12 +42,12 @@ public class Category
this.name = name;
}
- public Color getColor()
+ public String getColor()
{
return color;
}
- public void setColor(Color color)
+ public void setColor(String color)
{
this.color = color;
}
diff --git a/src/de/deadlocker8/budgetmaster/logic/CategoryHandler.java b/src/de/deadlocker8/budgetmaster/logic/CategoryHandler.java
index f47381e8b532c95ef8ca079fe480bb610b095587..5c9ff472c8e7b5f707c43c962617c062ad71c4f8 100644
--- a/src/de/deadlocker8/budgetmaster/logic/CategoryHandler.java
+++ b/src/de/deadlocker8/budgetmaster/logic/CategoryHandler.java
@@ -2,8 +2,6 @@ package de.deadlocker8.budgetmaster.logic;
import java.util.ArrayList;
-import javafx.scene.paint.Color;
-
public class CategoryHandler
{
private ArrayList<Category> categories;
@@ -32,6 +30,6 @@ public class CategoryHandler
}
}
- return new Category(1, "NONE", Color.web("#FFFFFF"));
+ return new Category(1, "NONE", "#FFFFFF");
}
}
\ No newline at end of file
diff --git a/src/de/deadlocker8/budgetmaster/logic/CategoryInOutSum.java b/src/de/deadlocker8/budgetmaster/logic/CategoryInOutSum.java
index 68246434d14a3c5bd8d99cad3086890b6f41d838..5c9d569eee2847d48417a9cc0caee7a5ad5d0e4d 100644
--- a/src/de/deadlocker8/budgetmaster/logic/CategoryInOutSum.java
+++ b/src/de/deadlocker8/budgetmaster/logic/CategoryInOutSum.java
@@ -1,18 +1,17 @@
package de.deadlocker8.budgetmaster.logic;
import de.deadlocker8.budgetmaster.logic.utils.Strings;
-import javafx.scene.paint.Color;
import tools.Localization;
public class CategoryInOutSum
{
private int ID;
private String name;
- private Color color;
+ private String color;
private int budgetIN;
private int budgetOUT;
- public CategoryInOutSum(int ID, String name, Color color, int budgetIN, int budgetOUT)
+ public CategoryInOutSum(int ID, String name, String color, int budgetIN, int budgetOUT)
{
this.ID = ID;
this.name = name;
@@ -36,12 +35,12 @@ public class CategoryInOutSum
this.name = name;
}
- public Color getColor()
+ public String getColor()
{
return color;
}
- public void setColor(Color color)
+ public void setColor(String color)
{
this.color = color;
}
diff --git a/src/de/deadlocker8/budgetmaster/logic/charts/CategoriesChart.java b/src/de/deadlocker8/budgetmaster/logic/charts/CategoriesChart.java
index 22f940ec511d762fc2cacc72ddde39fd725fff8c..6668f410c097cd11eb64d7764bbf306f87be0057 100644
--- a/src/de/deadlocker8/budgetmaster/logic/charts/CategoriesChart.java
+++ b/src/de/deadlocker8/budgetmaster/logic/charts/CategoriesChart.java
@@ -88,7 +88,7 @@ public class CategoriesChart extends VBox implements ChartExportable
for(CategoryInOutSum currentItem : categoryInOutSums)
{
Label currentPart = new Label();
- currentPart.setStyle("-fx-background-color: " + ConvertTo.toRGBHexWithoutOpacity(currentItem.getColor()));
+ currentPart.setStyle("-fx-background-color: " + currentItem.getColor());
currentPart.prefHeightProperty().bind(chart.heightProperty());
chart.getChildren().add(currentPart);
@@ -137,7 +137,7 @@ public class CategoriesChart extends VBox implements ChartExportable
ArrayList<HBox> legendItems = new ArrayList<>();
for(CategoryInOutSum currentItem : categoryInOutSums)
{
- legendItems.add(getLegendItem(currentItem.getName(), currentItem.getColor()));
+ legendItems.add(getLegendItem(currentItem.getName(), Color.web(currentItem.getColor())));
}
int legendWidth;
@@ -213,7 +213,7 @@ public class CategoriesChart extends VBox implements ChartExportable
Label labelCircle = new Label();
labelCircle.setMinWidth(20);
labelCircle.setMinHeight(20);
- labelCircle.setStyle("-fx-background-color: " + ConvertTo.toRGBHexWithoutOpacity(currentItem.getColor()) + "; -fx-background-radius: 50%; -fx-border-width: 1; -fx-border-color: black - fx-border-radius: 50%");
+ labelCircle.setStyle("-fx-background-color: " + currentItem.getColor() + "; -fx-background-radius: 50%; -fx-border-width: 1; -fx-border-color: black - fx-border-radius: 50%");
vboxCircles.getChildren().add(labelCircle);
Label labelName = new Label(currentItem.getName());
diff --git a/src/de/deadlocker8/budgetmaster/logic/charts/MonthBarChart.java b/src/de/deadlocker8/budgetmaster/logic/charts/MonthBarChart.java
index 98e20266e63c92a4b0e51ccaceaaef6d562ef645..4a0cef86ecea45aafbf1395feee06142dfb01dec 100644
--- a/src/de/deadlocker8/budgetmaster/logic/charts/MonthBarChart.java
+++ b/src/de/deadlocker8/budgetmaster/logic/charts/MonthBarChart.java
@@ -118,7 +118,7 @@ public class MonthBarChart extends VBox implements ChartExportable
for(CategoryInOutSum currentItem : categoryInOutSums)
{
Label currentPart = new Label();
- currentPart.setStyle("-fx-background-color: " + ConvertTo.toRGBHexWithoutOpacity(currentItem.getColor()));
+ currentPart.setStyle("-fx-background-color: " + currentItem.getColor());
currentPart.prefWidthProperty().bind(chart.widthProperty());
chart.getChildren().add(currentPart);
@@ -168,7 +168,7 @@ public class MonthBarChart extends VBox implements ChartExportable
ArrayList<HBox> legendItems = new ArrayList<>();
for(CategoryInOutSum currentItem : monthInOutSums.get(0).getSums())
{
- legendItems.add(getLegendItem(currentItem.getName(), currentItem.getColor()));
+ legendItems.add(getLegendItem(currentItem.getName(), Color.web(currentItem.getColor())));
}
int legendWidth;
diff --git a/src/de/deadlocker8/budgetmaster/logic/serverconnection/ServerConnection.java b/src/de/deadlocker8/budgetmaster/logic/serverconnection/ServerConnection.java
index a7edd958d9496f077f0854b01f9f9b5072fdf4c2..77f4a74d47d2d33bcdcffdb4b4afd0b56c21c7af 100644
--- a/src/de/deadlocker8/budgetmaster/logic/serverconnection/ServerConnection.java
+++ b/src/de/deadlocker8/budgetmaster/logic/serverconnection/ServerConnection.java
@@ -28,8 +28,7 @@ import de.deadlocker8.budgetmaster.logic.RepeatingPayment;
import de.deadlocker8.budgetmaster.logic.RepeatingPaymentEntry;
import de.deadlocker8.budgetmaster.logic.Settings;
import de.deadlocker8.budgetmaster.logic.utils.Helpers;
-import de.deadlocker8.budgetmasterserver.logic.Database;
-import tools.ConvertTo;
+import de.deadlocker8.budgetmasterserver.logic.database.Database;
import tools.Read;
public class ServerConnection
@@ -112,7 +111,7 @@ public class ServerConnection
public void addCategory(Category category) throws Exception
{
- URL url = new URL(settings.getUrl() + "/category?secret=" + Helpers.getURLEncodedString(settings.getSecret()) + "&name=" + Helpers.getURLEncodedString(category.getName()) + "&color=" + ConvertTo.toRGBHexWithoutOpacity(category.getColor()).replace("#", ""));
+ URL url = new URL(settings.getUrl() + "/category?secret=" + Helpers.getURLEncodedString(settings.getSecret()) + "&name=" + Helpers.getURLEncodedString(category.getName()) + "&color=" + category.getColor().replace("#", ""));
HttpsURLConnection httpsCon = (HttpsURLConnection)url.openConnection();
httpsCon.setRequestMethod("POST");
httpsCon.setDoInput(true);
@@ -130,7 +129,7 @@ public class ServerConnection
public void updateCategory(Category category) throws Exception
{
- URL url = new URL(settings.getUrl() + "/category?secret=" + Helpers.getURLEncodedString(settings.getSecret()) + "&id=" + category.getID() + "&name=" + Helpers.getURLEncodedString(category.getName()) + "&color=" + ConvertTo.toRGBHexWithoutOpacity(category.getColor()).replace("#", ""));
+ URL url = new URL(settings.getUrl() + "/category?secret=" + Helpers.getURLEncodedString(settings.getSecret()) + "&id=" + category.getID() + "&name=" + Helpers.getURLEncodedString(category.getName()) + "&color=" + category.getColor().replace("#", ""));
HttpsURLConnection httpsCon = (HttpsURLConnection)url.openConnection();
httpsCon.setRequestMethod("PUT");
httpsCon.setDoInput(true);
diff --git a/src/de/deadlocker8/budgetmaster/logic/utils/FileHelper.java b/src/de/deadlocker8/budgetmaster/logic/utils/FileHelper.java
index ee576f3c546ad679e841cd5ad65b8d735d27a7fd..0aa0e89e7f43e2bfc0d77ddf25cac2e965c69392 100644
--- a/src/de/deadlocker8/budgetmaster/logic/utils/FileHelper.java
+++ b/src/de/deadlocker8/budgetmaster/logic/utils/FileHelper.java
@@ -11,7 +11,7 @@ import java.nio.file.Paths;
import com.google.gson.Gson;
import de.deadlocker8.budgetmaster.logic.Settings;
-import de.deadlocker8.budgetmasterserver.logic.Database;
+import de.deadlocker8.budgetmasterserver.logic.database.Database;
import tools.Localization;
import tools.PathUtils;
diff --git a/src/de/deadlocker8/budgetmaster/ui/cells/CategoryBudgetCell.java b/src/de/deadlocker8/budgetmaster/ui/cells/CategoryBudgetCell.java
index 4390e3635830e48265722775a6d25b5af080be45..207c868f65d88c321397e0bedca1f5ea6c2abf87 100644
--- a/src/de/deadlocker8/budgetmaster/ui/cells/CategoryBudgetCell.java
+++ b/src/de/deadlocker8/budgetmaster/ui/cells/CategoryBudgetCell.java
@@ -11,6 +11,7 @@ import javafx.scene.control.ListCell;
import javafx.scene.layout.HBox;
import javafx.scene.layout.Priority;
import javafx.scene.layout.Region;
+import javafx.scene.paint.Color;
import tools.ConvertTo;
public class CategoryBudgetCell extends ListCell<CategoryBudget>
@@ -39,8 +40,8 @@ public class CategoryBudgetCell extends ListCell<CategoryBudget>
labelCircle.setPrefHeight(HEIGHT);
labelCircle.setAlignment(Pos.CENTER);
labelCircle.getStyleClass().add("greylabel");
- String textColor = ConvertTo.toRGBHex(ConvertTo.getAppropriateTextColor(currentCategory.getColor()));
- labelCircle.setStyle("-fx-background-color: " + ConvertTo.toRGBHex(currentCategory.getColor()) + "; -fx-background-radius: 50%; -fx-text-fill: " + textColor + "; -fx-font-weight: bold; -fx-font-size: 20;");
+ String textColor = ConvertTo.toRGBHex(ConvertTo.getAppropriateTextColor(Color.web(currentCategory.getColor())));
+ labelCircle.setStyle("-fx-background-color: " + currentCategory.getColor() + "; -fx-background-radius: 50%; -fx-text-fill: " + textColor + "; -fx-font-weight: bold; -fx-font-size: 20;");
hbox.getChildren().add(labelCircle);
Label labelName = new Label(currentCategory.getName());
diff --git a/src/de/deadlocker8/budgetmaster/ui/cells/CategoryCell.java b/src/de/deadlocker8/budgetmaster/ui/cells/CategoryCell.java
index 057d8ce7158ea699afb16b201506bbd49be1d0c5..9e80a8bf73ff7edbf3d06c292cf7bba5969db41a 100644
--- a/src/de/deadlocker8/budgetmaster/ui/cells/CategoryCell.java
+++ b/src/de/deadlocker8/budgetmaster/ui/cells/CategoryCell.java
@@ -47,8 +47,8 @@ public class CategoryCell extends ListCell<Category>
labelCircle.setPrefHeight(HEIGHT);
labelCircle.setAlignment(Pos.CENTER);
labelCircle.getStyleClass().add("greylabel");
- String textColor = ConvertTo.toRGBHex(ConvertTo.getAppropriateTextColor(item.getColor()));
- labelCircle.setStyle("-fx-background-color: " + ConvertTo.toRGBHex(item.getColor()) + "; -fx-background-radius: 50%; -fx-text-fill: " + textColor + "; -fx-font-weight: bold; -fx-font-size: 20;");
+ String textColor = ConvertTo.toRGBHex(ConvertTo.getAppropriateTextColor(Color.web(item.getColor())));
+ labelCircle.setStyle("-fx-background-color: " + item.getColor() + "; -fx-background-radius: 50%; -fx-text-fill: " + textColor + "; -fx-font-weight: bold; -fx-font-size: 20;");
hbox.getChildren().add(labelCircle);
Label labelName = new Label(item.getName());
diff --git a/src/de/deadlocker8/budgetmaster/ui/cells/PaymentCell.java b/src/de/deadlocker8/budgetmaster/ui/cells/PaymentCell.java
index 2ec8d494e3ebc17738df5d1ccb8d2ca297fc2f55..2fcb0e413f099020171e66e81940291d0e4f37eb 100644
--- a/src/de/deadlocker8/budgetmaster/ui/cells/PaymentCell.java
+++ b/src/de/deadlocker8/budgetmaster/ui/cells/PaymentCell.java
@@ -95,8 +95,8 @@ public class PaymentCell extends ListCell<Payment>
labelCircle.setMinHeight(HEIGHT);
labelCircle.setAlignment(Pos.CENTER);
labelCircle.getStyleClass().add("greylabel");
- String textColor = ConvertTo.toRGBHex(ConvertTo.getAppropriateTextColor(category.getColor()));
- labelCircle.setStyle("-fx-background-color: " + ConvertTo.toRGBHex(category.getColor()) + "; -fx-background-radius: 50%; -fx-text-fill: " + textColor + "; -fx-font-weight: bold; -fx-font-size: 20;");
+ String textColor = ConvertTo.toRGBHex(ConvertTo.getAppropriateTextColor(Color.web(category.getColor())));
+ labelCircle.setStyle("-fx-background-color: " + category.getColor() + "; -fx-background-radius: 50%; -fx-text-fill: " + textColor + "; -fx-font-weight: bold; -fx-font-size: 20;");
Tooltip tooltip = new Tooltip(category.getName());
tooltip.setStyle("-fx-font-size: 14");
labelCircle.setTooltip(tooltip);
diff --git a/src/de/deadlocker8/budgetmaster/ui/cells/SmallCategoryCell.java b/src/de/deadlocker8/budgetmaster/ui/cells/SmallCategoryCell.java
index 7edf363e2a0b5162d0fbabe856854a9df88f75e0..dba566d87328ed7005f923e258acc8f3e8b06556 100644
--- a/src/de/deadlocker8/budgetmaster/ui/cells/SmallCategoryCell.java
+++ b/src/de/deadlocker8/budgetmaster/ui/cells/SmallCategoryCell.java
@@ -6,6 +6,7 @@ import javafx.geometry.Pos;
import javafx.scene.control.Label;
import javafx.scene.control.ListCell;
import javafx.scene.layout.HBox;
+import javafx.scene.paint.Color;
import tools.ConvertTo;
public class SmallCategoryCell extends ListCell<Category>
@@ -25,8 +26,8 @@ public class SmallCategoryCell extends ListCell<Category>
labelCircle.setPrefWidth(HEIGHT);
labelCircle.setPrefHeight(HEIGHT);
labelCircle.setAlignment(Pos.CENTER);
- String textColor = ConvertTo.toRGBHex(ConvertTo.getAppropriateTextColor(item.getColor()));
- labelCircle.setStyle("-fx-background-color: " + ConvertTo.toRGBHex(item.getColor()) + "; -fx-background-radius: 50%; -fx-text-fill: " + textColor + "; -fx-font-weight: bold; -fx-font-size: 15;");
+ String textColor = ConvertTo.toRGBHex(ConvertTo.getAppropriateTextColor(Color.web(item.getColor())));
+ labelCircle.setStyle("-fx-background-color: " + item.getColor() + "; -fx-background-radius: 50%; -fx-text-fill: " + textColor + "; -fx-font-weight: bold; -fx-font-size: 15;");
hbox.getChildren().add(labelCircle);
Label labelName = new Label(item.getName());
diff --git a/src/de/deadlocker8/budgetmaster/ui/controller/NewCategoryController.java b/src/de/deadlocker8/budgetmaster/ui/controller/NewCategoryController.java
index ba9e770d2d857844c25095c1d2581bf4181b638d..1f9454e41a31bd0d4987d9d44e7e2b7ee5458bc9 100644
--- a/src/de/deadlocker8/budgetmaster/ui/controller/NewCategoryController.java
+++ b/src/de/deadlocker8/budgetmaster/ui/controller/NewCategoryController.java
@@ -85,10 +85,10 @@ public class NewCategoryController
if(edit)
{
textFieldName.setText(category.getName());
- colorView = new ColorView(category.getColor(), colors, this, (finishColor) -> {
+ colorView = new ColorView(Color.web(category.getColor()), colors, this, (finishColor) -> {
setColor(finishColor);
});
- setColor(category.getColor());
+ setColor(Color.web(category.getColor()));
}
else
{
@@ -141,7 +141,7 @@ public class NewCategoryController
if(edit)
{
category.setName(name);
- category.setColor(color);
+ category.setColor(ConvertTo.toRGBHexWithoutOpacity(color));
ServerConnection connection;
try
{
@@ -155,7 +155,7 @@ public class NewCategoryController
}
else
{
- Category newCategory = new Category(name, color);
+ Category newCategory = new Category(name, ConvertTo.toRGBHexWithoutOpacity(color));
ServerConnection connection;
try
{
diff --git a/src/de/deadlocker8/budgetmaster/ui/controller/NewPaymentController.java b/src/de/deadlocker8/budgetmaster/ui/controller/NewPaymentController.java
index a4c3b8276c431fce6f48cdc1bbe157c03b103496..bed43daa5ef76ca69c2ba29dc85d44ff50bf030a 100644
--- a/src/de/deadlocker8/budgetmaster/ui/controller/NewPaymentController.java
+++ b/src/de/deadlocker8/budgetmaster/ui/controller/NewPaymentController.java
@@ -108,8 +108,8 @@ public class NewPaymentController
comboBoxCategory.setButtonCell(buttonCategoryCell);
comboBoxCategory.setStyle("-fx-border-color: #000000; -fx-border-width: 2; -fx-border-radius: 5; -fx-background-radius: 5;");
comboBoxCategory.valueProperty().addListener((listener, oldValue, newValue) -> {
- comboBoxCategory.setStyle("-fx-background-color: " + ConvertTo.toRGBHex(newValue.getColor()) + "; -fx-border-color: #000000; -fx-border-width: 2; -fx-border-radius: 5; -fx-background-radius: 5;");
- buttonCategoryCell.setColor(newValue.getColor());
+ comboBoxCategory.setStyle("-fx-background-color: " + newValue.getColor() + "; -fx-border-color: #000000; -fx-border-width: 2; -fx-border-radius: 5; -fx-background-radius: 5;");
+ buttonCategoryCell.setColor(Color.web(newValue.getColor()));
});
checkBoxRepeat.selectedProperty().addListener((listener, oldValue, newValue) -> {
diff --git a/src/de/deadlocker8/budgetmaster/ui/controller/SettingsController.java b/src/de/deadlocker8/budgetmaster/ui/controller/SettingsController.java
index 4ab14721fba1d04dbd5f936e87c9f77b73789e07..5d8dc9535aec4c07129e457d812e447e22e69fc2 100644
--- a/src/de/deadlocker8/budgetmaster/ui/controller/SettingsController.java
+++ b/src/de/deadlocker8/budgetmaster/ui/controller/SettingsController.java
@@ -12,7 +12,7 @@ import de.deadlocker8.budgetmaster.logic.utils.Colors;
import de.deadlocker8.budgetmaster.logic.utils.FileHelper;
import de.deadlocker8.budgetmaster.logic.utils.Helpers;
import de.deadlocker8.budgetmaster.logic.utils.Strings;
-import de.deadlocker8.budgetmasterserver.logic.Database;
+import de.deadlocker8.budgetmasterserver.logic.database.Database;
import javafx.application.Platform;
import javafx.fxml.FXML;
import javafx.scene.control.Alert;
diff --git a/src/de/deadlocker8/budgetmasterserver/logic/Database.java b/src/de/deadlocker8/budgetmasterserver/logic/database/Database.java
similarity index 94%
rename from src/de/deadlocker8/budgetmasterserver/logic/Database.java
rename to src/de/deadlocker8/budgetmasterserver/logic/database/Database.java
index 05740dae2752cab71a041f93dcfd08911e4d5088..0fc7d225244e3de5db5b8e5dbf0b304f7e09246d 100644
--- a/src/de/deadlocker8/budgetmasterserver/logic/Database.java
+++ b/src/de/deadlocker8/budgetmasterserver/logic/database/Database.java
@@ -1,4 +1,4 @@
-package de.deadlocker8.budgetmasterserver.logic;
+package de.deadlocker8.budgetmasterserver.logic.database;
import java.util.ArrayList;
diff --git a/src/de/deadlocker8/budgetmasterserver/logic/DatabaseCreator.java b/src/de/deadlocker8/budgetmasterserver/logic/database/DatabaseCreator.java
similarity index 98%
rename from src/de/deadlocker8/budgetmasterserver/logic/DatabaseCreator.java
rename to src/de/deadlocker8/budgetmasterserver/logic/database/DatabaseCreator.java
index 398629d7b146d0aee5a4b3d3bbac5451b2b39f05..18d81340e14f17c0fbbee56c8b37a4b93813f347 100644
--- a/src/de/deadlocker8/budgetmasterserver/logic/DatabaseCreator.java
+++ b/src/de/deadlocker8/budgetmasterserver/logic/database/DatabaseCreator.java
@@ -1,4 +1,4 @@
-package de.deadlocker8.budgetmasterserver.logic;
+package de.deadlocker8.budgetmasterserver.logic.database;
import java.sql.Connection;
import java.sql.DatabaseMetaData;
@@ -7,6 +7,7 @@ import java.sql.SQLException;
import java.sql.Statement;
import java.util.ArrayList;
+import de.deadlocker8.budgetmasterserver.logic.Settings;
import logger.Logger;
public class DatabaseCreator
diff --git a/src/de/deadlocker8/budgetmasterserver/logic/DatabaseExporter.java b/src/de/deadlocker8/budgetmasterserver/logic/database/DatabaseExporter.java
similarity index 96%
rename from src/de/deadlocker8/budgetmasterserver/logic/DatabaseExporter.java
rename to src/de/deadlocker8/budgetmasterserver/logic/database/DatabaseExporter.java
index 754c631652a5421eb878549ca182a329aa3a1883..4dbf4022e81e6d143155002d89293718c0fcaf67 100644
--- a/src/de/deadlocker8/budgetmasterserver/logic/DatabaseExporter.java
+++ b/src/de/deadlocker8/budgetmasterserver/logic/database/DatabaseExporter.java
@@ -1,4 +1,4 @@
-package de.deadlocker8.budgetmasterserver.logic;
+package de.deadlocker8.budgetmasterserver.logic.database;
import java.sql.Connection;
import java.sql.DriverManager;
@@ -11,7 +11,7 @@ import java.util.ArrayList;
import de.deadlocker8.budgetmaster.logic.Category;
import de.deadlocker8.budgetmaster.logic.NormalPayment;
import de.deadlocker8.budgetmaster.logic.RepeatingPayment;
-import javafx.scene.paint.Color;
+import de.deadlocker8.budgetmasterserver.logic.Settings;
import logger.Logger;
public class DatabaseExporter
@@ -68,7 +68,7 @@ public class DatabaseExporter
String name = rs.getString("Name");
String color = rs.getString("Color");
- results.add(new Category(id, name, Color.web(color)));
+ results.add(new Category(id, name, color));
}
}
catch(SQLException e)
diff --git a/src/de/deadlocker8/budgetmasterserver/logic/DatabaseHandler.java b/src/de/deadlocker8/budgetmasterserver/logic/database/DatabaseHandler.java
similarity index 96%
rename from src/de/deadlocker8/budgetmasterserver/logic/DatabaseHandler.java
rename to src/de/deadlocker8/budgetmasterserver/logic/database/DatabaseHandler.java
index f1e4863c8be3901bb95c310ce78e2e0afc1c4d40..c02d8a08c4e1210f5d476bd340fb05961d58d163 100644
--- a/src/de/deadlocker8/budgetmasterserver/logic/DatabaseHandler.java
+++ b/src/de/deadlocker8/budgetmasterserver/logic/database/DatabaseHandler.java
@@ -1,4 +1,4 @@
-package de.deadlocker8.budgetmasterserver.logic;
+package de.deadlocker8.budgetmasterserver.logic.database;
import java.sql.Connection;
import java.sql.DriverManager;
@@ -18,9 +18,8 @@ import de.deadlocker8.budgetmaster.logic.NormalPayment;
import de.deadlocker8.budgetmaster.logic.Payment;
import de.deadlocker8.budgetmaster.logic.RepeatingPayment;
import de.deadlocker8.budgetmaster.logic.RepeatingPaymentEntry;
-import javafx.scene.paint.Color;
+import de.deadlocker8.budgetmasterserver.logic.Settings;
import logger.Logger;
-import tools.ConvertTo;
public class DatabaseHandler
{
@@ -228,7 +227,7 @@ public class DatabaseHandler
String name = rs.getString("Name");
String color = rs.getString("Color");
- results.add(new Category(id, name, Color.web(color)));
+ results.add(new Category(id, name, color));
}
}
catch(SQLException e)
@@ -258,7 +257,7 @@ public class DatabaseHandler
String name = rs.getString("Name");
String color = rs.getString("Color");
- result = new Category(id, name, Color.web(color));
+ result = new Category(id, name, color);
}
}
catch(SQLException e)
@@ -273,7 +272,7 @@ public class DatabaseHandler
return result;
}
- public Category getCategory(String name, Color color)
+ public Category getCategory(String name, String color)
{
PreparedStatement stmt = null;
Category result = null;
@@ -281,7 +280,7 @@ public class DatabaseHandler
{
stmt = connection.prepareStatement("SELECT * FROM category WHERE category.name = ? AND category.color = ?;");
stmt.setString(1, name);
- stmt.setString(2, ConvertTo.toRGBHexWithoutOpacity(color));
+ stmt.setString(2, color);
ResultSet rs = stmt.executeQuery();
while(rs.next())
@@ -290,7 +289,7 @@ public class DatabaseHandler
String categoryName = rs.getString("Name");
String categoryColor = rs.getString("Color");
- result = new Category(id, categoryName, Color.web(categoryColor));
+ result = new Category(id, categoryName, categoryColor);
}
}
catch(SQLException e)
@@ -717,14 +716,14 @@ public class DatabaseHandler
/*
* ADD
*/
- public void addCategory(String name, Color color)
+ public void addCategory(String name, String color)
{
PreparedStatement stmt = null;
try
{
stmt = connection.prepareStatement("INSERT INTO category (Name, Color) VALUES(?, ?);");
stmt.setString(1, name);
- stmt.setString(2, ConvertTo.toRGBHexWithoutOpacity(color));
+ stmt.setString(2, color);
stmt.execute();
}
catch(SQLException e)
@@ -745,7 +744,7 @@ public class DatabaseHandler
stmt = connection.prepareStatement("INSERT INTO category (ID, Name, Color) VALUES(?, ?, ?);");
stmt.setInt(1, category.getID());
stmt.setString(2, category.getName());
- stmt.setString(3, ConvertTo.toRGBHexWithoutOpacity(category.getColor()));
+ stmt.setString(3, category.getColor());
stmt.execute();
}
catch(SQLException e)
@@ -838,14 +837,14 @@ public class DatabaseHandler
/*
* UPDATE
*/
- public void updateCategory(int ID, String name, Color color)
+ public void updateCategory(int ID, String name, String color)
{
PreparedStatement stmt = null;
try
{
stmt = connection.prepareStatement("UPDATE category SET name=? , color=? WHERE ID = ?;");
stmt.setString(1, name);
- stmt.setString(2, ConvertTo.toRGBHexWithoutOpacity(color));
+ stmt.setString(2, color);
stmt.setInt(3, ID);
stmt.executeUpdate();
}
diff --git a/src/de/deadlocker8/budgetmasterserver/logic/DatabaseImporter.java b/src/de/deadlocker8/budgetmasterserver/logic/database/DatabaseImporter.java
similarity index 98%
rename from src/de/deadlocker8/budgetmasterserver/logic/DatabaseImporter.java
rename to src/de/deadlocker8/budgetmasterserver/logic/database/DatabaseImporter.java
index 7880c9c2dd7d0e1c3e61989d371114f79458b713..db5da2244820c620fd5d3c97ff3b4c5bff692f43 100644
--- a/src/de/deadlocker8/budgetmasterserver/logic/DatabaseImporter.java
+++ b/src/de/deadlocker8/budgetmasterserver/logic/database/DatabaseImporter.java
@@ -1,4 +1,4 @@
-package de.deadlocker8.budgetmasterserver.logic;
+package de.deadlocker8.budgetmasterserver.logic.database;
import java.util.ArrayList;
import java.util.Iterator;
diff --git a/src/de/deadlocker8/budgetmasterserver/server/SparkServer.java b/src/de/deadlocker8/budgetmasterserver/server/SparkServer.java
index 29317035bd5b5e5d585dcb568baf2713ccbc2307..6a35e670f4e5030ecbf6735686f2643814c7c4c2 100644
--- a/src/de/deadlocker8/budgetmasterserver/server/SparkServer.java
+++ b/src/de/deadlocker8/budgetmasterserver/server/SparkServer.java
@@ -18,8 +18,8 @@ import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import de.deadlocker8.budgetmaster.logic.utils.Helpers;
-import de.deadlocker8.budgetmasterserver.logic.DatabaseHandler;
import de.deadlocker8.budgetmasterserver.logic.Settings;
+import de.deadlocker8.budgetmasterserver.logic.database.DatabaseHandler;
import de.deadlocker8.budgetmasterserver.server.category.CategoryAdd;
import de.deadlocker8.budgetmasterserver.server.category.CategoryDelete;
import de.deadlocker8.budgetmasterserver.server.category.CategoryGet;
diff --git a/src/de/deadlocker8/budgetmasterserver/server/category/CategoryAdd.java b/src/de/deadlocker8/budgetmasterserver/server/category/CategoryAdd.java
index 71e5dcac445853179abdf3aa35ed2cff6c1ae875..e1c68a1fab74995e212a9f5cd6cf124aee5282ad 100644
--- a/src/de/deadlocker8/budgetmasterserver/server/category/CategoryAdd.java
+++ b/src/de/deadlocker8/budgetmasterserver/server/category/CategoryAdd.java
@@ -2,8 +2,7 @@ package de.deadlocker8.budgetmasterserver.server.category;
import static spark.Spark.halt;
-import de.deadlocker8.budgetmasterserver.logic.DatabaseHandler;
-import javafx.scene.paint.Color;
+import de.deadlocker8.budgetmasterserver.logic.database.DatabaseHandler;
import spark.Request;
import spark.Response;
import spark.Route;
@@ -27,7 +26,7 @@ public class CategoryAdd implements Route
try
{
- handler.addCategory(req.queryMap("name").value(), Color.web("#" + req.queryMap("color").value()));
+ handler.addCategory(req.queryMap("name").value(), "#" + req.queryMap("color").value());
return "";
}
diff --git a/src/de/deadlocker8/budgetmasterserver/server/category/CategoryDelete.java b/src/de/deadlocker8/budgetmasterserver/server/category/CategoryDelete.java
index 5e4ad5a6958cf02678651d6e06a0e25e08311980..134d68b26d999055b676952670d6983856bf54a0 100644
--- a/src/de/deadlocker8/budgetmasterserver/server/category/CategoryDelete.java
+++ b/src/de/deadlocker8/budgetmasterserver/server/category/CategoryDelete.java
@@ -2,7 +2,7 @@ package de.deadlocker8.budgetmasterserver.server.category;
import static spark.Spark.halt;
-import de.deadlocker8.budgetmasterserver.logic.DatabaseHandler;
+import de.deadlocker8.budgetmasterserver.logic.database.DatabaseHandler;
import spark.Request;
import spark.Response;
import spark.Route;
diff --git a/src/de/deadlocker8/budgetmasterserver/server/category/CategoryGet.java b/src/de/deadlocker8/budgetmasterserver/server/category/CategoryGet.java
index bf4eb9c41614aff11d4b2173893822656b86a3e3..29cbb37e1adbeeabc77f254331685d197df155ae 100644
--- a/src/de/deadlocker8/budgetmasterserver/server/category/CategoryGet.java
+++ b/src/de/deadlocker8/budgetmasterserver/server/category/CategoryGet.java
@@ -5,7 +5,7 @@ import static spark.Spark.halt;
import com.google.gson.Gson;
import de.deadlocker8.budgetmaster.logic.Category;
-import de.deadlocker8.budgetmasterserver.logic.DatabaseHandler;
+import de.deadlocker8.budgetmasterserver.logic.database.DatabaseHandler;
import spark.Request;
import spark.Response;
import spark.Route;
diff --git a/src/de/deadlocker8/budgetmasterserver/server/category/CategoryGetAll.java b/src/de/deadlocker8/budgetmasterserver/server/category/CategoryGetAll.java
index 8bb67cab65a1a3fb7346ef9cc3e9139ef099f18e..6b25afee1303049f749d84fbb6d36c63ef0cc247 100644
--- a/src/de/deadlocker8/budgetmasterserver/server/category/CategoryGetAll.java
+++ b/src/de/deadlocker8/budgetmasterserver/server/category/CategoryGetAll.java
@@ -7,7 +7,7 @@ import java.util.ArrayList;
import com.google.gson.Gson;
import de.deadlocker8.budgetmaster.logic.Category;
-import de.deadlocker8.budgetmasterserver.logic.DatabaseHandler;
+import de.deadlocker8.budgetmasterserver.logic.database.DatabaseHandler;
import spark.Request;
import spark.Response;
import spark.Route;
diff --git a/src/de/deadlocker8/budgetmasterserver/server/category/CategoryUpdate.java b/src/de/deadlocker8/budgetmasterserver/server/category/CategoryUpdate.java
index a8f4d65dddc92caae6953173d6b0c6a367799a0f..0b55664fac5968338e3091e57f149186fb104d4b 100644
--- a/src/de/deadlocker8/budgetmasterserver/server/category/CategoryUpdate.java
+++ b/src/de/deadlocker8/budgetmasterserver/server/category/CategoryUpdate.java
@@ -2,8 +2,7 @@ package de.deadlocker8.budgetmasterserver.server.category;
import static spark.Spark.halt;
-import de.deadlocker8.budgetmasterserver.logic.DatabaseHandler;
-import javafx.scene.paint.Color;
+import de.deadlocker8.budgetmasterserver.logic.database.DatabaseHandler;
import spark.Request;
import spark.Response;
import spark.Route;
@@ -38,7 +37,7 @@ public class CategoryUpdate implements Route
try
{
- handler.updateCategory(id, req.queryMap("name").value(), Color.web("#" + req.queryMap("color").value()));
+ handler.updateCategory(id, req.queryMap("name").value(), "#" + req.queryMap("color").value());
return "";
}
diff --git a/src/de/deadlocker8/budgetmasterserver/server/categorybudget/CategoryBudgetGet.java b/src/de/deadlocker8/budgetmasterserver/server/categorybudget/CategoryBudgetGet.java
index 9a5b34d4f2a63e7af2a3ede69cfd5594065c3758..60b3f37a0a7d18181273fe201bf0c48249452efe 100644
--- a/src/de/deadlocker8/budgetmasterserver/server/categorybudget/CategoryBudgetGet.java
+++ b/src/de/deadlocker8/budgetmasterserver/server/categorybudget/CategoryBudgetGet.java
@@ -12,7 +12,7 @@ import com.google.gson.Gson;
import de.deadlocker8.budgetmaster.logic.Category;
import de.deadlocker8.budgetmaster.logic.CategoryBudget;
import de.deadlocker8.budgetmaster.logic.Payment;
-import de.deadlocker8.budgetmasterserver.logic.DatabaseHandler;
+import de.deadlocker8.budgetmasterserver.logic.database.DatabaseHandler;
import spark.Request;
import spark.Response;
import spark.Route;
diff --git a/src/de/deadlocker8/budgetmasterserver/server/charts/CategoryInOutSumForMonth.java b/src/de/deadlocker8/budgetmasterserver/server/charts/CategoryInOutSumForMonth.java
index 067567b4a9658742dc33d19a70c0840a5d0b9d58..52543c4c60bf41609e0c443b83e0aa7c721f587f 100644
--- a/src/de/deadlocker8/budgetmasterserver/server/charts/CategoryInOutSumForMonth.java
+++ b/src/de/deadlocker8/budgetmasterserver/server/charts/CategoryInOutSumForMonth.java
@@ -9,7 +9,7 @@ import com.google.gson.Gson;
import de.deadlocker8.budgetmaster.logic.Category;
import de.deadlocker8.budgetmaster.logic.CategoryInOutSum;
import de.deadlocker8.budgetmaster.logic.Payment;
-import de.deadlocker8.budgetmasterserver.logic.DatabaseHandler;
+import de.deadlocker8.budgetmasterserver.logic.database.DatabaseHandler;
import spark.Request;
import spark.Response;
import spark.Route;
diff --git a/src/de/deadlocker8/budgetmasterserver/server/charts/MonthInOutSum.java b/src/de/deadlocker8/budgetmasterserver/server/charts/MonthInOutSum.java
index 452e9acdffb3c820c9dff64d7600796659edb1ce..4ae6da848f0fa97507136bdcabb3587edba2c0e1 100644
--- a/src/de/deadlocker8/budgetmasterserver/server/charts/MonthInOutSum.java
+++ b/src/de/deadlocker8/budgetmasterserver/server/charts/MonthInOutSum.java
@@ -11,7 +11,7 @@ import com.google.gson.Gson;
import de.deadlocker8.budgetmaster.logic.Category;
import de.deadlocker8.budgetmaster.logic.CategoryInOutSum;
import de.deadlocker8.budgetmaster.logic.Payment;
-import de.deadlocker8.budgetmasterserver.logic.DatabaseHandler;
+import de.deadlocker8.budgetmasterserver.logic.database.DatabaseHandler;
import spark.Request;
import spark.Response;
import spark.Route;
diff --git a/src/de/deadlocker8/budgetmasterserver/server/database/DatabaseDelete.java b/src/de/deadlocker8/budgetmasterserver/server/database/DatabaseDelete.java
index 373a788ade424ea1cbb62c35632a58a82efbcc6a..f82a3e082089ca5be357b63c757bc3a4ca69a9ae 100644
--- a/src/de/deadlocker8/budgetmasterserver/server/database/DatabaseDelete.java
+++ b/src/de/deadlocker8/budgetmasterserver/server/database/DatabaseDelete.java
@@ -2,8 +2,8 @@ package de.deadlocker8.budgetmasterserver.server.database;
import static spark.Spark.halt;
-import de.deadlocker8.budgetmasterserver.logic.DatabaseHandler;
import de.deadlocker8.budgetmasterserver.logic.Settings;
+import de.deadlocker8.budgetmasterserver.logic.database.DatabaseHandler;
import spark.Request;
import spark.Response;
import spark.Route;
diff --git a/src/de/deadlocker8/budgetmasterserver/server/database/DatabaseExport.java b/src/de/deadlocker8/budgetmasterserver/server/database/DatabaseExport.java
index 5205de6f69fdc68ff3988e23ab85e2502fe18422..c9d88f6a72ec94205461d8c33146e7663192e151 100644
--- a/src/de/deadlocker8/budgetmasterserver/server/database/DatabaseExport.java
+++ b/src/de/deadlocker8/budgetmasterserver/server/database/DatabaseExport.java
@@ -4,8 +4,8 @@ import static spark.Spark.halt;
import com.google.gson.Gson;
-import de.deadlocker8.budgetmasterserver.logic.DatabaseExporter;
import de.deadlocker8.budgetmasterserver.logic.Settings;
+import de.deadlocker8.budgetmasterserver.logic.database.DatabaseExporter;
import logger.Logger;
import spark.Request;
import spark.Response;
diff --git a/src/de/deadlocker8/budgetmasterserver/server/database/DatabaseImport.java b/src/de/deadlocker8/budgetmasterserver/server/database/DatabaseImport.java
index 082e938ae41446f8814edddfb8c825f55f0af685..86dce0c839fd30528cf4cb467c4f5907287a4668 100644
--- a/src/de/deadlocker8/budgetmasterserver/server/database/DatabaseImport.java
+++ b/src/de/deadlocker8/budgetmasterserver/server/database/DatabaseImport.java
@@ -4,9 +4,9 @@ import static spark.Spark.halt;
import com.google.gson.Gson;
-import de.deadlocker8.budgetmasterserver.logic.Database;
-import de.deadlocker8.budgetmasterserver.logic.DatabaseHandler;
-import de.deadlocker8.budgetmasterserver.logic.DatabaseImporter;
+import de.deadlocker8.budgetmasterserver.logic.database.Database;
+import de.deadlocker8.budgetmasterserver.logic.database.DatabaseHandler;
+import de.deadlocker8.budgetmasterserver.logic.database.DatabaseImporter;
import logger.Logger;
import spark.Request;
import spark.Response;
diff --git a/src/de/deadlocker8/budgetmasterserver/server/payment/normal/PaymentAdd.java b/src/de/deadlocker8/budgetmasterserver/server/payment/normal/PaymentAdd.java
index 9d016915dc8eeb91a1575b480fc3549a7bd5b66b..53580d8b925d12db336c1a649dff3c51d6975748 100644
--- a/src/de/deadlocker8/budgetmasterserver/server/payment/normal/PaymentAdd.java
+++ b/src/de/deadlocker8/budgetmasterserver/server/payment/normal/PaymentAdd.java
@@ -2,7 +2,7 @@ package de.deadlocker8.budgetmasterserver.server.payment.normal;
import static spark.Spark.halt;
-import de.deadlocker8.budgetmasterserver.logic.DatabaseHandler;
+import de.deadlocker8.budgetmasterserver.logic.database.DatabaseHandler;
import spark.Request;
import spark.Response;
import spark.Route;
diff --git a/src/de/deadlocker8/budgetmasterserver/server/payment/normal/PaymentDelete.java b/src/de/deadlocker8/budgetmasterserver/server/payment/normal/PaymentDelete.java
index f5ff9285872dff0339bd02a6c15c787d0cb8f4d6..ff7b6a5ae53c0b42c2cd91e04212545cf0a698f9 100644
--- a/src/de/deadlocker8/budgetmasterserver/server/payment/normal/PaymentDelete.java
+++ b/src/de/deadlocker8/budgetmasterserver/server/payment/normal/PaymentDelete.java
@@ -2,7 +2,7 @@ package de.deadlocker8.budgetmasterserver.server.payment.normal;
import static spark.Spark.halt;
-import de.deadlocker8.budgetmasterserver.logic.DatabaseHandler;
+import de.deadlocker8.budgetmasterserver.logic.database.DatabaseHandler;
import spark.Request;
import spark.Response;
import spark.Route;
diff --git a/src/de/deadlocker8/budgetmasterserver/server/payment/normal/PaymentGet.java b/src/de/deadlocker8/budgetmasterserver/server/payment/normal/PaymentGet.java
index b13dba89e08a7832ea8c0b152b2a5042899ea260..19a9106e56e26b941925f7cc3ab0229d2a684e4c 100644
--- a/src/de/deadlocker8/budgetmasterserver/server/payment/normal/PaymentGet.java
+++ b/src/de/deadlocker8/budgetmasterserver/server/payment/normal/PaymentGet.java
@@ -9,7 +9,7 @@ import org.joda.time.DateTime;
import com.google.gson.Gson;
import de.deadlocker8.budgetmaster.logic.NormalPayment;
-import de.deadlocker8.budgetmasterserver.logic.DatabaseHandler;
+import de.deadlocker8.budgetmasterserver.logic.database.DatabaseHandler;
import de.deadlocker8.budgetmasterserver.server.updater.RepeatingPaymentUpdater;
import spark.Request;
import spark.Response;
diff --git a/src/de/deadlocker8/budgetmasterserver/server/payment/normal/PaymentUpdate.java b/src/de/deadlocker8/budgetmasterserver/server/payment/normal/PaymentUpdate.java
index 3c58aa12cfe1c8a16a41b0b32ce2ccbe8599c5fa..6c4215e4abb046abb0781f2458017858b2ccf57d 100644
--- a/src/de/deadlocker8/budgetmasterserver/server/payment/normal/PaymentUpdate.java
+++ b/src/de/deadlocker8/budgetmasterserver/server/payment/normal/PaymentUpdate.java
@@ -2,7 +2,7 @@ package de.deadlocker8.budgetmasterserver.server.payment.normal;
import static spark.Spark.halt;
-import de.deadlocker8.budgetmasterserver.logic.DatabaseHandler;
+import de.deadlocker8.budgetmasterserver.logic.database.DatabaseHandler;
import spark.Request;
import spark.Response;
import spark.Route;
diff --git a/src/de/deadlocker8/budgetmasterserver/server/payment/repeating/RepeatingPaymentAdd.java b/src/de/deadlocker8/budgetmasterserver/server/payment/repeating/RepeatingPaymentAdd.java
index 4d622ffb1179f671b11cc1534602838dcc77f029..0c711c30f0f6e1c5ea8baf7c7ff721c61c2a0221 100644
--- a/src/de/deadlocker8/budgetmasterserver/server/payment/repeating/RepeatingPaymentAdd.java
+++ b/src/de/deadlocker8/budgetmasterserver/server/payment/repeating/RepeatingPaymentAdd.java
@@ -2,7 +2,7 @@ package de.deadlocker8.budgetmasterserver.server.payment.repeating;
import static spark.Spark.halt;
-import de.deadlocker8.budgetmasterserver.logic.DatabaseHandler;
+import de.deadlocker8.budgetmasterserver.logic.database.DatabaseHandler;
import spark.Request;
import spark.Response;
import spark.Route;
diff --git a/src/de/deadlocker8/budgetmasterserver/server/payment/repeating/RepeatingPaymentDelete.java b/src/de/deadlocker8/budgetmasterserver/server/payment/repeating/RepeatingPaymentDelete.java
index a88de42bffad9293f85214a4c0975ecda7fbb208..89d2c121929fd5198eb0fd67e93fb1c54240d101 100644
--- a/src/de/deadlocker8/budgetmasterserver/server/payment/repeating/RepeatingPaymentDelete.java
+++ b/src/de/deadlocker8/budgetmasterserver/server/payment/repeating/RepeatingPaymentDelete.java
@@ -2,7 +2,7 @@ package de.deadlocker8.budgetmasterserver.server.payment.repeating;
import static spark.Spark.halt;
-import de.deadlocker8.budgetmasterserver.logic.DatabaseHandler;
+import de.deadlocker8.budgetmasterserver.logic.database.DatabaseHandler;
import spark.Request;
import spark.Response;
import spark.Route;
diff --git a/src/de/deadlocker8/budgetmasterserver/server/payment/repeating/RepeatingPaymentGet.java b/src/de/deadlocker8/budgetmasterserver/server/payment/repeating/RepeatingPaymentGet.java
index 0a8fd5af5c87a92b58205a771eeebb2e6d13ca07..59724e2027676d4eeb1f971f5c44de56948c3bb2 100644
--- a/src/de/deadlocker8/budgetmasterserver/server/payment/repeating/RepeatingPaymentGet.java
+++ b/src/de/deadlocker8/budgetmasterserver/server/payment/repeating/RepeatingPaymentGet.java
@@ -5,7 +5,7 @@ import static spark.Spark.halt;
import com.google.gson.Gson;
import de.deadlocker8.budgetmaster.logic.RepeatingPayment;
-import de.deadlocker8.budgetmasterserver.logic.DatabaseHandler;
+import de.deadlocker8.budgetmasterserver.logic.database.DatabaseHandler;
import spark.Request;
import spark.Response;
import spark.Route;
diff --git a/src/de/deadlocker8/budgetmasterserver/server/payment/repeating/RepeatingPaymentGetAll.java b/src/de/deadlocker8/budgetmasterserver/server/payment/repeating/RepeatingPaymentGetAll.java
index 573a3c0114fc94c3a366d5d1ea3a0f4435e8fbc9..0b49df55505325f3e7ffb2009685d5f2286ac455 100644
--- a/src/de/deadlocker8/budgetmasterserver/server/payment/repeating/RepeatingPaymentGetAll.java
+++ b/src/de/deadlocker8/budgetmasterserver/server/payment/repeating/RepeatingPaymentGetAll.java
@@ -9,7 +9,7 @@ import org.joda.time.DateTime;
import com.google.gson.Gson;
import de.deadlocker8.budgetmaster.logic.RepeatingPaymentEntry;
-import de.deadlocker8.budgetmasterserver.logic.DatabaseHandler;
+import de.deadlocker8.budgetmasterserver.logic.database.DatabaseHandler;
import de.deadlocker8.budgetmasterserver.server.updater.RepeatingPaymentUpdater;
import spark.Request;
import spark.Response;
diff --git a/src/de/deadlocker8/budgetmasterserver/server/rest/RestGet.java b/src/de/deadlocker8/budgetmasterserver/server/rest/RestGet.java
index 2dd749311af34963b22d1d4a4149028a9ea40994..1ebdf5004b4a8bb8959018692b795aed4bd9cfd4 100644
--- a/src/de/deadlocker8/budgetmasterserver/server/rest/RestGet.java
+++ b/src/de/deadlocker8/budgetmasterserver/server/rest/RestGet.java
@@ -4,7 +4,7 @@ import static spark.Spark.halt;
import com.google.gson.Gson;
-import de.deadlocker8.budgetmasterserver.logic.DatabaseHandler;
+import de.deadlocker8.budgetmasterserver.logic.database.DatabaseHandler;
import spark.Request;
import spark.Response;
import spark.Route;
diff --git a/src/de/deadlocker8/budgetmasterserver/server/updater/RepeatingPaymentUpdater.java b/src/de/deadlocker8/budgetmasterserver/server/updater/RepeatingPaymentUpdater.java
index c43cd7caebb5391726969ac64aa8c741a671071a..bf3d5cd037162975976305d787482039b0c7b839 100644
--- a/src/de/deadlocker8/budgetmasterserver/server/updater/RepeatingPaymentUpdater.java
+++ b/src/de/deadlocker8/budgetmasterserver/server/updater/RepeatingPaymentUpdater.java
@@ -8,7 +8,7 @@ import org.joda.time.Months;
import de.deadlocker8.budgetmaster.logic.LatestRepeatingPayment;
import de.deadlocker8.budgetmaster.logic.RepeatingPayment;
-import de.deadlocker8.budgetmasterserver.logic.DatabaseHandler;
+import de.deadlocker8.budgetmasterserver.logic.database.DatabaseHandler;
import logger.Logger;
public class RepeatingPaymentUpdater
diff --git a/tests/de/deadlocker8/budgetmaster/tests/server/database/DatabaseHandlerTest.java b/tests/de/deadlocker8/budgetmaster/tests/server/database/DatabaseHandlerTest.java
index 94bd4b2ae7bb367ba5674c5b06e574c2623891ab..bb27ca05691004e97905730a5b4dcea424d4b5ce 100644
--- a/tests/de/deadlocker8/budgetmaster/tests/server/database/DatabaseHandlerTest.java
+++ b/tests/de/deadlocker8/budgetmaster/tests/server/database/DatabaseHandlerTest.java
@@ -16,10 +16,9 @@ import de.deadlocker8.budgetmaster.logic.Category;
import de.deadlocker8.budgetmaster.logic.LatestRepeatingPayment;
import de.deadlocker8.budgetmaster.logic.NormalPayment;
import de.deadlocker8.budgetmaster.logic.RepeatingPayment;
-import de.deadlocker8.budgetmasterserver.logic.DatabaseHandler;
import de.deadlocker8.budgetmasterserver.logic.Settings;
import de.deadlocker8.budgetmasterserver.logic.Utils;
-import javafx.scene.paint.Color;
+import de.deadlocker8.budgetmasterserver.logic.database.DatabaseHandler;
public class DatabaseHandlerTest
{
@@ -47,7 +46,7 @@ public class DatabaseHandlerTest
@Test
public void testLastInsertID()
{
- Category expected = new Category("123 Tü+?est Category", Color.ALICEBLUE);
+ Category expected = new Category("123 Tü+?est Category", "#FF0000");
databaseHandler.addCategory(expected.getName(), expected.getColor());
//3 because "NONE" and "Übertrag" has already been inserted at database creation
assertEquals(3, databaseHandler.getLastInsertID());
@@ -57,7 +56,7 @@ public class DatabaseHandlerTest
public void testCategory()
{
//add
- Category expected = new Category("123 Tü+?est Category", Color.ALICEBLUE);
+ Category expected = new Category("123 Tü+?est Category", "#FF0000");
databaseHandler.addCategory(expected.getName(), expected.getColor());
ArrayList<Category> categories = databaseHandler.getCategories();
@@ -67,14 +66,14 @@ public class DatabaseHandlerTest
assertEquals(expected.getColor(), category.getColor());
//update
- Category expectedUpdated = new Category(category.getID(), "456", Color.RED);
+ Category expectedUpdated = new Category(category.getID(), "456", "#00FF00");
databaseHandler.updateCategory(expectedUpdated.getID(), expectedUpdated.getName(), expectedUpdated.getColor());
category = databaseHandler.getCategory(expectedUpdated.getID());
assertEquals(expectedUpdated.getName(), category.getName());
assertEquals(expectedUpdated.getColor(), category.getColor());
//misc
- category = databaseHandler.getCategory("NONE", Color.web("#FFFFFF"));
+ category = databaseHandler.getCategory("NONE", "#FFFFFF");
assertEquals(1, category.getID());
assertTrue(databaseHandler.categoryExists(1));
@@ -84,7 +83,7 @@ public class DatabaseHandlerTest
public void testDeleteCategory()
{
//add
- Category expected = new Category("123 Tü+?est Category", Color.ALICEBLUE);
+ Category expected = new Category("123 Tü+?est Category", "#FF0000");
databaseHandler.addCategory(expected.getName(), expected.getColor());
int id = databaseHandler.getLastInsertID();
diff --git a/tests/de/deadlocker8/budgetmaster/tests/server/database/DatabaseImportExportTest.java b/tests/de/deadlocker8/budgetmaster/tests/server/database/DatabaseImportExportTest.java
index f319ff5d5c64f56be491167e641b1ae501231205..a7e576c09ebaa5aeee8c5f0f74152d1d40e9d624 100644
--- a/tests/de/deadlocker8/budgetmaster/tests/server/database/DatabaseImportExportTest.java
+++ b/tests/de/deadlocker8/budgetmaster/tests/server/database/DatabaseImportExportTest.java
@@ -19,13 +19,12 @@ import de.deadlocker8.budgetmaster.logic.Category;
import de.deadlocker8.budgetmaster.logic.NormalPayment;
import de.deadlocker8.budgetmaster.logic.RepeatingPayment;
import de.deadlocker8.budgetmaster.logic.utils.FileHelper;
-import de.deadlocker8.budgetmasterserver.logic.Database;
-import de.deadlocker8.budgetmasterserver.logic.DatabaseExporter;
-import de.deadlocker8.budgetmasterserver.logic.DatabaseHandler;
-import de.deadlocker8.budgetmasterserver.logic.DatabaseImporter;
import de.deadlocker8.budgetmasterserver.logic.Settings;
import de.deadlocker8.budgetmasterserver.logic.Utils;
-import javafx.scene.paint.Color;
+import de.deadlocker8.budgetmasterserver.logic.database.Database;
+import de.deadlocker8.budgetmasterserver.logic.database.DatabaseExporter;
+import de.deadlocker8.budgetmasterserver.logic.database.DatabaseHandler;
+import de.deadlocker8.budgetmasterserver.logic.database.DatabaseImporter;
public class DatabaseImportExportTest
{
@@ -62,7 +61,7 @@ public class DatabaseImportExportTest
importer.importDatabase(database);
//test category
- Category expectedCategory = new Category(3, "123 Tü+?est Category", Color.ALICEBLUE);
+ Category expectedCategory = new Category(3, "123 Tü+?est Category", "#FF0000");
ArrayList<Category> categories = databaseHandler.getCategories();
Category category = databaseHandler.getCategory(categories.get(categories.size()-1).getID());