From 18e39d13942ac549ac23917b965db5c215b9aa5b Mon Sep 17 00:00:00 2001 From: Rsl1122 Date: Thu, 24 Jan 2019 15:22:03 +0200 Subject: [PATCH] Removed UserUUIDTable --- .../plan/db/sql/tables/GeoInfoTable.java | 2 +- .../plan/db/sql/tables/KillsTable.java | 2 +- .../plan/db/sql/tables/NicknamesTable.java | 2 +- .../plan/db/sql/tables/PingTable.java | 2 +- .../plan/db/sql/tables/SessionsTable.java | 2 +- .../plan/db/sql/tables/UserInfoTable.java | 2 +- .../plan/db/sql/tables/UserUUIDTable.java | 32 ------------------- .../plan/db/sql/tables/UsersTable.java | 2 +- .../plan/db/sql/tables/WorldTimesTable.java | 2 +- 9 files changed, 8 insertions(+), 40 deletions(-) delete mode 100644 Plan/common/src/main/java/com/djrapitops/plan/db/sql/tables/UserUUIDTable.java diff --git a/Plan/common/src/main/java/com/djrapitops/plan/db/sql/tables/GeoInfoTable.java b/Plan/common/src/main/java/com/djrapitops/plan/db/sql/tables/GeoInfoTable.java index 5793f9b57..2de311831 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/db/sql/tables/GeoInfoTable.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/db/sql/tables/GeoInfoTable.java @@ -50,7 +50,7 @@ import java.util.*; * * @author Rsl1122 */ -public class GeoInfoTable extends UserUUIDTable { +public class GeoInfoTable extends Table { public static final String TABLE_NAME = "plan_ips"; diff --git a/Plan/common/src/main/java/com/djrapitops/plan/db/sql/tables/KillsTable.java b/Plan/common/src/main/java/com/djrapitops/plan/db/sql/tables/KillsTable.java index 8f1160b4d..5bf268771 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/db/sql/tables/KillsTable.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/db/sql/tables/KillsTable.java @@ -52,7 +52,7 @@ import java.util.UUID; * * @author Rsl1122 */ -public class KillsTable extends UserUUIDTable { +public class KillsTable extends Table { public static final String TABLE_NAME = "plan_kills"; diff --git a/Plan/common/src/main/java/com/djrapitops/plan/db/sql/tables/NicknamesTable.java b/Plan/common/src/main/java/com/djrapitops/plan/db/sql/tables/NicknamesTable.java index 5d6b07a0b..332936187 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/db/sql/tables/NicknamesTable.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/db/sql/tables/NicknamesTable.java @@ -47,7 +47,7 @@ import java.util.*; * * @author Rsl1122 */ -public class NicknamesTable extends UserUUIDTable { +public class NicknamesTable extends Table { public static final String TABLE_NAME = "plan_nicknames"; diff --git a/Plan/common/src/main/java/com/djrapitops/plan/db/sql/tables/PingTable.java b/Plan/common/src/main/java/com/djrapitops/plan/db/sql/tables/PingTable.java index 35df5c3aa..9cdc48181 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/db/sql/tables/PingTable.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/db/sql/tables/PingTable.java @@ -43,7 +43,7 @@ import java.util.UUID; * * @author Rsl1122 */ -public class PingTable extends UserUUIDTable { +public class PingTable extends Table { public static final String TABLE_NAME = "plan_ping"; diff --git a/Plan/common/src/main/java/com/djrapitops/plan/db/sql/tables/SessionsTable.java b/Plan/common/src/main/java/com/djrapitops/plan/db/sql/tables/SessionsTable.java index cfe597d81..2dcd2acf0 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/db/sql/tables/SessionsTable.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/db/sql/tables/SessionsTable.java @@ -50,7 +50,7 @@ import java.util.stream.Collectors; * * @author Rsl1122 */ -public class SessionsTable extends UserUUIDTable { +public class SessionsTable extends Table { public static final String TABLE_NAME = "plan_sessions"; diff --git a/Plan/common/src/main/java/com/djrapitops/plan/db/sql/tables/UserInfoTable.java b/Plan/common/src/main/java/com/djrapitops/plan/db/sql/tables/UserInfoTable.java index e7ebcd7f6..753c1a834 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/db/sql/tables/UserInfoTable.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/db/sql/tables/UserInfoTable.java @@ -48,7 +48,7 @@ import java.util.*; * * @author Rsl1122 */ -public class UserInfoTable extends UserUUIDTable { +public class UserInfoTable extends Table { public static final String TABLE_NAME = "plan_user_info"; diff --git a/Plan/common/src/main/java/com/djrapitops/plan/db/sql/tables/UserUUIDTable.java b/Plan/common/src/main/java/com/djrapitops/plan/db/sql/tables/UserUUIDTable.java deleted file mode 100644 index 7d7aac96b..000000000 --- a/Plan/common/src/main/java/com/djrapitops/plan/db/sql/tables/UserUUIDTable.java +++ /dev/null @@ -1,32 +0,0 @@ -/* - * This file is part of Player Analytics (Plan). - * - * Plan is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License v3 as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Plan is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with Plan. If not, see . - */ -package com.djrapitops.plan.db.sql.tables; - -import com.djrapitops.plan.db.SQLDB; - -/** - * Represents a Table that uses UUIDs to get their data. - * - * @author Rsl1122 - */ -public abstract class UserUUIDTable extends Table { - - public UserUUIDTable(String name, SQLDB db) { - super(name, db); - } - -} diff --git a/Plan/common/src/main/java/com/djrapitops/plan/db/sql/tables/UsersTable.java b/Plan/common/src/main/java/com/djrapitops/plan/db/sql/tables/UsersTable.java index db6c4df6e..df9468fdb 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/db/sql/tables/UsersTable.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/db/sql/tables/UsersTable.java @@ -41,7 +41,7 @@ import java.util.*; * * @author Rsl1122 */ -public class UsersTable extends UserUUIDTable { +public class UsersTable extends Table { public static final String TABLE_NAME = "plan_users"; diff --git a/Plan/common/src/main/java/com/djrapitops/plan/db/sql/tables/WorldTimesTable.java b/Plan/common/src/main/java/com/djrapitops/plan/db/sql/tables/WorldTimesTable.java index 441548bb3..e4158e612 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/db/sql/tables/WorldTimesTable.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/db/sql/tables/WorldTimesTable.java @@ -56,7 +56,7 @@ import java.util.stream.Collectors; * * @author Rsl1122 */ -public class WorldTimesTable extends UserUUIDTable { +public class WorldTimesTable extends Table { public static final String TABLE_NAME = "plan_world_times";