Browse Source

Fix from library.

master
Stanislav Usenkov 9 years ago
parent
commit
f3465d89c3
  1. 1
      src/main/java/ru/simsonic/rscPermissions/API/Settings.java
  2. 2
      src/main/java/ru/simsonic/rscPermissions/BukkitPluginMain.java
  3. 22
      src/main/java/ru/simsonic/rscPermissions/Engine/Backends/DatabaseContents.java
  4. 6
      src/main/java/ru/simsonic/rscPermissions/Engine/Matchers.java
  5. 1
      src/main/java/ru/simsonic/rscPermissions/IndependentMain.java

1
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 UPDATER_URL = "http://simsonic.github.io/rscPermissions/latest.json";
public static final String CHAT_PREFIX = "{GOLD}[rscp] {_LS}"; 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 String TEXT_INHERITER = "%";
public static final char SHOW_GROUP_LEVEL = '┏'; public static final char SHOW_GROUP_LEVEL = '┏';

2
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 static Logger consoleLog = Bukkit.getLogger();
public final Settings settings = new BukkitPluginConfiguration(this); 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 BackendJson localStorage = new BackendJson(getDataFolder());
public final BackendDatabase connection = new BackendDatabase(consoleLog); public final BackendDatabase connection = new BackendDatabase(consoleLog);
public final InternalCache internalCache = new InternalCache(); public final InternalCache internalCache = new InternalCache();

22
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.RowEntity;
import ru.simsonic.rscPermissions.API.RowInheritance; import ru.simsonic.rscPermissions.API.RowInheritance;
import ru.simsonic.rscPermissions.API.RowPermission; import ru.simsonic.rscPermissions.API.RowPermission;
import ru.simsonic.rscPermissions.Engine.Matchers; import ru.simsonic.rscPermissions.API.Settings;
public class DatabaseContents public class DatabaseContents
{ {
@ -33,7 +33,7 @@ public class DatabaseContents
for(RowEntity row : entities) for(RowEntity row : entities)
{ {
subRowEntry = 0; subRowEntry = 0;
final String[] splittedByEntity = Matchers.splitDatabaseRows(row.entity); final String[] splittedByEntity = splitDatabaseRows(row.entity);
for(String oneEntity : splittedByEntity) for(String oneEntity : splittedByEntity)
{ {
final RowEntity clone = row.clone(); final RowEntity clone = row.clone();
@ -47,9 +47,9 @@ public class DatabaseContents
for(RowPermission row : permissions) for(RowPermission row : permissions)
{ {
subRowEntry = 0; subRowEntry = 0;
final String[] splittedByEntity = Matchers.splitDatabaseRows(row.entity); final String[] splittedByEntity = splitDatabaseRows(row.entity);
final String[] splittedByPermission = Matchers.splitDatabaseRows(row.permission); final String[] splittedByPermission = splitDatabaseRows(row.permission);
final String[] splittedByDestination = Matchers.splitDatabaseRows(row.destinationSource); final String[] splittedByDestination = splitDatabaseRows(row.destinationSource);
row.destinationSource = null; row.destinationSource = null;
for(String oneDestination : splittedByDestination) for(String oneDestination : splittedByDestination)
{ {
@ -71,9 +71,9 @@ public class DatabaseContents
for(RowInheritance row : inheritance) for(RowInheritance row : inheritance)
{ {
subRowEntry = 0; subRowEntry = 0;
final String[] splittedByEntity = Matchers.splitDatabaseRows(row.entity); final String[] splittedByEntity = splitDatabaseRows(row.entity);
final String[] splittedByParent = Matchers.splitDatabaseRows(row.parent); final String[] splittedByParent = splitDatabaseRows(row.parent);
final String[] splittedByDestination = Matchers.splitDatabaseRows(row.destinationSource); final String[] splittedByDestination = splitDatabaseRows(row.destinationSource);
row.destinationSource = null; row.destinationSource = null;
for(String oneDestination : splittedByDestination) for(String oneDestination : splittedByDestination)
{ {
@ -150,4 +150,10 @@ public class DatabaseContents
&& (permissions != null && permissions.length > 0) && (permissions != null && permissions.length > 0)
&& (inheritance != null && inheritance.length > 0)); && (inheritance != null && inheritance.length > 0));
} }
private static String[] splitDatabaseRows(String multiobject)
{
return multiobject != null
? multiobject.split(Settings.REGEXP_ROW_SPLIT)
: new String[] { "" };
}
} }

6
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_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_IPADDR = Pattern.compile(Settings.REGEXP_IPADDR);
private static final Pattern PATTERN_FOR_SUBNETMASK = Pattern.compile(Settings.REGEXP_SUBNET); 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) public static boolean isCorrectNickname(String entityName)
{ {
if(entityName == null || "".equals(entityName)) if(entityName == null || "".equals(entityName))

1
src/main/java/ru/simsonic/rscPermissions/IndependentMain.java

@ -1,4 +1,5 @@
package ru.simsonic.rscPermissions; package ru.simsonic.rscPermissions;
import java.io.File; import java.io.File;
import java.util.Map; import java.util.Map;
import java.util.logging.Logger; import java.util.logging.Logger;

Loading…
Cancel
Save