Finalized some fields, removed redundant code, various other fixes

This commit is contained in:
Tim Visée
2015-11-23 22:14:03 +01:00
parent 83e5d726af
commit 82bf0f45ca
64 changed files with 320 additions and 323 deletions
@@ -18,9 +18,9 @@ import java.io.IOException;
*/
public class CrazyLoginConverter implements Converter {
public AuthMe instance;
public DataSource database;
public CommandSender sender;
public final AuthMe instance;
public final DataSource database;
public final CommandSender sender;
/**
* Constructor for CrazyLoginConverter.
@@ -14,7 +14,7 @@ import java.sql.*;
*/
public class FlatToSqlite implements Converter {
public CommandSender sender;
public final CommandSender sender;
private String tableName;
private String columnName;
private String columnPassword;
@@ -11,7 +11,7 @@ import fr.xephi.authme.settings.Settings;
*/
public class ForceFlatToSqlite implements Converter {
private DataSource data;
private final DataSource data;
/**
* Constructor for ForceFlatToSqlite.
@@ -23,9 +23,9 @@ import java.util.Map.Entry;
*/
public class RakamakConverter implements Converter {
public AuthMe instance;
public DataSource database;
public CommandSender sender;
public final AuthMe instance;
public final DataSource database;
public final CommandSender sender;
/**
* Constructor for RakamakConverter.
@@ -12,8 +12,8 @@ import java.io.File;
*/
public class RoyalAuthConverter implements Converter {
public AuthMe plugin;
private DataSource data;
public final AuthMe plugin;
private final DataSource data;
/**
* Constructor for RoyalAuthConverter.
@@ -14,9 +14,9 @@ import java.util.List;
*/
public class SqlToFlat implements Converter {
public AuthMe plugin;
public DataSource database;
public CommandSender sender;
public final AuthMe plugin;
public final DataSource database;
public final CommandSender sender;
/**
* Constructor for SqlToFlat.
@@ -9,9 +9,9 @@ import org.bukkit.command.CommandSender;
*/
public class vAuthConverter implements Converter {
public AuthMe plugin;
public DataSource database;
public CommandSender sender;
public final AuthMe plugin;
public final DataSource database;
public final CommandSender sender;
/**
* Constructor for vAuthConverter.
@@ -17,9 +17,9 @@ import java.util.UUID;
*/
public class vAuthFileReader {
public AuthMe plugin;
public DataSource database;
public CommandSender sender;
public final AuthMe plugin;
public final DataSource database;
public final CommandSender sender;
/**
* Constructor for vAuthFileReader.
@@ -38,7 +38,7 @@ public class vAuthFileReader {
*
* @throws IOException
*/
public void convert() throws IOException {
public void convert() {
final File file = new File(plugin.getDataFolder().getParent() + "" + File.separator + "vAuth" + File.separator + "passwords.yml");
Scanner scanner;
try {
@@ -7,8 +7,8 @@ import org.bukkit.command.CommandSender;
*/
public class xAuthConverter implements Converter {
public AuthMe plugin;
public CommandSender sender;
public final AuthMe plugin;
public final CommandSender sender;
/**
* Constructor for xAuthConverter.
@@ -20,9 +20,9 @@ import java.util.List;
*/
public class xAuthToFlat {
public AuthMe instance;
public DataSource database;
public CommandSender sender;
public final AuthMe instance;
public final DataSource database;
public final CommandSender sender;
/**
* Constructor for xAuthToFlat.