From e07c685d2a420d48764266110db3b1b0b646d2ff Mon Sep 17 00:00:00 2001 From: ljacqu Date: Sun, 2 Oct 2016 10:55:02 +0200 Subject: [PATCH] Minor tool task improvements - List tasks alphabetically in tools runner - Remove redundant space before CUSTOM entry in hash algorithms table --- src/test/java/tools/ToolsRunner.java | 4 ++-- .../java/tools/hashmethods/HashAlgorithmsDescriptionTask.java | 2 +- src/test/java/tools/hashmethods/hash_algorithms.tpl.md | 3 +-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/test/java/tools/ToolsRunner.java b/src/test/java/tools/ToolsRunner.java index 240b0681a..3dfbd36b7 100644 --- a/src/test/java/tools/ToolsRunner.java +++ b/src/test/java/tools/ToolsRunner.java @@ -5,9 +5,9 @@ import fr.xephi.authme.TestHelper; import tools.utils.AutoToolTask; import tools.utils.ToolTask; -import java.util.HashMap; import java.util.Map; import java.util.Scanner; +import java.util.TreeMap; /** * Runner for executing tool tasks. @@ -29,7 +29,7 @@ public final class ToolsRunner { // Note ljacqu 20151212: If the tools folder becomes a lot bigger, it will make sense to restrict the depth // of this recursive collector ClassCollector collector = new ClassCollector(TestHelper.TEST_SOURCES_FOLDER, "tools"); - Map tasks = new HashMap<>(); + Map tasks = new TreeMap<>(String.CASE_INSENSITIVE_ORDER); for (ToolTask task : collector.getInstancesOfType(ToolTask.class)) { tasks.put(task.getTaskName(), task); } diff --git a/src/test/java/tools/hashmethods/HashAlgorithmsDescriptionTask.java b/src/test/java/tools/hashmethods/HashAlgorithmsDescriptionTask.java index edbf54307..9f0a7b366 100644 --- a/src/test/java/tools/hashmethods/HashAlgorithmsDescriptionTask.java +++ b/src/test/java/tools/hashmethods/HashAlgorithmsDescriptionTask.java @@ -13,7 +13,7 @@ import java.util.Scanner; /** * Task for generating the markdown page describing the AuthMe hash algorithms. * - * @see {@link fr.xephi.authme.security.HashAlgorithm} + * @see fr.xephi.authme.security.HashAlgorithm */ public class HashAlgorithmsDescriptionTask implements AutoToolTask { diff --git a/src/test/java/tools/hashmethods/hash_algorithms.tpl.md b/src/test/java/tools/hashmethods/hash_algorithms.tpl.md index 73e85ba00..17431eb5b 100644 --- a/src/test/java/tools/hashmethods/hash_algorithms.tpl.md +++ b/src/test/java/tools/hashmethods/hash_algorithms.tpl.md @@ -9,8 +9,7 @@ Algorithm | Recommendation | Hash length | ASCII | | Salt type | Length | Se --------- | -------------- | ----------- | ----- | --- | --------- | ------ | --------- [#algorithms] {name} | {recommendation} | {hash_length} | {ascii_restricted} | | {salt_type} | {salt_length} | {separate_salt} -[/#algorithms] -CUSTOM | | | | | | | | +[/#algorithms]CUSTOM | | | | | | | |