From f3465d89c35da9757038da241f06b8914a990b4c Mon Sep 17 00:00:00 2001 From: Stanislav Usenkov Date: Fri, 8 Jul 2016 12:56:41 +0600 Subject: [PATCH] Fix from library. --- .../simsonic/rscPermissions/API/Settings.java | 1 + .../rscPermissions/BukkitPluginMain.java | 2 +- .../Engine/Backends/DatabaseContents.java | 22 ++++++++++++------- .../rscPermissions/Engine/Matchers.java | 6 ----- .../rscPermissions/IndependentMain.java | 1 + 5 files changed, 17 insertions(+), 15 deletions(-) diff --git a/src/main/java/ru/simsonic/rscPermissions/API/Settings.java b/src/main/java/ru/simsonic/rscPermissions/API/Settings.java index d24dfcd..e718f75 100644 --- a/src/main/java/ru/simsonic/rscPermissions/API/Settings.java +++ b/src/main/java/ru/simsonic/rscPermissions/API/Settings.java @@ -7,6 +7,7 @@ public interface Settings { public static final String UPDATER_URL = "http://simsonic.github.io/rscPermissions/latest.json"; public static final String CHAT_PREFIX = "{GOLD}[rscp] {_LS}"; + public static final String UPDATE_CMD = "/rscp update do"; public static final String TEXT_INHERITER = "%"; public static final char SHOW_GROUP_LEVEL = '┏'; diff --git a/src/main/java/ru/simsonic/rscPermissions/BukkitPluginMain.java b/src/main/java/ru/simsonic/rscPermissions/BukkitPluginMain.java index 2dcfe42..ca38bf9 100644 --- a/src/main/java/ru/simsonic/rscPermissions/BukkitPluginMain.java +++ b/src/main/java/ru/simsonic/rscPermissions/BukkitPluginMain.java @@ -32,7 +32,7 @@ public final class BukkitPluginMain extends JavaPlugin { public final static Logger consoleLog = Bukkit.getLogger(); public final Settings settings = new BukkitPluginConfiguration(this); - public final BukkitUpdater updating = new BukkitUpdater(this, Settings.UPDATER_URL, Settings.CHAT_PREFIX); + public final BukkitUpdater updating = new BukkitUpdater(this, Settings.UPDATER_URL, Settings.CHAT_PREFIX, Settings.UPDATE_CMD); public final BackendJson localStorage = new BackendJson(getDataFolder()); public final BackendDatabase connection = new BackendDatabase(consoleLog); public final InternalCache internalCache = new InternalCache(); diff --git a/src/main/java/ru/simsonic/rscPermissions/Engine/Backends/DatabaseContents.java b/src/main/java/ru/simsonic/rscPermissions/Engine/Backends/DatabaseContents.java index a54af85..899b07f 100644 --- a/src/main/java/ru/simsonic/rscPermissions/Engine/Backends/DatabaseContents.java +++ b/src/main/java/ru/simsonic/rscPermissions/Engine/Backends/DatabaseContents.java @@ -7,7 +7,7 @@ import ru.simsonic.rscPermissions.API.PlayerType; import ru.simsonic.rscPermissions.API.RowEntity; import ru.simsonic.rscPermissions.API.RowInheritance; import ru.simsonic.rscPermissions.API.RowPermission; -import ru.simsonic.rscPermissions.Engine.Matchers; +import ru.simsonic.rscPermissions.API.Settings; public class DatabaseContents { @@ -33,7 +33,7 @@ public class DatabaseContents for(RowEntity row : entities) { subRowEntry = 0; - final String[] splittedByEntity = Matchers.splitDatabaseRows(row.entity); + final String[] splittedByEntity = splitDatabaseRows(row.entity); for(String oneEntity : splittedByEntity) { final RowEntity clone = row.clone(); @@ -47,9 +47,9 @@ public class DatabaseContents for(RowPermission row : permissions) { subRowEntry = 0; - final String[] splittedByEntity = Matchers.splitDatabaseRows(row.entity); - final String[] splittedByPermission = Matchers.splitDatabaseRows(row.permission); - final String[] splittedByDestination = Matchers.splitDatabaseRows(row.destinationSource); + final String[] splittedByEntity = splitDatabaseRows(row.entity); + final String[] splittedByPermission = splitDatabaseRows(row.permission); + final String[] splittedByDestination = splitDatabaseRows(row.destinationSource); row.destinationSource = null; for(String oneDestination : splittedByDestination) { @@ -71,9 +71,9 @@ public class DatabaseContents for(RowInheritance row : inheritance) { subRowEntry = 0; - final String[] splittedByEntity = Matchers.splitDatabaseRows(row.entity); - final String[] splittedByParent = Matchers.splitDatabaseRows(row.parent); - final String[] splittedByDestination = Matchers.splitDatabaseRows(row.destinationSource); + final String[] splittedByEntity = splitDatabaseRows(row.entity); + final String[] splittedByParent = splitDatabaseRows(row.parent); + final String[] splittedByDestination = splitDatabaseRows(row.destinationSource); row.destinationSource = null; for(String oneDestination : splittedByDestination) { @@ -150,4 +150,10 @@ public class DatabaseContents && (permissions != null && permissions.length > 0) && (inheritance != null && inheritance.length > 0)); } + private static String[] splitDatabaseRows(String multiobject) + { + return multiobject != null + ? multiobject.split(Settings.REGEXP_ROW_SPLIT) + : new String[] { "" }; + } } diff --git a/src/main/java/ru/simsonic/rscPermissions/Engine/Matchers.java b/src/main/java/ru/simsonic/rscPermissions/Engine/Matchers.java index 33aa7d3..b54b097 100644 --- a/src/main/java/ru/simsonic/rscPermissions/Engine/Matchers.java +++ b/src/main/java/ru/simsonic/rscPermissions/Engine/Matchers.java @@ -11,12 +11,6 @@ public final class Matchers private static final Pattern PATTERN_FOR_UUID_DASHLESS = Pattern.compile(Settings.REGEXP_UUID); private static final Pattern PATTERN_FOR_IPADDR = Pattern.compile(Settings.REGEXP_IPADDR); private static final Pattern PATTERN_FOR_SUBNETMASK = Pattern.compile(Settings.REGEXP_SUBNET); - public static String[] splitDatabaseRows(String multiobject) - { - return multiobject != null - ? multiobject.split(Settings.REGEXP_ROW_SPLIT) - : new String[] { "" }; - } public static boolean isCorrectNickname(String entityName) { if(entityName == null || "".equals(entityName)) diff --git a/src/main/java/ru/simsonic/rscPermissions/IndependentMain.java b/src/main/java/ru/simsonic/rscPermissions/IndependentMain.java index b2eb418..509e14f 100644 --- a/src/main/java/ru/simsonic/rscPermissions/IndependentMain.java +++ b/src/main/java/ru/simsonic/rscPermissions/IndependentMain.java @@ -1,4 +1,5 @@ package ru.simsonic.rscPermissions; + import java.io.File; import java.util.Map; import java.util.logging.Logger;