Meishin/LoginSystem
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move new configuration packages and add test for PropertyMap

Browse Source
This commit is contained in:
ljacqu
2016-01-05 21:59:08 +01:00
parent cb07b3df3d
commit 204a564a9a
17 changed files with 114 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/fr/xephi/authme/settings/custom/ConverterSettings.java
+6 -6
View File
@@ -1,12 +1,12 @@
package fr.xephi.authme.settings.custom;
import fr.xephi.authme.settings.custom.domain.Comment;
import fr.xephi.authme.settings.custom.domain.Property;
import fr.xephi.authme.settings.custom.domain.SettingsClass;
import fr.xephi.authme.settings.domain.Comment;
import fr.xephi.authme.settings.domain.Property;
import fr.xephi.authme.settings.domain.SettingsClass;
import static fr.xephi.authme.settings.custom.domain.Property.newProperty;
import static fr.xephi.authme.settings.custom.domain.PropertyType.BOOLEAN;
import static fr.xephi.authme.settings.custom.domain.PropertyType.STRING;
import static fr.xephi.authme.settings.domain.Property.newProperty;
import static fr.xephi.authme.settings.domain.PropertyType.BOOLEAN;
import static fr.xephi.authme.settings.domain.PropertyType.STRING;
public class ConverterSettings implements SettingsClass {
src/main/java/fr/xephi/authme/settings/custom/DatabaseSettings.java
+6 -6
View File
@@ -1,13 +1,13 @@
package fr.xephi.authme.settings.custom;
import fr.xephi.authme.datasource.DataSource;
import fr.xephi.authme.settings.custom.domain.Comment;
import fr.xephi.authme.settings.custom.domain.Property;
import fr.xephi.authme.settings.custom.domain.SettingsClass;
import fr.xephi.authme.settings.domain.Comment;
import fr.xephi.authme.settings.domain.Property;
import fr.xephi.authme.settings.domain.SettingsClass;
import static fr.xephi.authme.settings.custom.domain.Property.newProperty;
import static fr.xephi.authme.settings.custom.domain.PropertyType.BOOLEAN;
import static fr.xephi.authme.settings.custom.domain.PropertyType.STRING;
import static fr.xephi.authme.settings.domain.Property.newProperty;
import static fr.xephi.authme.settings.domain.PropertyType.BOOLEAN;
import static fr.xephi.authme.settings.domain.PropertyType.STRING;
public class DatabaseSettings implements SettingsClass {
src/main/java/fr/xephi/authme/settings/custom/EmailSettings.java
+8 -8
View File
@@ -1,16 +1,16 @@
package fr.xephi.authme.settings.custom;
import fr.xephi.authme.settings.custom.domain.Comment;
import fr.xephi.authme.settings.custom.domain.Property;
import fr.xephi.authme.settings.custom.domain.SettingsClass;
import fr.xephi.authme.settings.domain.Comment;
import fr.xephi.authme.settings.domain.Property;
import fr.xephi.authme.settings.domain.SettingsClass;
import java.util.List;
import static fr.xephi.authme.settings.custom.domain.Property.newProperty;
import static fr.xephi.authme.settings.custom.domain.PropertyType.BOOLEAN;
import static fr.xephi.authme.settings.custom.domain.PropertyType.INTEGER;
import static fr.xephi.authme.settings.custom.domain.PropertyType.STRING;
import static fr.xephi.authme.settings.custom.domain.PropertyType.STRING_LIST;
import static fr.xephi.authme.settings.domain.Property.newProperty;
import static fr.xephi.authme.settings.domain.PropertyType.BOOLEAN;
import static fr.xephi.authme.settings.domain.PropertyType.INTEGER;
import static fr.xephi.authme.settings.domain.PropertyType.STRING;
import static fr.xephi.authme.settings.domain.PropertyType.STRING_LIST;
public class EmailSettings implements SettingsClass {
src/main/java/fr/xephi/authme/settings/custom/HooksSettings.java
+5 -5
View File
@@ -1,11 +1,11 @@
package fr.xephi.authme.settings.custom;
import fr.xephi.authme.settings.custom.domain.Comment;
import fr.xephi.authme.settings.custom.domain.Property;
import fr.xephi.authme.settings.custom.domain.PropertyType;
import fr.xephi.authme.settings.custom.domain.SettingsClass;
import fr.xephi.authme.settings.domain.Comment;
import fr.xephi.authme.settings.domain.Property;
import fr.xephi.authme.settings.domain.PropertyType;
import fr.xephi.authme.settings.domain.SettingsClass;
import static fr.xephi.authme.settings.custom.domain.Property.newProperty;
import static fr.xephi.authme.settings.domain.Property.newProperty;
public class HooksSettings implements SettingsClass {
src/main/java/fr/xephi/authme/settings/custom/NewSetting.java
+4 -4
View File
@@ -1,10 +1,10 @@
package fr.xephi.authme.settings.custom;
import fr.xephi.authme.ConsoleLogger;
import fr.xephi.authme.settings.custom.domain.Comment;
import fr.xephi.authme.settings.custom.domain.Property;
import fr.xephi.authme.settings.custom.domain.SettingsClass;
import fr.xephi.authme.settings.custom.propertymap.PropertyMap;
import fr.xephi.authme.settings.domain.Comment;
import fr.xephi.authme.settings.domain.Property;
import fr.xephi.authme.settings.domain.SettingsClass;
import fr.xephi.authme.settings.propertymap.PropertyMap;
import fr.xephi.authme.util.CollectionUtils;
import fr.xephi.authme.util.StringUtils;
import org.bukkit.configuration.file.YamlConfiguration;
src/main/java/fr/xephi/authme/settings/custom/ProtectionSettings.java
+7 -7
View File
@@ -1,15 +1,15 @@
package fr.xephi.authme.settings.custom;
import fr.xephi.authme.settings.custom.domain.Comment;
import fr.xephi.authme.settings.custom.domain.Property;
import fr.xephi.authme.settings.custom.domain.SettingsClass;
import fr.xephi.authme.settings.domain.Comment;
import fr.xephi.authme.settings.domain.Property;
import fr.xephi.authme.settings.domain.SettingsClass;
import java.util.List;
import static fr.xephi.authme.settings.custom.domain.Property.newProperty;
import static fr.xephi.authme.settings.custom.domain.PropertyType.BOOLEAN;
import static fr.xephi.authme.settings.custom.domain.PropertyType.INTEGER;
import static fr.xephi.authme.settings.custom.domain.PropertyType.STRING_LIST;
import static fr.xephi.authme.settings.domain.Property.newProperty;
import static fr.xephi.authme.settings.domain.PropertyType.BOOLEAN;
import static fr.xephi.authme.settings.domain.PropertyType.INTEGER;
import static fr.xephi.authme.settings.domain.PropertyType.STRING_LIST;
public class ProtectionSettings implements SettingsClass {
src/main/java/fr/xephi/authme/settings/custom/PurgeSettings.java
+7 -7
View File
@@ -1,13 +1,13 @@
package fr.xephi.authme.settings.custom;
import fr.xephi.authme.settings.custom.domain.Comment;
import fr.xephi.authme.settings.custom.domain.Property;
import fr.xephi.authme.settings.custom.domain.SettingsClass;
import fr.xephi.authme.settings.domain.Comment;
import fr.xephi.authme.settings.domain.Property;
import fr.xephi.authme.settings.domain.SettingsClass;
import static fr.xephi.authme.settings.custom.domain.Property.newProperty;
import static fr.xephi.authme.settings.custom.domain.PropertyType.BOOLEAN;
import static fr.xephi.authme.settings.custom.domain.PropertyType.INTEGER;
import static fr.xephi.authme.settings.custom.domain.PropertyType.STRING;
import static fr.xephi.authme.settings.domain.Property.newProperty;
import static fr.xephi.authme.settings.domain.PropertyType.BOOLEAN;
import static fr.xephi.authme.settings.domain.PropertyType.INTEGER;
import static fr.xephi.authme.settings.domain.PropertyType.STRING;
public class PurgeSettings implements SettingsClass {
src/main/java/fr/xephi/authme/settings/custom/SecuritySettings.java
+6 -6
View File
@@ -1,12 +1,12 @@
package fr.xephi.authme.settings.custom;
import fr.xephi.authme.settings.custom.domain.Comment;
import fr.xephi.authme.settings.custom.domain.Property;
import fr.xephi.authme.settings.custom.domain.SettingsClass;
import fr.xephi.authme.settings.domain.Comment;
import fr.xephi.authme.settings.domain.Property;
import fr.xephi.authme.settings.domain.SettingsClass;
import static fr.xephi.authme.settings.custom.domain.Property.newProperty;
import static fr.xephi.authme.settings.custom.domain.PropertyType.BOOLEAN;
import static fr.xephi.authme.settings.custom.domain.PropertyType.INTEGER;
import static fr.xephi.authme.settings.domain.Property.newProperty;
import static fr.xephi.authme.settings.domain.PropertyType.BOOLEAN;
import static fr.xephi.authme.settings.domain.PropertyType.INTEGER;
public class SecuritySettings implements SettingsClass {
src/main/java/fr/xephi/authme/settings/custom/domain/Comment.java → src/main/java/fr/xephi/authme/settings/domain/Comment.java
+1 -1
View File
@@ -1,4 +1,4 @@
package fr.xephi.authme.settings.custom.domain;
package fr.xephi.authme.settings.domain;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
src/main/java/fr/xephi/authme/settings/custom/domain/Property.java → src/main/java/fr/xephi/authme/settings/domain/Property.java
+1 -1
View File
@@ -1,4 +1,4 @@
package fr.xephi.authme.settings.custom.domain;
package fr.xephi.authme.settings.domain;
import org.bukkit.configuration.file.YamlConfiguration;
src/main/java/fr/xephi/authme/settings/custom/domain/PropertyType.java → src/main/java/fr/xephi/authme/settings/domain/PropertyType.java
+1 -1
View File
@@ -1,4 +1,4 @@
package fr.xephi.authme.settings.custom.domain;
package fr.xephi.authme.settings.domain;
import org.bukkit.configuration.file.YamlConfiguration;
src/main/java/fr/xephi/authme/settings/custom/domain/SettingsClass.java → src/main/java/fr/xephi/authme/settings/domain/SettingsClass.java
+1 -1
View File
@@ -1,4 +1,4 @@
package fr.xephi.authme.settings.custom.domain;
package fr.xephi.authme.settings.domain;
/**
* Marker for classes that define {@link Property} fields.
src/main/java/fr/xephi/authme/settings/custom/propertymap/Node.java → src/main/java/fr/xephi/authme/settings/propertymap/Node.java
+1 -1
View File
@@ -1,4 +1,4 @@
package fr.xephi.authme.settings.custom.propertymap;
package fr.xephi.authme.settings.propertymap;
import java.util.ArrayList;
import java.util.List;
src/main/java/fr/xephi/authme/settings/custom/propertymap/PropertyMap.java → src/main/java/fr/xephi/authme/settings/propertymap/PropertyMap.java
+2 -2
View File
@@ -1,6 +1,6 @@
package fr.xephi.authme.settings.custom.propertymap;
package fr.xephi.authme.settings.propertymap;
import fr.xephi.authme.settings.custom.domain.Property;
import fr.xephi.authme.settings.domain.Property;
import java.util.Map;
import java.util.Set;
src/main/java/fr/xephi/authme/settings/custom/propertymap/PropertyMapComparator.java → src/main/java/fr/xephi/authme/settings/propertymap/PropertyMapComparator.java
+2 -2
View File
@@ -1,6 +1,6 @@
package fr.xephi.authme.settings.custom.propertymap;
package fr.xephi.authme.settings.propertymap;
import fr.xephi.authme.settings.custom.domain.Property;
import fr.xephi.authme.settings.domain.Property;
import java.util.Comparator;