From 0f530b6e61c75fe2baf07491a6691bd7489f4cbe Mon Sep 17 00:00:00 2001 From: Fuzzlemann Date: Thu, 27 Jul 2017 15:08:34 +0200 Subject: [PATCH] Reformat code --- .../com/djrapitops/plan/command/PlanCommand.java | 8 ++++---- .../plan/command/commands/AnalyzeCommand.java | 8 ++++---- .../plan/command/commands/InspectCommand.java | 8 ++++---- .../plan/command/commands/ListCommand.java | 8 ++++---- .../plan/command/commands/ManageCommand.java | 10 +++++----- .../plan/command/commands/QuickAnalyzeCommand.java | 8 ++++---- .../plan/command/commands/QuickInspectCommand.java | 8 ++++---- .../plan/command/commands/RegisterCommand.java | 8 ++++---- .../plan/command/commands/SearchCommand.java | 6 +++--- .../plan/command/commands/WebUserCommand.java | 14 +++++++------- .../commands/manage/ManageClearCommand.java | 8 ++++---- .../commands/manage/ManageHotswapCommand.java | 6 +++--- .../commands/manage/ManageImportCommand.java | 8 ++++---- .../commands/manage/ManageRemoveCommand.java | 4 ++-- .../plan/data/analysis/GeolocationPart.java | 1 - 15 files changed, 56 insertions(+), 57 deletions(-) diff --git a/Plan/src/main/java/com/djrapitops/plan/command/PlanCommand.java b/Plan/src/main/java/com/djrapitops/plan/command/PlanCommand.java index fbf2b4b8c..b64543c45 100644 --- a/Plan/src/main/java/com/djrapitops/plan/command/PlanCommand.java +++ b/Plan/src/main/java/com/djrapitops/plan/command/PlanCommand.java @@ -42,10 +42,10 @@ public class PlanCommand extends TreeCommand { String tCol = colorScheme.getTertiaryColor(); String[] help = new String[]{ - mCol +"/plan - Main Command", - tCol+" Used to access all SubCommands & help", - sCol+" /plan - List subcommands", - sCol+" /plan ? - in depth help" + mCol + "/plan - Main Command", + tCol + " Used to access all SubCommands & help", + sCol + " /plan - List subcommands", + sCol + " /plan ? - in depth help" }; } diff --git a/Plan/src/main/java/com/djrapitops/plan/command/commands/AnalyzeCommand.java b/Plan/src/main/java/com/djrapitops/plan/command/commands/AnalyzeCommand.java index 80a0d742b..cee8923ba 100644 --- a/Plan/src/main/java/com/djrapitops/plan/command/commands/AnalyzeCommand.java +++ b/Plan/src/main/java/com/djrapitops/plan/command/commands/AnalyzeCommand.java @@ -50,10 +50,10 @@ public class AnalyzeCommand extends SubCommand { String tCol = colorScheme.getTertiaryColor(); String[] help = new String[]{ - mCol +"Analysis Command", - tCol+" Used to Refresh analysis cache & Access the result page", - sCol+" /plan status can be used to check status of analysis while it is running.", - sCol+" Aliases: analyze, analyse, analysis, a" + mCol + "Analysis Command", + tCol + " Used to Refresh analysis cache & Access the result page", + sCol + " /plan status can be used to check status of analysis while it is running.", + sCol + " Aliases: analyze, analyse, analysis, a" }; } diff --git a/Plan/src/main/java/com/djrapitops/plan/command/commands/InspectCommand.java b/Plan/src/main/java/com/djrapitops/plan/command/commands/InspectCommand.java index 6a45ada52..63369a6f6 100644 --- a/Plan/src/main/java/com/djrapitops/plan/command/commands/InspectCommand.java +++ b/Plan/src/main/java/com/djrapitops/plan/command/commands/InspectCommand.java @@ -56,10 +56,10 @@ public class InspectCommand extends SubCommand { String tCol = colorScheme.getTertiaryColor(); String[] help = new String[]{ - mCol +"Inspect command", - tCol+" Used to get a link to User's inspect page.", - sCol+" Own inspect page can be accessed with /plan inspect", - sCol+" Alias: /plan " + mCol + "Inspect command", + tCol + " Used to get a link to User's inspect page.", + sCol + " Own inspect page can be accessed with /plan inspect", + sCol + " Alias: /plan " }; } diff --git a/Plan/src/main/java/com/djrapitops/plan/command/commands/ListCommand.java b/Plan/src/main/java/com/djrapitops/plan/command/commands/ListCommand.java index 06cb62242..130bcc093 100644 --- a/Plan/src/main/java/com/djrapitops/plan/command/commands/ListCommand.java +++ b/Plan/src/main/java/com/djrapitops/plan/command/commands/ListCommand.java @@ -47,10 +47,10 @@ public class ListCommand extends SubCommand { String tCol = colorScheme.getTertiaryColor(); String[] help = new String[]{ - mCol +"List command", - tCol+" Used to get a link to players page.", - sCol+" Players page contains links to all cached inspect pages.", - sCol+" Alias: /plan pl" + mCol + "List command", + tCol + " Used to get a link to players page.", + sCol + " Players page contains links to all cached inspect pages.", + sCol + " Alias: /plan pl" }; } diff --git a/Plan/src/main/java/com/djrapitops/plan/command/commands/ManageCommand.java b/Plan/src/main/java/com/djrapitops/plan/command/commands/ManageCommand.java index 61d424170..c013af116 100644 --- a/Plan/src/main/java/com/djrapitops/plan/command/commands/ManageCommand.java +++ b/Plan/src/main/java/com/djrapitops/plan/command/commands/ManageCommand.java @@ -39,11 +39,11 @@ public class ManageCommand extends TreeCommand { String tCol = colorScheme.getTertiaryColor(); String[] help = new String[]{ - mCol +"Manage command", - tCol+" Used to Manage Database of the plugin.", - sCol+" Alias: /plan m", - sCol+" /plan m - List subcommands", - sCol+" /plan m ? - in depth help" + mCol + "Manage command", + tCol + " Used to Manage Database of the plugin.", + sCol + " Alias: /plan m", + sCol + " /plan m - List subcommands", + sCol + " /plan m ? - in depth help" }; } diff --git a/Plan/src/main/java/com/djrapitops/plan/command/commands/QuickAnalyzeCommand.java b/Plan/src/main/java/com/djrapitops/plan/command/commands/QuickAnalyzeCommand.java index acbe0109c..269ce49e0 100644 --- a/Plan/src/main/java/com/djrapitops/plan/command/commands/QuickAnalyzeCommand.java +++ b/Plan/src/main/java/com/djrapitops/plan/command/commands/QuickAnalyzeCommand.java @@ -51,10 +51,10 @@ public class QuickAnalyzeCommand extends SubCommand { String tCol = colorScheme.getTertiaryColor(); String[] help = new String[]{ - mCol +"Quick Analysis command", - tCol+" Used to get in game info about analysis.", - sCol+" Has less info than full Analysis web page.", - sCol+" Aliases: qanalyze, ganalyse, qanalysis, qa" + mCol + "Quick Analysis command", + tCol + " Used to get in game info about analysis.", + sCol + " Has less info than full Analysis web page.", + sCol + " Aliases: qanalyze, ganalyse, qanalysis, qa" }; } diff --git a/Plan/src/main/java/com/djrapitops/plan/command/commands/QuickInspectCommand.java b/Plan/src/main/java/com/djrapitops/plan/command/commands/QuickInspectCommand.java index 685da9517..5aaf20712 100644 --- a/Plan/src/main/java/com/djrapitops/plan/command/commands/QuickInspectCommand.java +++ b/Plan/src/main/java/com/djrapitops/plan/command/commands/QuickInspectCommand.java @@ -56,10 +56,10 @@ public class QuickInspectCommand extends SubCommand { String tCol = colorScheme.getTertiaryColor(); String[] help = new String[]{ - mCol +"Quick Inspect command", - tCol+" Used to get some inspect info in game.", - sCol+" Has less info than full Inspect web page.", - sCol+" Alias: /plan qi" + mCol + "Quick Inspect command", + tCol + " Used to get some inspect info in game.", + sCol + " Has less info than full Inspect web page.", + sCol + " Alias: /plan qi" }; } diff --git a/Plan/src/main/java/com/djrapitops/plan/command/commands/RegisterCommand.java b/Plan/src/main/java/com/djrapitops/plan/command/commands/RegisterCommand.java index 50b090409..475a41525 100644 --- a/Plan/src/main/java/com/djrapitops/plan/command/commands/RegisterCommand.java +++ b/Plan/src/main/java/com/djrapitops/plan/command/commands/RegisterCommand.java @@ -49,10 +49,10 @@ public class RegisterCommand extends SubCommand { String tCol = colorScheme.getTertiaryColor(); String[] help = new String[]{ - mCol +"Web Register command", - tCol+" Used to register a new user for the webserver.", - sCol+" Registering a user for another player requires "+Permissions.MANAGE_WEB.getPerm()+" permission.", - sCol+" Passwords are hashed with PBKDF2 (64,000 iterations of SHA1) using a cryptographically-random salt." + mCol + "Web Register command", + tCol + " Used to register a new user for the webserver.", + sCol + " Registering a user for another player requires " + Permissions.MANAGE_WEB.getPerm() + " permission.", + sCol + " Passwords are hashed with PBKDF2 (64,000 iterations of SHA1) using a cryptographically-random salt." }; } diff --git a/Plan/src/main/java/com/djrapitops/plan/command/commands/SearchCommand.java b/Plan/src/main/java/com/djrapitops/plan/command/commands/SearchCommand.java index e0f55a04e..34e9464a8 100644 --- a/Plan/src/main/java/com/djrapitops/plan/command/commands/SearchCommand.java +++ b/Plan/src/main/java/com/djrapitops/plan/command/commands/SearchCommand.java @@ -47,9 +47,9 @@ public class SearchCommand extends SubCommand { String tCol = colorScheme.getTertiaryColor(); String[] help = new String[]{ - mCol +"Search command", - tCol+" Used to get a list of Player names that match the given argument.", - sCol+" Example: /plan search 123 - Finds all users with 123 in their name." + mCol + "Search command", + tCol + " Used to get a list of Player names that match the given argument.", + sCol + " Example: /plan search 123 - Finds all users with 123 in their name." }; } diff --git a/Plan/src/main/java/com/djrapitops/plan/command/commands/WebUserCommand.java b/Plan/src/main/java/com/djrapitops/plan/command/commands/WebUserCommand.java index a555ac659..1f367123b 100644 --- a/Plan/src/main/java/com/djrapitops/plan/command/commands/WebUserCommand.java +++ b/Plan/src/main/java/com/djrapitops/plan/command/commands/WebUserCommand.java @@ -35,13 +35,13 @@ public class WebUserCommand extends TreeCommand { String tCol = colorScheme.getTertiaryColor(); String[] help = new String[]{ - mCol +"Web User Manage command", - tCol+" Used to manage web users of the plugin", - sCol+" Users have a permission level:", - tCol+" 0 - Access to all pages", - tCol+" 1 - Access to /players & all inspect pages", - tCol+" 2 - Access to own inspect page", - sCol+" Alias: /plan web" + mCol + "Web User Manage command", + tCol + " Used to manage web users of the plugin", + sCol + " Users have a permission level:", + tCol + " 0 - Access to all pages", + tCol + " 1 - Access to /players & all inspect pages", + tCol + " 2 - Access to own inspect page", + sCol + " Alias: /plan web" }; } diff --git a/Plan/src/main/java/com/djrapitops/plan/command/commands/manage/ManageClearCommand.java b/Plan/src/main/java/com/djrapitops/plan/command/commands/manage/ManageClearCommand.java index 3aeffddde..9afe1fc72 100644 --- a/Plan/src/main/java/com/djrapitops/plan/command/commands/manage/ManageClearCommand.java +++ b/Plan/src/main/java/com/djrapitops/plan/command/commands/manage/ManageClearCommand.java @@ -47,10 +47,10 @@ public class ManageClearCommand extends SubCommand { String tCol = colorScheme.getTertiaryColor(); String[] help = new String[]{ - mCol +"Manage Clear command", - tCol+" Used to delete ALL data in the active database.", - sCol+" Plugin should be reloaded after successful clear.", - sCol+" Alias: /plan pl" + mCol + "Manage Clear command", + tCol + " Used to delete ALL data in the active database.", + sCol + " Plugin should be reloaded after successful clear.", + sCol + " Alias: /plan pl" }; } diff --git a/Plan/src/main/java/com/djrapitops/plan/command/commands/manage/ManageHotswapCommand.java b/Plan/src/main/java/com/djrapitops/plan/command/commands/manage/ManageHotswapCommand.java index e89b1a06f..83f949061 100644 --- a/Plan/src/main/java/com/djrapitops/plan/command/commands/manage/ManageHotswapCommand.java +++ b/Plan/src/main/java/com/djrapitops/plan/command/commands/manage/ManageHotswapCommand.java @@ -47,9 +47,9 @@ public class ManageHotswapCommand extends SubCommand { String tCol = colorScheme.getTertiaryColor(); String[] help = new String[]{ - mCol +"Manage Hotswap command", - tCol+" Used to change database in use on the fly.", - sCol+" Does not change database if connection fails" + mCol + "Manage Hotswap command", + tCol + " Used to change database in use on the fly.", + sCol + " Does not change database if connection fails" }; } diff --git a/Plan/src/main/java/com/djrapitops/plan/command/commands/manage/ManageImportCommand.java b/Plan/src/main/java/com/djrapitops/plan/command/commands/manage/ManageImportCommand.java index 08367a022..4388243a6 100644 --- a/Plan/src/main/java/com/djrapitops/plan/command/commands/manage/ManageImportCommand.java +++ b/Plan/src/main/java/com/djrapitops/plan/command/commands/manage/ManageImportCommand.java @@ -54,10 +54,10 @@ public class ManageImportCommand extends SubCommand { String tCol = colorScheme.getTertiaryColor(); String[] help = new String[]{ - mCol +"Manage Import command", - tCol+" Used to import data from other sources", - sCol+" Analysis will be disabled during import.", - sCol+" If a lot of users are not in the database, saving may take a long time." + mCol + "Manage Import command", + tCol + " Used to import data from other sources", + sCol + " Analysis will be disabled during import.", + sCol + " If a lot of users are not in the database, saving may take a long time." }; } diff --git a/Plan/src/main/java/com/djrapitops/plan/command/commands/manage/ManageRemoveCommand.java b/Plan/src/main/java/com/djrapitops/plan/command/commands/manage/ManageRemoveCommand.java index c8ec111f4..fdfe830c3 100644 --- a/Plan/src/main/java/com/djrapitops/plan/command/commands/manage/ManageRemoveCommand.java +++ b/Plan/src/main/java/com/djrapitops/plan/command/commands/manage/ManageRemoveCommand.java @@ -50,8 +50,8 @@ public class ManageRemoveCommand extends SubCommand { String tCol = colorScheme.getTertiaryColor(); String[] help = new String[]{ - mCol +"Manage Remove command", - tCol+" Used to Remove user's data from the active database." + mCol + "Manage Remove command", + tCol + " Used to Remove user's data from the active database." }; } diff --git a/Plan/src/main/java/com/djrapitops/plan/data/analysis/GeolocationPart.java b/Plan/src/main/java/com/djrapitops/plan/data/analysis/GeolocationPart.java index df2187fbd..39ac9ebcd 100644 --- a/Plan/src/main/java/com/djrapitops/plan/data/analysis/GeolocationPart.java +++ b/Plan/src/main/java/com/djrapitops/plan/data/analysis/GeolocationPart.java @@ -75,5 +75,4 @@ public class GeolocationPart extends RawData { public void addGeoloc(String country) { geoLocations.computeIfPresent(country, (computedCountry, amount) -> amount + 1); } - }