Spaces at the start of line comments

jamezrin · jamezrin · commit 2d2a7d8f9eda · 2020-06-20T22:28:24.000+02:00
diff --git a/addon/src/main/java/com/jaimemartz/playerbalanceraddon/PlayerBalancerAddon.java b/addon/src/main/java/com/jaimemartz/playerbalanceraddon/PlayerBalancerAddon.java
@@ -19,7 +19,7 @@ public void onEnable() {
 
     @Override
     public void onDisable() {
-        //Nothing to do...
+        // Nothing to do...
     }
 
     public PluginMessageManager getManager() {
diff --git a/addon/src/main/java/com/jaimemartz/playerbalanceraddon/PlayerBalancerPlaceholderExpansion.java b/addon/src/main/java/com/jaimemartz/playerbalanceraddon/PlayerBalancerPlaceholderExpansion.java
@@ -22,8 +22,8 @@ public String onRequest(OfflinePlayer player, String identifier) {
             if (section == null)
                 return null;
 
-            //For the first call this placeholder will return 0
-            //For the next one, the result of the previous one
+            // For the first call this placeholder will return 0
+            // For the next one, the result of the previous one
             plugin.getManager().getSectionPlayerCount(section, (count) -> {
                 sectionPlayerCounts.put(section, count);
             });
diff --git a/addon/src/main/java/com/jaimemartz/playerbalanceraddon/PluginMessageManager.java b/addon/src/main/java/com/jaimemartz/playerbalanceraddon/PluginMessageManager.java
@@ -27,7 +27,7 @@ public PluginMessageManager(PlayerBalancerAddon plugin) {
         plugin.getServer().getMessenger().registerIncomingPluginChannel(plugin, PB_CHANNEL, this);
         plugin.getServer().getMessenger().registerOutgoingPluginChannel(plugin, PB_CHANNEL);
 
-        //In case we need to use BungeeCord channels
+        // In case we need to use BungeeCord channels
         plugin.getServer().getMessenger().registerIncomingPluginChannel(plugin, BC_CHANNEL, this);
         plugin.getServer().getMessenger().registerOutgoingPluginChannel(plugin, BC_CHANNEL);
     }
diff --git a/balancer/src/main/java/com/jaimemartz/playerbalancer/PlayerBalancer.java b/balancer/src/main/java/com/jaimemartz/playerbalancer/PlayerBalancer.java
@@ -78,7 +78,7 @@ public void onEnable() {
 
     public boolean checkUpToDate() {
         try {
-            URLConnection con = new URL("https://api.spigotmc.org/legacy/update.php?resource=10788").openConnection();
+            URLConnection con = new URL("https:// api.spigotmc.org/legacy/update.php?resource=10788").openConnection();
             String reply = new BufferedReader(new InputStreamReader(con.getInputStream())).readLine();
             return getDescription().getVersion().equals(reply);
         } catch (IOException e) {
@@ -89,7 +89,7 @@ public boolean checkUpToDate() {
 
     @Override
     public void onDisable() {
-        //Nothing else to do than normal stop
+        // Nothing else to do than normal stop
         this.execStop();
     }
 
@@ -198,7 +198,7 @@ private void execStop() {
         }
 
         if (settings.getGeneralProps().isEnabled()) {
-            //Do not try to do anything if the plugin has not loaded correctly
+            // Do not try to do anything if the plugin has not loaded correctly
             if (failed) return;
 
             if (settings.getGeneralProps().isAutoReload()) {
diff --git a/balancer/src/main/java/com/jaimemartz/playerbalancer/connection/ConnectionIntent.java b/balancer/src/main/java/com/jaimemartz/playerbalancer/connection/ConnectionIntent.java
@@ -39,14 +39,10 @@ public void execute() {
                         .replace("{alias}", safeNull(section.getProps().getAlias()))
         );
 
+        // Ensure a new copy of the section servers
         List<ServerInfo> servers = new ArrayList<>(section.getServers());
 
-        //Prevents removing servers from the section
-        if (servers == section.getServers()) {
-            throw new IllegalStateException("The servers list parameter is the same reference, this cannot happen");
-        }
-
-        //Prevents connections to the same server
+        // Prevents connections to the same server
         Server current = player.getServer();
         if (current != null) {
             servers.remove(current.getInfo());
@@ -56,7 +52,7 @@ public void execute() {
             ServerInfo target = this.fetchServer(player, section, section.getImplicitProvider(), servers);
             if (target != null) {
                 this.connect(target, (response, throwable) -> {
-                    if (response) { //only if the connect has been executed correctly
+                    if (response) { // only if the connect has been executed correctly
                         MessageUtils.send(player, plugin.getSettings().getMessagesProps().getConnectedMessage(),
                                 (str) -> str.replace("{server}", target.getName())
                                         .replace("{section}", section.getName())
diff --git a/balancer/src/main/java/com/jaimemartz/playerbalancer/helper/PasteHelper.java b/balancer/src/main/java/com/jaimemartz/playerbalancer/helper/PasteHelper.java
@@ -37,7 +37,7 @@ public URL paste(PlayerBalancer plugin) throws Exception {
             try (FileInputStream stream = new FileInputStream(file)) {
                 try (InputStreamReader reader = new InputStreamReader(stream, "UTF-8")) {
                     String content = CharStreams.toString(reader);
-                    HastebinPaste paste = new HastebinPaste("https://file.properties/paste/", content);
+                    HastebinPaste paste = new HastebinPaste("https:// file.properties/paste/", content);
                     return paste.paste();
                 }
             }
@@ -62,7 +62,7 @@ public URL paste(PlayerBalancer plugin) throws Exception {
                 try (InputStreamReader reader = new InputStreamReader(stream, StandardCharsets.UTF_8)) {
                     String content = CharStreams.toString(reader);
                     content = content.replaceAll("[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}", "?.?.?.?");
-                    HastebinPaste paste = new HastebinPaste("https://file.properties/paste/", content);
+                    HastebinPaste paste = new HastebinPaste("https:// file.properties/paste/", content);
                     return paste.paste();
                 }
             }
@@ -86,7 +86,7 @@ public URL paste(PlayerBalancer plugin) throws Exception {
             try (FileInputStream stream = new FileInputStream(file)) {
                 try (InputStreamReader reader = new InputStreamReader(stream, StandardCharsets.UTF_8)) {
                     String content = CharStreams.toString(reader);
-                    HastebinPaste paste = new HastebinPaste("https://file.properties/paste/", content);
+                    HastebinPaste paste = new HastebinPaste("https:// file.properties/paste/", content);
                     return paste.paste();
                 }
             }
diff --git a/balancer/src/main/java/com/jaimemartz/playerbalancer/listeners/PluginMessageListener.java b/balancer/src/main/java/com/jaimemartz/playerbalancer/listeners/PluginMessageListener.java
@@ -31,7 +31,7 @@ public PluginMessageListener(PlayerBalancer plugin) {
         this.plugin = plugin;
         GsonBuilder builder = new GsonBuilder();
 
-        //Only serialize the name of ServerInfo
+        // Only serialize the name of ServerInfo
         builder.registerTypeAdapter(ServerInfo.class, (JsonSerializer<ServerInfo>) (server, type, context) ->
                 context.serialize(server.getName())
         );
diff --git a/balancer/src/main/java/com/jaimemartz/playerbalancer/listeners/ServerConnectListener.java b/balancer/src/main/java/com/jaimemartz/playerbalancer/listeners/ServerConnectListener.java
@@ -56,7 +56,7 @@ private ServerSection getSection(ProxiedPlayer player, ServerInfo target) {
         ServerSection section = plugin.getSectionManager().getByServer(target);
 
         if (section != null) {
-            //Checks only for servers (not the section server)
+            // Checks only for servers (not the section server)
             if (!target.equals(section.getServer())) {
                 if (plugin.getSectionManager().isDummy(section)) {
                     return null;
diff --git a/balancer/src/main/java/com/jaimemartz/playerbalancer/ping/PingTactic.java b/balancer/src/main/java/com/jaimemartz/playerbalancer/ping/PingTactic.java
@@ -37,7 +37,7 @@ public void ping(ServerInfo server, Callback<ServerStatus> callback, PlayerBalan
             try {
                 server.ping((ping, throwable) -> {
                     if (ping != null) {
-                        //using deprecated method for bungee 1.8 compatibility
+                        //  Using deprecated method for bungee 1.8 compatibility
                         callback.done(new ServerStatus(
                                 ping.getDescription(),
                                 ping.getPlayers().getOnline(),
diff --git a/balancer/src/main/java/com/jaimemartz/playerbalancer/section/SectionManager.java b/balancer/src/main/java/com/jaimemartz/playerbalancer/section/SectionManager.java
@@ -236,8 +236,8 @@ public ServerSection getByPlayer(ProxiedPlayer player) {
 
     public void registerServer(ServerInfo server, ServerSection section) {
         if (!isDummy(section)) {
-            // Checking for already we already added this server to other section
-            // This can only happen if another non dummy section registers this server
+            //  Checking for already we already added this server to other section
+            //  This can only happen if another non dummy section registers this server
             if (servers.containsKey(server)) {
                 ServerSection other = servers.get(server);
                 throw new IllegalArgumentException(String.format(
@@ -259,7 +259,7 @@ public void registerServer(ServerInfo server, ServerSection section) {
     public void calculateServers(ServerSection section) {
         Set<ServerInfo> results = new HashSet<>();
 
-        //Searches for matches
+        // Searches for matches
         section.getProps().getServerEntries().forEach(entry -> {
             Pattern pattern = Pattern.compile(entry);
             plugin.getProxy().getServers().forEach((name, server) -> {
@@ -270,7 +270,7 @@ public void calculateServers(ServerSection section) {
             });
         });
 
-        //Checks if there are servers previously matched that are no longer valid
+        // Checks if there are servers previously matched that are no longer valid
         section.getServers().forEach(server -> {
             if (!results.contains(server)) {
                 servers.remove(server);
@@ -281,7 +281,7 @@ public void calculateServers(ServerSection section) {
             }
         });
 
-        //Add matched servers to the section
+        // Add matched servers to the section
         int addedServers = 0;
         for (ServerInfo server : results) {
             if (!section.getServers().contains(server)) {
@@ -306,7 +306,7 @@ public void calculateServers(ServerSection section) {
     public int calculatePosition(ServerSection section) {
         ServerSection current = section;
 
-        //Calculate above principal
+        // Calculate above principal
         int iterations = 0;
         while (current != null) {
             if (current == principal) {
@@ -317,7 +317,7 @@ public int calculatePosition(ServerSection section) {
             iterations++;
         }
 
-        //Calculate below principal
+        // Calculate below principal
         if (principal != null) {
             iterations = 0;
             current = principal;
diff --git a/balancer/src/main/java/com/jaimemartz/playerbalancer/section/SectionServer.java b/balancer/src/main/java/com/jaimemartz/playerbalancer/section/SectionServer.java
@@ -47,7 +47,7 @@ public void sendData(String channel, byte[] data) {
 
     @Override
     public boolean sendData(String channel, byte[] data, boolean queue) {
-        //Nothing to do
+        // Nothing to do
         return true;
     }
 
diff --git a/balancer/src/main/java/com/jaimemartz/playerbalancer/utils/AdapterWrapper.java b/balancer/src/main/java/com/jaimemartz/playerbalancer/utils/AdapterWrapper.java
@@ -11,7 +11,7 @@ public class AdapterWrapper implements ConfigurationAdapter {
     private final ConfigurationAdapter wrapped;
 
     public AdapterWrapper(ConfigurationAdapter adapter) {
-        //Prevents memory leak
+        // Prevents memory leak
         if (adapter instanceof AdapterWrapper) {
             this.wrapped = ((AdapterWrapper) adapter).wrapped;
         } else {
diff --git a/balancer/src/main/java/com/jaimemartz/playerbalancer/utils/AlphanumComparator.java b/balancer/src/main/java/com/jaimemartz/playerbalancer/utils/AlphanumComparator.java
@@ -98,14 +98,14 @@ public int compare(String s1, String s2)
             String thatChunk = getChunk(s2, s2Length, thatMarker);
             thatMarker += thatChunk.length();
 
-            // If both chunks contain numeric characters, sort them numerically
+            //  If both chunks contain numeric characters, sort them numerically
             int result = 0;
             if (isDigit(thisChunk.charAt(0)) && isDigit(thatChunk.charAt(0)))
             {
-                // Simple chunk comparison by length.
+                //  Simple chunk comparison by length.
                 int thisChunkLength = thisChunk.length();
                 result = thisChunkLength - thatChunk.length();
-                // If equal, the first different number counts
+                //  If equal, the first different number counts
                 if (result == 0)
                 {
                     for (int i = 0; i < thisChunkLength; i++)
diff --git a/balancer/src/main/java/com/jaimemartz/playerbalancer/utils/LevenshteinDistance.java b/balancer/src/main/java/com/jaimemartz/playerbalancer/utils/LevenshteinDistance.java
@@ -20,35 +20,35 @@ private static int distance(CharSequence lhs, CharSequence rhs) {
         int len0 = lhs.length() + 1;
         int len1 = rhs.length() + 1;
 
-        // the array of distances
+        //  the array of distances
         int[] cost = new int[len0];
         int[] newcost = new int[len0];
 
-        // initial cost of skipping prefix in String s0
+        //  initial cost of skipping prefix in String s0
         for (int i = 0; i < len0; i++) cost[i] = i;
 
-        // dynamically computing the array of distances
+        //  dynamically computing the array of distances
 
-        // transformation cost for each letter in s1
+        //  transformation cost for each letter in s1
         for (int j = 1; j < len1; j++) {
-            // initial cost of skipping prefix in String s1
+            //  initial cost of skipping prefix in String s1
             newcost[0] = j;
 
-            // transformation cost for each letter in s0
+            //  transformation cost for each letter in s0
             for (int i = 1; i < len0; i++) {
-                // matching current letters in both strings
+                //  matching current letters in both strings
                 int match = (lhs.charAt(i - 1) == rhs.charAt(j - 1)) ? 0 : 1;
 
-                // computing cost for each transformation
+                //  computing cost for each transformation
                 int cost_replace = cost[i - 1] + match;
                 int cost_insert = cost[i] + 1;
                 int cost_delete = newcost[i - 1] + 1;
 
-                // keep minimum cost
+                //  keep minimum cost
                 newcost[i] = Math.min(Math.min(cost_insert, cost_delete), cost_replace);
             }
 
-            // swap cost/newcost arrays
+            //  swap cost/newcost arrays
             int[] swap = cost;
             cost = newcost;
             newcost = swap;
diff --git a/balancer/src/main/java/com/jaimemartz/playerbalancer/utils/ServerListPing.java b/balancer/src/main/java/com/jaimemartz/playerbalancer/utils/ServerListPing.java
@@ -56,31 +56,31 @@ public StatusResponse ping(InetSocketAddress host, int timeout) throws IOExcepti
                  DataInputStream dataInputStream = new DataInputStream(socket.getInputStream())) {
                 ByteArrayOutputStream b = new ByteArrayOutputStream();
                 DataOutputStream handshake = new DataOutputStream(b);
-                handshake.writeByte(0x00); //packet id for handshake
-                writeVarInt(handshake, 4); //protocol version
-                writeVarInt(handshake, host.getHostString().length()); //host length
-                handshake.writeBytes(host.getHostString()); //host string
-                handshake.writeShort(host.getPort()); //port
-                writeVarInt(handshake, 1); //state (1 for handshake)
+                handshake.writeByte(0x00); // packet id for handshake
+                writeVarInt(handshake, 4); // protocol version
+                writeVarInt(handshake, host.getHostString().length()); // host length
+                handshake.writeBytes(host.getHostString()); // host string
+                handshake.writeShort(host.getPort()); // port
+                writeVarInt(handshake, 1); // state (1 for handshake)
 
-                writeVarInt(dataOutputStream, b.size()); //prepend size
-                dataOutputStream.write(b.toByteArray()); //write handshake packet
+                writeVarInt(dataOutputStream, b.size()); // prepend size
+                dataOutputStream.write(b.toByteArray()); // write handshake packet
 
 
-                dataOutputStream.writeByte(0x01); //size is only 1
-                dataOutputStream.writeByte(0x00); //packet id for ping
-                int size = readVarInt(dataInputStream); //size of packet
-                int id = readVarInt(dataInputStream); //packet id
+                dataOutputStream.writeByte(0x01); // size is only 1
+                dataOutputStream.writeByte(0x00); // packet id for ping
+                int size = readVarInt(dataInputStream); // size of packet
+                int id = readVarInt(dataInputStream); // packet id
 
                 if (id == -1) {
                     throw new IOException("Premature end of stream.");
                 }
 
-                if (id != 0x00) { //we want a status response
+                if (id != 0x00) { // we want a status response
                     throw new IOException("Invalid packetID");
                 }
 
-                int length = readVarInt(dataInputStream); //length of json string
+                int length = readVarInt(dataInputStream); // length of json string
                 if (length == -1) {
                     throw new IOException("Premature end of stream.");
                 }
@@ -90,14 +90,14 @@ public StatusResponse ping(InetSocketAddress host, int timeout) throws IOExcepti
                 }
 
                 byte[] in = new byte[length];
-                dataInputStream.readFully(in);  //read json string
+                dataInputStream.readFully(in);  // read json string
                 String json = new String(in);
 
 
                 long now = System.currentTimeMillis();
-                dataOutputStream.writeByte(0x09); //size of packet
-                dataOutputStream.writeByte(0x01); //0x01 for ping
-                dataOutputStream.writeLong(now); //time!?
+                dataOutputStream.writeByte(0x09); // size of packet
+                dataOutputStream.writeByte(0x01); // 0x01 for ping
+                dataOutputStream.writeLong(now); // time!?
 
                 readVarInt(dataInputStream);
                 id = readVarInt(dataInputStream);
@@ -109,7 +109,7 @@ public StatusResponse ping(InetSocketAddress host, int timeout) throws IOExcepti
                     throw new IOException("Invalid packetID");
                 }
 
-                long pingTime = dataInputStream.readLong(); //read response
+                long pingTime = dataInputStream.readLong(); // read response
                 StatusResponse response = gson.fromJson(json, StatusResponse.class);
                 response.time = (int) (now - pingTime);
                 return response;

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ public void onEnable() {`
`19`	`19`
`20`	`20`	`@Override`
`21`	`21`	`public void onDisable() {`
`22`		`- //Nothing to do...`
	`22`	`+ // Nothing to do...`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`public PluginMessageManager getManager() {`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ public PluginMessageManager(PlayerBalancerAddon plugin) {`
`27`	`27`	`plugin.getServer().getMessenger().registerIncomingPluginChannel(plugin, PB_CHANNEL, this);`
`28`	`28`	`plugin.getServer().getMessenger().registerOutgoingPluginChannel(plugin, PB_CHANNEL);`
`29`	`29`
`30`		`- //In case we need to use BungeeCord channels`
	`30`	`+ // In case we need to use BungeeCord channels`
`31`	`31`	`plugin.getServer().getMessenger().registerIncomingPluginChannel(plugin, BC_CHANNEL, this);`
`32`	`32`	`plugin.getServer().getMessenger().registerOutgoingPluginChannel(plugin, BC_CHANNEL);`
`33`	`33`	`}`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ public URL paste(PlayerBalancer plugin) throws Exception {`
`37`	`37`	`try (FileInputStream stream = new FileInputStream(file)) {`
`38`	`38`	`try (InputStreamReader reader = new InputStreamReader(stream, "UTF-8")) {`
`39`	`39`	`String content = CharStreams.toString(reader);`
`40`		`- HastebinPaste paste = new HastebinPaste("https://file.properties/paste/", content);`
	`40`	`+ HastebinPaste paste = new HastebinPaste("https:// file.properties/paste/", content);`
`41`	`41`	`return paste.paste();`
`42`	`42`	`}`
`43`	`43`	`}`
`@@ -62,7 +62,7 @@ public URL paste(PlayerBalancer plugin) throws Exception {`
`62`	`62`	`try (InputStreamReader reader = new InputStreamReader(stream, StandardCharsets.UTF_8)) {`
`63`	`63`	`String content = CharStreams.toString(reader);`
`64`	`64`	`content = content.replaceAll("[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}", "?.?.?.?");`
`65`		`- HastebinPaste paste = new HastebinPaste("https://file.properties/paste/", content);`
	`65`	`+ HastebinPaste paste = new HastebinPaste("https:// file.properties/paste/", content);`
`66`	`66`	`return paste.paste();`
`67`	`67`	`}`
`68`	`68`	`}`
`@@ -86,7 +86,7 @@ public URL paste(PlayerBalancer plugin) throws Exception {`
`86`	`86`	`try (FileInputStream stream = new FileInputStream(file)) {`
`87`	`87`	`try (InputStreamReader reader = new InputStreamReader(stream, StandardCharsets.UTF_8)) {`
`88`	`88`	`String content = CharStreams.toString(reader);`
`89`		`- HastebinPaste paste = new HastebinPaste("https://file.properties/paste/", content);`
	`89`	`+ HastebinPaste paste = new HastebinPaste("https:// file.properties/paste/", content);`
`90`	`90`	`return paste.paste();`
`91`	`91`	`}`
`92`	`92`	`}`