diff --git a/pom.xml b/pom.xml index 60999f84bed40a3af2255f2b9cd3c6d870d3fd98..f99f3290b76cb60571f66abc0a4336518781970f 100644 --- a/pom.xml +++ b/pom.xml @@ -56,7 +56,8 @@ <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <java.version>1.8</java.version> - <jlibs.version>2.0.1</jlibs.version> + <jlibs.version>2.0.4</jlibs.version> + <versionizer.version>1.0.2</versionizer.version> <app.versionDate>${maven.build.timestamp}</app.versionDate> <maven.build.timestamp.format>dd.MM.yy</maven.build.timestamp.format> @@ -108,7 +109,7 @@ </dependency> <dependency> - <groupId>de.tobias</groupId> + <groupId>de.thecodelabs</groupId> <artifactId>libUtils</artifactId> </dependency> diff --git a/src/main/java/de/deadlocker8/budgetmaster/Main.java b/src/main/java/de/deadlocker8/budgetmaster/Main.java index fd1fb8d1bf542fbf97c9d354fbfd87b993d4d2b8..5630058e1b84feb2eb4796bf5ac575a4996bcd34 100644 --- a/src/main/java/de/deadlocker8/budgetmaster/Main.java +++ b/src/main/java/de/deadlocker8/budgetmaster/Main.java @@ -1,8 +1,8 @@ package de.deadlocker8.budgetmaster; -import de.tobias.utils.io.PathUtils; -import de.tobias.utils.util.Localization; -import de.tobias.utils.util.SystemUtils; +import de.thecodelabs.utils.io.PathUtils; +import de.thecodelabs.utils.util.Localization; +import de.thecodelabs.utils.util.SystemUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.boot.ApplicationArguments; diff --git a/src/main/java/de/deadlocker8/budgetmaster/controller/CategoryController.java b/src/main/java/de/deadlocker8/budgetmaster/controller/CategoryController.java index 86fe0e2da2582f613ba7fbd41635f64e8e6e42f2..a4bb5e5dfab31f15ee0a31afca797980cbeb6d82 100644 --- a/src/main/java/de/deadlocker8/budgetmaster/controller/CategoryController.java +++ b/src/main/java/de/deadlocker8/budgetmaster/controller/CategoryController.java @@ -8,7 +8,7 @@ import de.deadlocker8.budgetmaster.services.HelpersService; import de.deadlocker8.budgetmaster.utils.Colors; import de.deadlocker8.budgetmaster.utils.ResourceNotFoundException; import de.deadlocker8.budgetmaster.validators.CategoryValidator; -import de.tobias.utils.util.ColorUtils; +import de.thecodelabs.utils.util.ColorUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; diff --git a/src/main/java/de/deadlocker8/budgetmaster/controller/SettingsController.java b/src/main/java/de/deadlocker8/budgetmaster/controller/SettingsController.java index d78ba3fc3468473a43d7ffc6b618fd28e55afe3c..6ecc1b1605ff60276df1352989242ccc770474c8 100644 --- a/src/main/java/de/deadlocker8/budgetmaster/controller/SettingsController.java +++ b/src/main/java/de/deadlocker8/budgetmaster/controller/SettingsController.java @@ -13,8 +13,8 @@ import de.deadlocker8.budgetmaster.services.HelpersService; import de.deadlocker8.budgetmaster.services.ImportService; import de.deadlocker8.budgetmaster.utils.LanguageType; import de.deadlocker8.budgetmaster.utils.Strings; -import de.tobias.utils.util.Localization; -import de.tobias.utils.util.RandomUtils; +import de.thecodelabs.utils.util.Localization; +import de.thecodelabs.utils.util.RandomUtils; import org.joda.time.DateTime; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/de/deadlocker8/budgetmaster/database/DatabaseParser.java b/src/main/java/de/deadlocker8/budgetmaster/database/DatabaseParser.java index de862a1111fe9a01fb543e67fbefc2974793829c..be2d5c360ae21bdbb8b6199c1aa85f1dbadc47a7 100644 --- a/src/main/java/de/deadlocker8/budgetmaster/database/DatabaseParser.java +++ b/src/main/java/de/deadlocker8/budgetmaster/database/DatabaseParser.java @@ -3,7 +3,7 @@ package de.deadlocker8.budgetmaster.database; import com.google.gson.JsonObject; import com.google.gson.JsonParser; import de.deadlocker8.budgetmaster.database.legacy.LegacyParser; -import de.tobias.utils.util.Localization; +import de.thecodelabs.utils.util.Localization; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/de/deadlocker8/budgetmaster/database/DatabaseParser_v3.java b/src/main/java/de/deadlocker8/budgetmaster/database/DatabaseParser_v3.java index 7a2addbc9bef1f2329bdd8686adbbc2d09e08987..b59c0b81efca6116748e047d19ab41ac8c78acb3 100644 --- a/src/main/java/de/deadlocker8/budgetmaster/database/DatabaseParser_v3.java +++ b/src/main/java/de/deadlocker8/budgetmaster/database/DatabaseParser_v3.java @@ -5,7 +5,7 @@ import de.deadlocker8.budgetmaster.entities.*; import de.deadlocker8.budgetmaster.repeating.RepeatingOption; import de.deadlocker8.budgetmaster.repeating.endoption.*; import de.deadlocker8.budgetmaster.repeating.modifier.*; -import de.tobias.utils.util.Localization; +import de.thecodelabs.utils.util.Localization; import org.joda.time.DateTime; import org.joda.time.format.DateTimeFormat; import org.slf4j.Logger; diff --git a/src/main/java/de/deadlocker8/budgetmaster/entities/Category.java b/src/main/java/de/deadlocker8/budgetmaster/entities/Category.java index 71dd608dc33abfd7ee361b3b78c9f83472753b4c..e5901de2fa04f768df423105ca5a63051b99cba9 100644 --- a/src/main/java/de/deadlocker8/budgetmaster/entities/Category.java +++ b/src/main/java/de/deadlocker8/budgetmaster/entities/Category.java @@ -1,7 +1,7 @@ package de.deadlocker8.budgetmaster.entities; import com.google.gson.annotations.Expose; -import de.tobias.utils.util.ColorUtils; +import de.thecodelabs.utils.util.ColorUtils; import javafx.scene.paint.Color; import javax.persistence.*; diff --git a/src/main/java/de/deadlocker8/budgetmaster/repeating/endoption/RepeatingEndType.java b/src/main/java/de/deadlocker8/budgetmaster/repeating/endoption/RepeatingEndType.java index 1efaa978086026d11d9cfb89001397c5cc332f52..8b95d68d5a6b1a5e3da845043991047ac9680766 100644 --- a/src/main/java/de/deadlocker8/budgetmaster/repeating/endoption/RepeatingEndType.java +++ b/src/main/java/de/deadlocker8/budgetmaster/repeating/endoption/RepeatingEndType.java @@ -1,6 +1,6 @@ package de.deadlocker8.budgetmaster.repeating.endoption; -import de.tobias.utils.util.Localization; +import de.thecodelabs.utils.util.Localization; public enum RepeatingEndType { diff --git a/src/main/java/de/deadlocker8/budgetmaster/repeating/modifier/RepeatingModifierType.java b/src/main/java/de/deadlocker8/budgetmaster/repeating/modifier/RepeatingModifierType.java index 9be327326bb212d6dec12c113e482f93d4d14a49..a90f1b2dc3189cece6fbf5716a3cd7ba14a41597 100644 --- a/src/main/java/de/deadlocker8/budgetmaster/repeating/modifier/RepeatingModifierType.java +++ b/src/main/java/de/deadlocker8/budgetmaster/repeating/modifier/RepeatingModifierType.java @@ -1,7 +1,7 @@ package de.deadlocker8.budgetmaster.repeating.modifier; -import de.tobias.utils.util.Localization; +import de.thecodelabs.utils.util.Localization; public enum RepeatingModifierType { diff --git a/src/main/java/de/deadlocker8/budgetmaster/services/AccountService.java b/src/main/java/de/deadlocker8/budgetmaster/services/AccountService.java index 58c9af3453ea5a3ea515775f4ee54df4227bce3b..c81472a47b9805b0cfece4fd3311d5e8f1f37048 100644 --- a/src/main/java/de/deadlocker8/budgetmaster/services/AccountService.java +++ b/src/main/java/de/deadlocker8/budgetmaster/services/AccountService.java @@ -7,7 +7,7 @@ import de.deadlocker8.budgetmaster.entities.AccountType; import de.deadlocker8.budgetmaster.repositories.AccountRepository; import de.deadlocker8.budgetmaster.repositories.TransactionRepository; import de.deadlocker8.budgetmaster.utils.Strings; -import de.tobias.utils.util.Localization; +import de.thecodelabs.utils.util.Localization; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/de/deadlocker8/budgetmaster/services/CategoryService.java b/src/main/java/de/deadlocker8/budgetmaster/services/CategoryService.java index a9a4bb16a0da04175099f84cb8c6fe80a1849345..9edc8f174b18d9b38280090e72fe43f55cfea12f 100644 --- a/src/main/java/de/deadlocker8/budgetmaster/services/CategoryService.java +++ b/src/main/java/de/deadlocker8/budgetmaster/services/CategoryService.java @@ -5,7 +5,7 @@ import de.deadlocker8.budgetmaster.entities.CategoryType; import de.deadlocker8.budgetmaster.entities.Transaction; import de.deadlocker8.budgetmaster.repositories.CategoryRepository; import de.deadlocker8.budgetmaster.utils.Strings; -import de.tobias.utils.util.Localization; +import de.thecodelabs.utils.util.Localization; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/de/deadlocker8/budgetmaster/services/HelpersService.java b/src/main/java/de/deadlocker8/budgetmaster/services/HelpersService.java index 0ec2ac00da18030c4fe2a10bb19e0cb9e3e56378..97e4210bc1a125f6aa35ce6f103cecbb2bf9f41f 100644 --- a/src/main/java/de/deadlocker8/budgetmaster/services/HelpersService.java +++ b/src/main/java/de/deadlocker8/budgetmaster/services/HelpersService.java @@ -10,8 +10,8 @@ import de.deadlocker8.budgetmaster.repositories.TagRepository; import de.deadlocker8.budgetmaster.utils.Colors; import de.deadlocker8.budgetmaster.utils.LanguageType; import de.deadlocker8.budgetmaster.utils.Strings; -import de.tobias.utils.util.ColorUtils; -import de.tobias.utils.util.Localization; +import de.thecodelabs.utils.util.ColorUtils; +import de.thecodelabs.utils.util.Localization; import org.joda.time.DateTime; import org.joda.time.format.DateTimeFormat; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/de/deadlocker8/budgetmaster/services/LocalizationService.java b/src/main/java/de/deadlocker8/budgetmaster/services/LocalizationService.java index 2c213e6a38125cf77241f17e1570a6743e00ade6..b09d0bd1d4de046b60643f973292e008abb5216e 100644 --- a/src/main/java/de/deadlocker8/budgetmaster/services/LocalizationService.java +++ b/src/main/java/de/deadlocker8/budgetmaster/services/LocalizationService.java @@ -1,6 +1,6 @@ package de.deadlocker8.budgetmaster.services; -import de.tobias.utils.util.Localization; +import de.thecodelabs.utils.util.Localization; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/src/main/java/de/deadlocker8/budgetmaster/services/TransactionService.java b/src/main/java/de/deadlocker8/budgetmaster/services/TransactionService.java index fa3b337437dc03f27adc8c46cf4fd99640d944fe..767cfdbfc8c2fb9d5691bfb5763c5d83ae43ca41 100644 --- a/src/main/java/de/deadlocker8/budgetmaster/services/TransactionService.java +++ b/src/main/java/de/deadlocker8/budgetmaster/services/TransactionService.java @@ -8,7 +8,7 @@ import de.deadlocker8.budgetmaster.repositories.CategoryRepository; import de.deadlocker8.budgetmaster.repositories.RepeatingOptionRepository; import de.deadlocker8.budgetmaster.repositories.TransactionRepository; import de.deadlocker8.budgetmaster.utils.Strings; -import de.tobias.utils.util.Localization; +import de.thecodelabs.utils.util.Localization; import org.joda.time.DateTime; import org.joda.time.format.ISODateTimeFormat; import org.slf4j.Logger; diff --git a/src/main/java/de/deadlocker8/budgetmaster/utils/DatabaseConfiguration.java b/src/main/java/de/deadlocker8/budgetmaster/utils/DatabaseConfiguration.java index c59eedefeb4c3ebcff85706f7bad6fdac7716d8d..aa960983c71131b61cb51a3435ac324651daea04 100644 --- a/src/main/java/de/deadlocker8/budgetmaster/utils/DatabaseConfiguration.java +++ b/src/main/java/de/deadlocker8/budgetmaster/utils/DatabaseConfiguration.java @@ -1,7 +1,7 @@ package de.deadlocker8.budgetmaster.utils; -import de.tobias.utils.util.Localization; -import de.tobias.utils.util.SystemUtils; +import de.thecodelabs.utils.util.Localization; +import de.thecodelabs.utils.util.SystemUtils; import org.springframework.boot.autoconfigure.jdbc.DataSourceBuilder; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/src/main/java/de/deadlocker8/budgetmaster/utils/Notification.java b/src/main/java/de/deadlocker8/budgetmaster/utils/Notification.java index 9d6f8bf1d33159f3a42f4f1cf90916585e58370f..65023761ce6959c97ac80584583beb9d224ccaed 100644 --- a/src/main/java/de/deadlocker8/budgetmaster/utils/Notification.java +++ b/src/main/java/de/deadlocker8/budgetmaster/utils/Notification.java @@ -1,6 +1,6 @@ package de.deadlocker8.budgetmaster.utils; -import de.tobias.utils.util.Localization; +import de.thecodelabs.utils.util.Localization; public class Notification { diff --git a/src/main/java/de/deadlocker8/budgetmaster/utils/PropertiesConfiguration.java b/src/main/java/de/deadlocker8/budgetmaster/utils/PropertiesConfiguration.java index 8011c94bb43860dd213cccc62063544141b24599..52910f40f97a612bd0f506d2853d445c81440a56 100644 --- a/src/main/java/de/deadlocker8/budgetmaster/utils/PropertiesConfiguration.java +++ b/src/main/java/de/deadlocker8/budgetmaster/utils/PropertiesConfiguration.java @@ -1,7 +1,7 @@ package de.deadlocker8.budgetmaster.utils; -import de.tobias.utils.util.Localization; -import de.tobias.utils.util.SystemUtils; +import de.thecodelabs.utils.util.Localization; +import de.thecodelabs.utils.util.SystemUtils; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.support.PropertySourcesPlaceholderConfigurer; diff --git a/src/main/resources/templates/header.ftl b/src/main/resources/templates/header.ftl index aeb0cfc6a78361b7ebad07793e6260fe8541b58d..061b7ccc2597aa948b80b142b08eb14668986672 100644 --- a/src/main/resources/templates/header.ftl +++ b/src/main/resources/templates/header.ftl @@ -14,7 +14,7 @@ <link rel="stylesheet" href="/materialize-0.100.2/css/materialize.min.css"> <@style "style"/> <meta name="viewport" content="width=device-width, initial-scale=1.0"/> - <#global locale = static["de.tobias.utils.util.Localization"]> + <#global locale = static["de.thecodelabs.utils.util.Localization"]> <#if helpers.getSettings().isUseDarkTheme()> <#global greenTextColor="text-green"/> diff --git a/src/test/java/de/deadlocker8/budgetmaster/database/DatabaseParser_v3Test.java b/src/test/java/de/deadlocker8/budgetmaster/database/DatabaseParser_v3Test.java index 50cfbfa1987f1cab086da0bbe6175a0392e109d9..5cf8460119fdec0b8c85ae1ba5ab681bdb9ebf6d 100644 --- a/src/test/java/de/deadlocker8/budgetmaster/database/DatabaseParser_v3Test.java +++ b/src/test/java/de/deadlocker8/budgetmaster/database/DatabaseParser_v3Test.java @@ -4,8 +4,8 @@ import de.deadlocker8.budgetmaster.entities.*; import de.deadlocker8.budgetmaster.repeating.RepeatingOption; import de.deadlocker8.budgetmaster.repeating.endoption.RepeatingEndAfterXTimes; import de.deadlocker8.budgetmaster.repeating.modifier.RepeatingModifierDays; -import de.tobias.utils.util.Localization; -import de.tobias.utils.util.Localization.LocalizationDelegate; +import de.thecodelabs.utils.util.Localization; +import de.thecodelabs.utils.util.Localization.LocalizationDelegate; import org.joda.time.DateTime; import org.joda.time.format.DateTimeFormat; import org.junit.Before;