* Simplified regexp for destinations.

- Removed BaseImporter interface.

src/main/java/ru/simsonic/rscPermissions/API/Destination.java

@@ -69,7 +69,7 @@ public class Destination
 			"<wildcard>" + pattern.toLowerCase() + "</wildcard>");
 	}
 	private static final Pattern destinationPattern = Pattern.compile(
-		"(?:((?:\\w|\\*|\\?)*):)?((?:\\w|\\*|\\?)*)?(?:@((?:\\w|\\*|\\?)*))?");
+		"(?:([\\w\\-\\_\\*\\?]*):)?([\\w\\-\\_\\*\\?]*)?(?:@([\\w\\-\\_\\*\\?]*))?");
 	public static Destination parseDestination(String destination)
 	{
 		final Matcher match = destinationPattern.matcher(destination);

src/main/java/ru/simsonic/rscPermissions/Bukkit/BukkitCommands.java

@@ -1,4 +1,5 @@
 package ru.simsonic.rscPermissions.Bukkit;
+import java.io.File;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Map;
@@ -9,7 +10,6 @@ import org.bukkit.entity.Player;
 import org.bukkit.permissions.PermissionAttachment;
 import ru.simsonic.rscPermissions.BukkitPluginMain;
 import ru.simsonic.rscPermissions.Backends.DatabaseContents;
-import ru.simsonic.rscPermissions.Importers.PermissionsEx_YAML;
 import ru.simsonic.rscUtilityLibrary.CommandProcessing.CommandAnswerException;
 import ru.simsonic.rscUtilityLibrary.RestartableThread;
 
@@ -167,15 +167,18 @@ public class BukkitCommands
 								if(args.length == 2)
 									break;
 								// TO DO HERE
-								PermissionsEx_YAML importer_pex = new PermissionsEx_YAML(rscp, args[2]);
+								PermissionsEx_YAML importer_pex = new PermissionsEx_YAML(
+									new File(rscp.getDataFolder(), args[2]));
 								threadFetchTablesData();
 								throw new CommandAnswerException(new String[]
 								{
 									"Data has been imported successfully!",
-									"Entities: {MAGENTA}" + Integer.toString(importer_pex.getEntities().length),
+									/*
+									"Entities: {MAGENTA}"    + Integer.toString(importer_pex.getEntities().length),
 									"Permissions: {MAGENTA}" + Integer.toString(importer_pex.getPermissions().length),
 									"Inheritance: {MAGENTA}" + Integer.toString(importer_pex.getInheritance().length),
-									"{_DR}{_B}FAKE :p - all this is undone yet!",
+									*/
+									"{_DR}{_B}IT IS FAKE :p - all this is undone yet!",
 								});
 							case "pex-sql":
 								threadMigrateFromPExSQL(sender);

src/main/java/ru/simsonic/rscPermissions/Bukkit/PermissionsEx_YAML.java

@@ -1,21 +1,19 @@
-package ru.simsonic.rscPermissions.Importers;
+package ru.simsonic.rscPermissions.Bukkit;
 import java.io.File;
 import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.configuration.file.FileConfiguration;
 import org.bukkit.configuration.file.YamlConfiguration;
-import org.bukkit.plugin.Plugin;
+import ru.simsonic.rscUtilityLibrary.CommandProcessing.CommandAnswerException;
 
-public final class PermissionsEx_YAML extends BaseImporter
+public final class PermissionsEx_YAML
 {
-	public PermissionsEx_YAML(Plugin plugin, String fileName)
+	public PermissionsEx_YAML(File permissionsYml) throws CommandAnswerException
 	{
-		if(fileName == null || "".equals(fileName))
-			fileName = "permissions.yml";
 		try
 		{
-			final FileConfiguration config = YamlConfiguration.loadConfiguration(new File(plugin.getDataFolder(), fileName));
+			final FileConfiguration config = YamlConfiguration.loadConfiguration(permissionsYml);
 			final ConfigurationSection csGroups = config.getConfigurationSection("groups");
-			final ConfigurationSection csUsers = config.getConfigurationSection("users");
+			final ConfigurationSection csUsers  = config.getConfigurationSection("users");
 			final ConfigurationSection csWorlds = config.getConfigurationSection("worlds");
 		} catch(NullPointerException ex) {
 		}

src/main/java/ru/simsonic/rscPermissions/BukkitPluginMain.java

@@ -31,7 +31,7 @@ public final class BukkitPluginMain extends JavaPlugin
 	public  final BridgeForBukkitAPI bridgeForBukkit = new BridgeForBukkitAPI(this);
 	public  final PlayerEventsListener bukkitListener = new PlayerEventsListener(this);
 	public  final BackendJson fileCache = new BackendJson(getDataFolder());
-	public  final BackendDatabase connection = new BackendDatabase(BukkitPluginMain.consoleLog, getServer().getServerId());
+	public  final BackendDatabase connection = new BackendDatabase(consoleLog, getServer().getServerId());
 	public  final InternalCache internalCache = new InternalCache();
 	public  final BukkitPermissionManager permissionManager = new BukkitPermissionManager(this);
 	public  final BukkitRegionProviders regionListProvider = new BukkitRegionProviders(this);

src/main/java/ru/simsonic/rscPermissions/Importers/BaseImporter.java

@@ -1,24 +0,0 @@
-package ru.simsonic.rscPermissions.Importers;
-import java.util.ArrayList;
-import ru.simsonic.rscPermissions.API.RowEntity;
-import ru.simsonic.rscPermissions.API.RowInheritance;
-import ru.simsonic.rscPermissions.API.RowPermission;
-
-public abstract class BaseImporter
-{
-	protected ArrayList<RowEntity> imported_e = new ArrayList<>();
-	protected ArrayList<RowPermission> imported_p = new ArrayList<>();
-	protected ArrayList<RowInheritance> imported_i = new ArrayList<>();
-	public RowEntity[] getEntities()
-	{
-		return imported_e.toArray(new RowEntity[imported_e.size()]);
-	}
-	public RowPermission[] getPermissions()
-	{
-		return imported_p.toArray(new RowPermission[imported_p.size()]);
-	}
-	public RowInheritance[] getInheritance()
-	{
-		return imported_i.toArray(new RowInheritance[imported_i.size()]);
-	}
-}