No red files anymore. Some stuff still unfinished.

+ weekly code cleanup
This commit is contained in:
Jesse Boyd 2014-10-11 00:33:10 -07:00
parent 2f5f3ac8e2
commit a6375796c0
94 changed files with 14237 additions and 12908 deletions

View file

@ -13,91 +13,97 @@ import org.bukkit.plugin.Plugin;
/**
* Connects to and uses a SQLite database
*
*
* @author Citymonstret
* @author tips48
*/
public class SQLite extends Database {
private Connection connection;
private final String dbLocation;
private Connection connection;
private final String dbLocation;
/**
* Creates a new SQLite instance
*
* @param plugin
* Plugin instance
* @param dbLocation
* Location of the Database (Must end in .db)
*/
public SQLite(Plugin plugin, String dbLocation) {
super(plugin);
this.dbLocation = dbLocation;
}
/**
* Creates a new SQLite instance
*
* @param plugin
* Plugin instance
* @param dbLocation
* Location of the Database (Must end in .db)
*/
public SQLite(Plugin plugin, String dbLocation) {
super(plugin);
this.dbLocation = dbLocation;
}
@Override
public Connection openConnection() throws SQLException, ClassNotFoundException {
if (checkConnection()) {
return this.connection;
}
if (!this.plugin.getDataFolder().exists()) {
this.plugin.getDataFolder().mkdirs();
}
File file = new File(this.plugin.getDataFolder(), this.dbLocation);
if (!(file.exists())) {
try {
file.createNewFile();
} catch (IOException e) {
this.plugin.getLogger().log(Level.SEVERE, "Unable to create database!");
}
}
Class.forName("org.sqlite.JDBC");
this.connection = DriverManager.getConnection("jdbc:sqlite:" + this.plugin.getDataFolder().toPath().toString() + "/" + this.dbLocation);
return this.connection;
}
@Override
public Connection openConnection() throws SQLException,
ClassNotFoundException {
if (checkConnection()) {
return this.connection;
}
if (!this.plugin.getDataFolder().exists()) {
this.plugin.getDataFolder().mkdirs();
}
File file = new File(this.plugin.getDataFolder(), this.dbLocation);
if (!(file.exists())) {
try {
file.createNewFile();
} catch (IOException e) {
this.plugin.getLogger().log(Level.SEVERE,
"Unable to create database!");
}
}
Class.forName("org.sqlite.JDBC");
this.connection = DriverManager.getConnection("jdbc:sqlite:"
+ this.plugin.getDataFolder().toPath().toString() + "/"
+ this.dbLocation);
return this.connection;
}
@Override
public boolean checkConnection() throws SQLException {
return (this.connection != null) && !this.connection.isClosed();
}
@Override
public boolean checkConnection() throws SQLException {
return (this.connection != null) && !this.connection.isClosed();
}
@Override
public Connection getConnection() {
return this.connection;
}
@Override
public Connection getConnection() {
return this.connection;
}
@Override
public boolean closeConnection() throws SQLException {
if (this.connection == null) {
return false;
}
this.connection.close();
return true;
}
@Override
public boolean closeConnection() throws SQLException {
if (this.connection == null) {
return false;
}
this.connection.close();
return true;
}
@Override
public ResultSet querySQL(String query) throws SQLException, ClassNotFoundException {
if (checkConnection()) {
openConnection();
}
@Override
public ResultSet querySQL(String query) throws SQLException,
ClassNotFoundException {
if (checkConnection()) {
openConnection();
}
Statement statement = this.connection.createStatement();
Statement statement = this.connection.createStatement();
ResultSet result = statement.executeQuery(query);
ResultSet result = statement.executeQuery(query);
return result;
}
return result;
}
@Override
public int updateSQL(String query) throws SQLException, ClassNotFoundException {
if (checkConnection()) {
openConnection();
}
@Override
public int updateSQL(String query) throws SQLException,
ClassNotFoundException {
if (checkConnection()) {
openConnection();
}
Statement statement = this.connection.createStatement();
Statement statement = this.connection.createStatement();
int result = statement.executeUpdate(query);
int result = statement.executeUpdate(query);
return result;
}
return result;
}
}