From dd0362599f2f5f716eb638827a1626529c10c3c8 Mon Sep 17 00:00:00 2001 From: Rsl1122 Date: Sun, 14 Oct 2018 15:33:36 +0300 Subject: [PATCH] [Smell] Moved plugin modules under modules.plugin --- .../main/java/com/djrapitops/plan/PlanBukkitComponent.java | 6 +++++- .../main/java/com/djrapitops/plan/PlanBungeeComponent.java | 6 +++++- .../main/java/com/djrapitops/plan/PlanSpongeComponent.java | 6 +++++- .../java/com/djrapitops/plan/PlanVelocityComponent.java | 6 +++++- .../plan/modules/{ => plugin}/BukkitPlanModule.java | 2 +- .../plan/modules/{ => plugin}/BungeePlanModule.java | 2 +- .../plan/modules/{ => plugin}/SpongePlanModule.java | 2 +- .../plan/modules/{ => plugin}/VelocityPlanModule.java | 2 +- 8 files changed, 24 insertions(+), 8 deletions(-) rename Plan/src/main/java/com/djrapitops/plan/modules/{ => plugin}/BukkitPlanModule.java (93%) rename Plan/src/main/java/com/djrapitops/plan/modules/{ => plugin}/BungeePlanModule.java (93%) rename Plan/src/main/java/com/djrapitops/plan/modules/{ => plugin}/SpongePlanModule.java (93%) rename Plan/src/main/java/com/djrapitops/plan/modules/{ => plugin}/VelocityPlanModule.java (93%) diff --git a/Plan/src/main/java/com/djrapitops/plan/PlanBukkitComponent.java b/Plan/src/main/java/com/djrapitops/plan/PlanBukkitComponent.java index 843f9810c..76d46cd81 100644 --- a/Plan/src/main/java/com/djrapitops/plan/PlanBukkitComponent.java +++ b/Plan/src/main/java/com/djrapitops/plan/PlanBukkitComponent.java @@ -1,7 +1,11 @@ package com.djrapitops.plan; import com.djrapitops.plan.command.PlanCommand; -import com.djrapitops.plan.modules.*; +import com.djrapitops.plan.modules.APFModule; +import com.djrapitops.plan.modules.FilesModule; +import com.djrapitops.plan.modules.SuperClassBindingModule; +import com.djrapitops.plan.modules.SystemObjectBindingModule; +import com.djrapitops.plan.modules.plugin.BukkitPlanModule; import com.djrapitops.plan.modules.server.ServerSuperClassBindingModule; import com.djrapitops.plan.modules.server.bukkit.BukkitServerPropertiesModule; import com.djrapitops.plan.modules.server.bukkit.BukkitSuperClassBindingModule; diff --git a/Plan/src/main/java/com/djrapitops/plan/PlanBungeeComponent.java b/Plan/src/main/java/com/djrapitops/plan/PlanBungeeComponent.java index cd80282d5..4a91702d1 100644 --- a/Plan/src/main/java/com/djrapitops/plan/PlanBungeeComponent.java +++ b/Plan/src/main/java/com/djrapitops/plan/PlanBungeeComponent.java @@ -1,7 +1,11 @@ package com.djrapitops.plan; import com.djrapitops.plan.command.PlanBungeeCommand; -import com.djrapitops.plan.modules.*; +import com.djrapitops.plan.modules.APFModule; +import com.djrapitops.plan.modules.FilesModule; +import com.djrapitops.plan.modules.SuperClassBindingModule; +import com.djrapitops.plan.modules.SystemObjectBindingModule; +import com.djrapitops.plan.modules.plugin.BungeePlanModule; import com.djrapitops.plan.modules.proxy.ProxySuperClassBindingModule; import com.djrapitops.plan.modules.proxy.bungee.BungeeServerPropertiesModule; import com.djrapitops.plan.modules.proxy.bungee.BungeeSuperClassBindingModule; diff --git a/Plan/src/main/java/com/djrapitops/plan/PlanSpongeComponent.java b/Plan/src/main/java/com/djrapitops/plan/PlanSpongeComponent.java index 3ae7ca1d0..7751f0f94 100644 --- a/Plan/src/main/java/com/djrapitops/plan/PlanSpongeComponent.java +++ b/Plan/src/main/java/com/djrapitops/plan/PlanSpongeComponent.java @@ -1,7 +1,11 @@ package com.djrapitops.plan; import com.djrapitops.plan.command.PlanCommand; -import com.djrapitops.plan.modules.*; +import com.djrapitops.plan.modules.APFModule; +import com.djrapitops.plan.modules.FilesModule; +import com.djrapitops.plan.modules.SuperClassBindingModule; +import com.djrapitops.plan.modules.SystemObjectBindingModule; +import com.djrapitops.plan.modules.plugin.SpongePlanModule; import com.djrapitops.plan.modules.server.ServerSuperClassBindingModule; import com.djrapitops.plan.modules.server.sponge.SpongeServerPropertiesModule; import com.djrapitops.plan.modules.server.sponge.SpongeSuperClassBindingModule; diff --git a/Plan/src/main/java/com/djrapitops/plan/PlanVelocityComponent.java b/Plan/src/main/java/com/djrapitops/plan/PlanVelocityComponent.java index 198c061ba..a9d2c1962 100644 --- a/Plan/src/main/java/com/djrapitops/plan/PlanVelocityComponent.java +++ b/Plan/src/main/java/com/djrapitops/plan/PlanVelocityComponent.java @@ -1,7 +1,11 @@ package com.djrapitops.plan; import com.djrapitops.plan.command.PlanVelocityCommand; -import com.djrapitops.plan.modules.*; +import com.djrapitops.plan.modules.APFModule; +import com.djrapitops.plan.modules.FilesModule; +import com.djrapitops.plan.modules.SuperClassBindingModule; +import com.djrapitops.plan.modules.SystemObjectBindingModule; +import com.djrapitops.plan.modules.plugin.VelocityPlanModule; import com.djrapitops.plan.modules.proxy.ProxySuperClassBindingModule; import com.djrapitops.plan.modules.proxy.velocity.VelocityServerPropertiesModule; import com.djrapitops.plan.modules.proxy.velocity.VelocitySuperClassBindingModule; diff --git a/Plan/src/main/java/com/djrapitops/plan/modules/BukkitPlanModule.java b/Plan/src/main/java/com/djrapitops/plan/modules/plugin/BukkitPlanModule.java similarity index 93% rename from Plan/src/main/java/com/djrapitops/plan/modules/BukkitPlanModule.java rename to Plan/src/main/java/com/djrapitops/plan/modules/plugin/BukkitPlanModule.java index 48433a5f5..be71d9b1c 100644 --- a/Plan/src/main/java/com/djrapitops/plan/modules/BukkitPlanModule.java +++ b/Plan/src/main/java/com/djrapitops/plan/modules/plugin/BukkitPlanModule.java @@ -1,4 +1,4 @@ -package com.djrapitops.plan.modules; +package com.djrapitops.plan.modules.plugin; import com.djrapitops.plan.Plan; import com.djrapitops.plan.PlanPlugin; diff --git a/Plan/src/main/java/com/djrapitops/plan/modules/BungeePlanModule.java b/Plan/src/main/java/com/djrapitops/plan/modules/plugin/BungeePlanModule.java similarity index 93% rename from Plan/src/main/java/com/djrapitops/plan/modules/BungeePlanModule.java rename to Plan/src/main/java/com/djrapitops/plan/modules/plugin/BungeePlanModule.java index dc8b7339e..ad4b8beef 100644 --- a/Plan/src/main/java/com/djrapitops/plan/modules/BungeePlanModule.java +++ b/Plan/src/main/java/com/djrapitops/plan/modules/plugin/BungeePlanModule.java @@ -1,4 +1,4 @@ -package com.djrapitops.plan.modules; +package com.djrapitops.plan.modules.plugin; import com.djrapitops.plan.PlanBungee; import com.djrapitops.plan.PlanPlugin; diff --git a/Plan/src/main/java/com/djrapitops/plan/modules/SpongePlanModule.java b/Plan/src/main/java/com/djrapitops/plan/modules/plugin/SpongePlanModule.java similarity index 93% rename from Plan/src/main/java/com/djrapitops/plan/modules/SpongePlanModule.java rename to Plan/src/main/java/com/djrapitops/plan/modules/plugin/SpongePlanModule.java index 423e9b8ab..337ae8a13 100644 --- a/Plan/src/main/java/com/djrapitops/plan/modules/SpongePlanModule.java +++ b/Plan/src/main/java/com/djrapitops/plan/modules/plugin/SpongePlanModule.java @@ -1,4 +1,4 @@ -package com.djrapitops.plan.modules; +package com.djrapitops.plan.modules.plugin; import com.djrapitops.plan.PlanPlugin; import com.djrapitops.plan.PlanSponge; diff --git a/Plan/src/main/java/com/djrapitops/plan/modules/VelocityPlanModule.java b/Plan/src/main/java/com/djrapitops/plan/modules/plugin/VelocityPlanModule.java similarity index 93% rename from Plan/src/main/java/com/djrapitops/plan/modules/VelocityPlanModule.java rename to Plan/src/main/java/com/djrapitops/plan/modules/plugin/VelocityPlanModule.java index 7cb41ed29..3107fb7bd 100644 --- a/Plan/src/main/java/com/djrapitops/plan/modules/VelocityPlanModule.java +++ b/Plan/src/main/java/com/djrapitops/plan/modules/plugin/VelocityPlanModule.java @@ -1,4 +1,4 @@ -package com.djrapitops.plan.modules; +package com.djrapitops.plan.modules.plugin; import com.djrapitops.plan.PlanPlugin; import com.djrapitops.plan.PlanVelocity;