Archived
0

Fix packages

This commit is contained in:
Dico200
2017-11-15 19:03:56 +00:00
parent a1a03fdad1
commit f76b37b0a3
48 changed files with 120 additions and 123 deletions

View File

@@ -1,4 +1,4 @@
package main.java.com.redstoner.annotations; package com.redstoner.annotations;
import java.lang.annotation.ElementType; import java.lang.annotation.ElementType;
import java.lang.annotation.Retention; import java.lang.annotation.Retention;

View File

@@ -1,12 +1,12 @@
package main.java.com.redstoner.annotations; package com.redstoner.annotations;
import com.redstoner.misc.CommandHolder;
import java.lang.annotation.ElementType; import java.lang.annotation.ElementType;
import java.lang.annotation.Retention; import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy; import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target; import java.lang.annotation.Target;
import main.java.com.redstoner.misc.CommandHolder;
@Target(ElementType.TYPE) @Target(ElementType.TYPE)
@Retention(RetentionPolicy.RUNTIME) @Retention(RetentionPolicy.RUNTIME)
public @interface Commands public @interface Commands

View File

@@ -1,4 +1,4 @@
package main.java.com.redstoner.annotations; package com.redstoner.annotations;
import java.lang.annotation.ElementType; import java.lang.annotation.ElementType;
import java.lang.annotation.Retention; import java.lang.annotation.Retention;

View File

@@ -1,4 +1,4 @@
package main.java.com.redstoner.annotations; package com.redstoner.annotations;
import java.lang.annotation.ElementType; import java.lang.annotation.ElementType;
import java.lang.annotation.Retention; import java.lang.annotation.Retention;

View File

@@ -1,4 +1,4 @@
package main.java.com.redstoner.annotations; package com.redstoner.annotations;
import java.lang.annotation.Documented; import java.lang.annotation.Documented;
import java.lang.annotation.ElementType; import java.lang.annotation.ElementType;

View File

@@ -1,4 +1,4 @@
package main.java.com.redstoner.exceptions; package com.redstoner.exceptions;
public class NonSaveableConfigException extends Exception { public class NonSaveableConfigException extends Exception {
private static final long serialVersionUID = -7271481973389455510L; private static final long serialVersionUID = -7271481973389455510L;

View File

@@ -1,15 +1,13 @@
package main.java.com.redstoner.faucet; package com.redstoner.faucet;
import java.util.HashMap;
import main.java.com.redstoner.annotations.Version;
import org.bukkit.plugin.java.JavaPlugin;
import com.nemez.cmdmgr.Command; import com.nemez.cmdmgr.Command;
import main.java.com.redstoner.misc.mysql.MysqlHandler; import com.redstoner.annotations.Version;
import main.java.com.redstoner.modules.Module; import com.redstoner.misc.mysql.MysqlHandler;
import com.redstoner.modules.Module;
import net.nemez.chatapi.ChatAPI; import net.nemez.chatapi.ChatAPI;
import org.bukkit.plugin.java.JavaPlugin;
import java.util.HashMap;
/** Main class. Duh. /** Main class. Duh.
* *

View File

@@ -1,4 +1,4 @@
package main.java.com.redstoner.misc; package com.redstoner.misc;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;

View File

@@ -1,4 +1,4 @@
package main.java.com.redstoner.misc; package com.redstoner.misc;
/** @author Pepich */ /** @author Pepich */
public enum CommandHolder public enum CommandHolder

View File

@@ -1,15 +1,15 @@
package main.java.com.redstoner.misc; package com.redstoner.misc;
import java.io.File;
import java.io.FileReader;
import java.io.FileWriter;
import java.io.IOException;
import org.json.simple.JSONArray; import org.json.simple.JSONArray;
import org.json.simple.JSONObject; import org.json.simple.JSONObject;
import org.json.simple.parser.JSONParser; import org.json.simple.parser.JSONParser;
import org.json.simple.parser.ParseException; import org.json.simple.parser.ParseException;
import java.io.File;
import java.io.FileReader;
import java.io.FileWriter;
import java.io.IOException;
/** This class provides simple JSON handling, like storing and loading from and to files. /** This class provides simple JSON handling, like storing and loading from and to files.
* *
* @author Pepich */ * @author Pepich */

View File

@@ -1,4 +1,4 @@
package main.java.com.redstoner.misc; package com.redstoner.misc;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.Arrays; import java.util.Arrays;

View File

@@ -1,4 +1,4 @@
package main.java.com.redstoner.misc.mysql; package com.redstoner.misc.mysql;
import java.io.File; import java.io.File;
import java.io.FileReader; import java.io.FileReader;
@@ -11,13 +11,13 @@ import java.util.Map;
import java.util.Map.Entry; import java.util.Map.Entry;
import java.util.Set; import java.util.Set;
import main.java.com.redstoner.faucet.Faucet; import com.redstoner.faucet.Faucet;
import org.json.simple.JSONArray; import org.json.simple.JSONArray;
import org.json.simple.JSONObject; import org.json.simple.JSONObject;
import org.json.simple.parser.JSONParser; import org.json.simple.parser.JSONParser;
import org.json.simple.parser.ParseException; import org.json.simple.parser.ParseException;
import main.java.com.redstoner.exceptions.NonSaveableConfigException; import com.redstoner.exceptions.NonSaveableConfigException;
public class Config public class Config
{ {

View File

@@ -1,4 +1,10 @@
package main.java.com.redstoner.misc.mysql; package com.redstoner.misc.mysql;
import com.redstoner.faucet.Faucet;
import org.json.simple.JSONArray;
import org.json.simple.JSONObject;
import org.json.simple.parser.JSONParser;
import org.json.simple.parser.ParseException;
import java.io.File; import java.io.File;
import java.io.FileNotFoundException; import java.io.FileNotFoundException;
@@ -13,12 +19,6 @@ import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import main.java.com.redstoner.faucet.Faucet;
import org.json.simple.JSONArray;
import org.json.simple.JSONObject;
import org.json.simple.parser.JSONParser;
import org.json.simple.parser.ParseException;
public class JSONManager public class JSONManager
{ {
public static Map<Serializable, Serializable> getConfiguration(String fileName) public static Map<Serializable, Serializable> getConfiguration(String fileName)

View File

@@ -1,4 +1,10 @@
package main.java.com.redstoner.misc.mysql; package com.redstoner.misc.mysql;
import com.redstoner.faucet.Faucet;
import com.redstoner.misc.mysql.elements.MysqlDatabase;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
import org.json.simple.parser.ParseException;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
@@ -13,13 +19,6 @@ import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import main.java.com.redstoner.faucet.Faucet;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
import org.json.simple.parser.ParseException;
import main.java.com.redstoner.misc.mysql.elements.MysqlDatabase;
public class MysqlHandler public class MysqlHandler
{ {
public static MysqlHandler INSTANCE; public static MysqlHandler INSTANCE;

View File

@@ -1,4 +1,4 @@
package main.java.com.redstoner.misc.mysql; package com.redstoner.misc.mysql;
import java.sql.CallableStatement; import java.sql.CallableStatement;
import java.sql.Connection; import java.sql.Connection;

View File

@@ -1,4 +1,4 @@
package main.java.com.redstoner.misc.mysql.elements; package com.redstoner.misc.mysql.elements;
public enum ConstraintOperator { public enum ConstraintOperator {
LESS_THAN, GREATER_THAN, EQUAL, NOT_EQUAL, LESS_THAN_OR_EQUAL, GREATER_THAN_OR_EQUAL; LESS_THAN, GREATER_THAN, EQUAL, NOT_EQUAL, LESS_THAN_OR_EQUAL, GREATER_THAN_OR_EQUAL;

View File

@@ -1,4 +1,4 @@
package main.java.com.redstoner.misc.mysql.elements; package com.redstoner.misc.mysql.elements;
public class MysqlConstraint { public class MysqlConstraint {
private String fieldName, value; private String fieldName, value;

View File

@@ -1,4 +1,4 @@
package main.java.com.redstoner.misc.mysql.elements; package com.redstoner.misc.mysql.elements;
import java.sql.Connection; import java.sql.Connection;
import java.sql.DatabaseMetaData; import java.sql.DatabaseMetaData;
@@ -7,7 +7,7 @@ import java.sql.SQLException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import main.java.com.redstoner.misc.mysql.MysqlQueryHandler; import com.redstoner.misc.mysql.MysqlQueryHandler;
public class MysqlDatabase { public class MysqlDatabase {
private Connection connection; private Connection connection;

View File

@@ -1,6 +1,6 @@
package main.java.com.redstoner.misc.mysql.elements; package com.redstoner.misc.mysql.elements;
import main.java.com.redstoner.misc.mysql.types.MysqlType; import com.redstoner.misc.mysql.types.MysqlType;
public class MysqlField { public class MysqlField {
private String name; private String name;

View File

@@ -1,4 +1,4 @@
package main.java.com.redstoner.misc.mysql.elements; package com.redstoner.misc.mysql.elements;
import java.sql.ResultSet; import java.sql.ResultSet;
import java.sql.SQLException; import java.sql.SQLException;

View File

@@ -1,4 +1,6 @@
package main.java.com.redstoner.misc.mysql.elements; package com.redstoner.misc.mysql.elements;
import com.redstoner.misc.mysql.MysqlQueryHandler;
import java.sql.DatabaseMetaData; import java.sql.DatabaseMetaData;
import java.sql.ResultSet; import java.sql.ResultSet;
@@ -6,8 +8,6 @@ import java.sql.SQLException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import main.java.com.redstoner.misc.mysql.MysqlQueryHandler;
public class MysqlTable public class MysqlTable
{ {
private MysqlDatabase database; private MysqlDatabase database;

View File

@@ -1,29 +1,29 @@
package main.java.com.redstoner.misc.mysql.types; package com.redstoner.misc.mysql.types;
import main.java.com.redstoner.misc.mysql.types.date.Date; import com.redstoner.misc.mysql.types.date.Date;
import main.java.com.redstoner.misc.mysql.types.date.DateTime; import com.redstoner.misc.mysql.types.date.DateTime;
import main.java.com.redstoner.misc.mysql.types.date.Time; import com.redstoner.misc.mysql.types.date.Time;
import main.java.com.redstoner.misc.mysql.types.date.TimeStamp; import com.redstoner.misc.mysql.types.date.TimeStamp;
import main.java.com.redstoner.misc.mysql.types.date.Year; import com.redstoner.misc.mysql.types.date.Year;
import main.java.com.redstoner.misc.mysql.types.number.Double; import com.redstoner.misc.mysql.types.number.Double;
import main.java.com.redstoner.misc.mysql.types.number.Float; import com.redstoner.misc.mysql.types.number.Float;
import main.java.com.redstoner.misc.mysql.types.number.Int; import com.redstoner.misc.mysql.types.number.Int;
import main.java.com.redstoner.misc.mysql.types.number.MediumInt; import com.redstoner.misc.mysql.types.number.MediumInt;
import main.java.com.redstoner.misc.mysql.types.number.SmallInt; import com.redstoner.misc.mysql.types.number.SmallInt;
import main.java.com.redstoner.misc.mysql.types.text.Blob; import com.redstoner.misc.mysql.types.text.Blob;
import main.java.com.redstoner.misc.mysql.types.text.Char; import com.redstoner.misc.mysql.types.text.Char;
import main.java.com.redstoner.misc.mysql.types.text.Enum; import com.redstoner.misc.mysql.types.text.Enum;
import main.java.com.redstoner.misc.mysql.types.text.LongBlob; import com.redstoner.misc.mysql.types.text.LongBlob;
import main.java.com.redstoner.misc.mysql.types.text.LongText; import com.redstoner.misc.mysql.types.text.LongText;
import main.java.com.redstoner.misc.mysql.types.text.MediumBlob; import com.redstoner.misc.mysql.types.text.MediumBlob;
import main.java.com.redstoner.misc.mysql.types.text.MediumText; import com.redstoner.misc.mysql.types.text.MediumText;
import main.java.com.redstoner.misc.mysql.types.text.Set; import com.redstoner.misc.mysql.types.text.Set;
import main.java.com.redstoner.misc.mysql.types.text.TinyText; import com.redstoner.misc.mysql.types.text.TinyText;
import main.java.com.redstoner.misc.mysql.types.text.VarChar; import com.redstoner.misc.mysql.types.text.VarChar;
import main.java.com.redstoner.misc.mysql.types.number.BigInt; import com.redstoner.misc.mysql.types.number.BigInt;
import main.java.com.redstoner.misc.mysql.types.number.Decimal; import com.redstoner.misc.mysql.types.number.Decimal;
import main.java.com.redstoner.misc.mysql.types.number.TinyInt; import com.redstoner.misc.mysql.types.number.TinyInt;
import main.java.com.redstoner.misc.mysql.types.text.Text; import com.redstoner.misc.mysql.types.text.Text;
public abstract class MysqlType public abstract class MysqlType
{ {

View File

@@ -1,6 +1,6 @@
package main.java.com.redstoner.misc.mysql.types.date; package com.redstoner.misc.mysql.types.date;
import main.java.com.redstoner.misc.mysql.types.MysqlType; import com.redstoner.misc.mysql.types.MysqlType;
public class Date extends MysqlType { public class Date extends MysqlType {
@Override @Override

View File

@@ -1,6 +1,6 @@
package main.java.com.redstoner.misc.mysql.types.date; package com.redstoner.misc.mysql.types.date;
import main.java.com.redstoner.misc.mysql.types.MysqlType; import com.redstoner.misc.mysql.types.MysqlType;
public class DateTime extends MysqlType { public class DateTime extends MysqlType {
@Override @Override

View File

@@ -1,6 +1,6 @@
package main.java.com.redstoner.misc.mysql.types.date; package com.redstoner.misc.mysql.types.date;
import main.java.com.redstoner.misc.mysql.types.MysqlType; import com.redstoner.misc.mysql.types.MysqlType;
public class Time extends MysqlType { public class Time extends MysqlType {
@Override @Override

View File

@@ -1,6 +1,6 @@
package main.java.com.redstoner.misc.mysql.types.date; package com.redstoner.misc.mysql.types.date;
import main.java.com.redstoner.misc.mysql.types.MysqlType; import com.redstoner.misc.mysql.types.MysqlType;
public class TimeStamp extends MysqlType { public class TimeStamp extends MysqlType {
@Override @Override

View File

@@ -1,6 +1,6 @@
package main.java.com.redstoner.misc.mysql.types.date; package com.redstoner.misc.mysql.types.date;
import main.java.com.redstoner.misc.mysql.types.MysqlType; import com.redstoner.misc.mysql.types.MysqlType;
public class Year extends MysqlType { public class Year extends MysqlType {
@Override @Override

View File

@@ -1,4 +1,4 @@
package main.java.com.redstoner.misc.mysql.types.number; package com.redstoner.misc.mysql.types.number;
public class BigInt extends Int { public class BigInt extends Int {
public BigInt(int maxSize) { public BigInt(int maxSize) {

View File

@@ -1,6 +1,6 @@
package main.java.com.redstoner.misc.mysql.types.number; package com.redstoner.misc.mysql.types.number;
import main.java.com.redstoner.misc.mysql.types.MysqlType; import com.redstoner.misc.mysql.types.MysqlType;
public class Decimal extends MysqlType public class Decimal extends MysqlType
{ {

View File

@@ -1,6 +1,6 @@
package main.java.com.redstoner.misc.mysql.types.number; package com.redstoner.misc.mysql.types.number;
import main.java.com.redstoner.misc.mysql.types.MysqlType; import com.redstoner.misc.mysql.types.MysqlType;
public class Double extends MysqlType { public class Double extends MysqlType {
@Override @Override

View File

@@ -1,6 +1,6 @@
package main.java.com.redstoner.misc.mysql.types.number; package com.redstoner.misc.mysql.types.number;
import main.java.com.redstoner.misc.mysql.types.MysqlType; import com.redstoner.misc.mysql.types.MysqlType;
public class Float extends MysqlType { public class Float extends MysqlType {
@Override @Override

View File

@@ -1,6 +1,6 @@
package main.java.com.redstoner.misc.mysql.types.number; package com.redstoner.misc.mysql.types.number;
import main.java.com.redstoner.misc.mysql.types.MysqlType; import com.redstoner.misc.mysql.types.MysqlType;
public class Int extends MysqlType { public class Int extends MysqlType {
private int maxSize; private int maxSize;

View File

@@ -1,4 +1,4 @@
package main.java.com.redstoner.misc.mysql.types.number; package com.redstoner.misc.mysql.types.number;
public class MediumInt extends Int { public class MediumInt extends Int {
public MediumInt(int maxSize) { public MediumInt(int maxSize) {

View File

@@ -1,4 +1,4 @@
package main.java.com.redstoner.misc.mysql.types.number; package com.redstoner.misc.mysql.types.number;
public class SmallInt extends Int { public class SmallInt extends Int {
public SmallInt(int maxSize) { public SmallInt(int maxSize) {

View File

@@ -1,4 +1,4 @@
package main.java.com.redstoner.misc.mysql.types.number; package com.redstoner.misc.mysql.types.number;
public class TinyInt extends Int { public class TinyInt extends Int {
public TinyInt(int maxSize) { public TinyInt(int maxSize) {

View File

@@ -1,6 +1,6 @@
package main.java.com.redstoner.misc.mysql.types.text; package com.redstoner.misc.mysql.types.text;
import main.java.com.redstoner.misc.mysql.types.MysqlType; import com.redstoner.misc.mysql.types.MysqlType;
public class Blob extends MysqlType { public class Blob extends MysqlType {
@Override @Override

View File

@@ -1,6 +1,6 @@
package main.java.com.redstoner.misc.mysql.types.text; package com.redstoner.misc.mysql.types.text;
import main.java.com.redstoner.misc.mysql.types.MysqlType; import com.redstoner.misc.mysql.types.MysqlType;
public class Char extends MysqlType { public class Char extends MysqlType {
private int size; private int size;

View File

@@ -1,6 +1,6 @@
package main.java.com.redstoner.misc.mysql.types.text; package com.redstoner.misc.mysql.types.text;
import main.java.com.redstoner.misc.mysql.types.MysqlType; import com.redstoner.misc.mysql.types.MysqlType;
public class Enum extends MysqlType { public class Enum extends MysqlType {
private String[] possibleValues; private String[] possibleValues;

View File

@@ -1,4 +1,4 @@
package main.java.com.redstoner.misc.mysql.types.text; package com.redstoner.misc.mysql.types.text;
public class LongBlob extends Blob { public class LongBlob extends Blob {
@Override @Override

View File

@@ -1,4 +1,4 @@
package main.java.com.redstoner.misc.mysql.types.text; package com.redstoner.misc.mysql.types.text;
public class LongText extends Text { public class LongText extends Text {
@Override @Override

View File

@@ -1,4 +1,4 @@
package main.java.com.redstoner.misc.mysql.types.text; package com.redstoner.misc.mysql.types.text;
public class MediumBlob extends Blob { public class MediumBlob extends Blob {
@Override @Override

View File

@@ -1,4 +1,4 @@
package main.java.com.redstoner.misc.mysql.types.text; package com.redstoner.misc.mysql.types.text;
public class MediumText extends Text { public class MediumText extends Text {
@Override @Override

View File

@@ -1,6 +1,6 @@
package main.java.com.redstoner.misc.mysql.types.text; package com.redstoner.misc.mysql.types.text;
import main.java.com.redstoner.misc.mysql.types.MysqlType; import com.redstoner.misc.mysql.types.MysqlType;
public class Set extends MysqlType { public class Set extends MysqlType {
private String[] possibleValues; private String[] possibleValues;

View File

@@ -1,6 +1,6 @@
package main.java.com.redstoner.misc.mysql.types.text; package com.redstoner.misc.mysql.types.text;
import main.java.com.redstoner.misc.mysql.types.MysqlType; import com.redstoner.misc.mysql.types.MysqlType;
public class Text extends MysqlType public class Text extends MysqlType
{ {

View File

@@ -1,4 +1,4 @@
package main.java.com.redstoner.misc.mysql.types.text; package com.redstoner.misc.mysql.types.text;
public class TinyText extends Text { public class TinyText extends Text {
@Override @Override

View File

@@ -1,6 +1,6 @@
package main.java.com.redstoner.misc.mysql.types.text; package com.redstoner.misc.mysql.types.text;
import main.java.com.redstoner.misc.mysql.types.MysqlType; import com.redstoner.misc.mysql.types.MysqlType;
public class VarChar extends MysqlType { public class VarChar extends MysqlType {
private int maxSize; private int maxSize;

View File

@@ -1,7 +1,7 @@
package main.java.com.redstoner.modules; package com.redstoner.modules;
import main.java.com.redstoner.annotations.Version; import com.redstoner.annotations.Version;
import main.java.com.redstoner.faucet.Faucet; import com.redstoner.faucet.Faucet;
/** Interface for the Module class. Modules must always have an empty constructor to be invoked by the ModuleLoader. /** Interface for the Module class. Modules must always have an empty constructor to be invoked by the ModuleLoader.
* *

View File

@@ -1,4 +1,4 @@
package main.java.com.redstoner.modules; package com.redstoner.modules;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;