From feb9efc7335cd85744a982c463b0902992c92cf5 Mon Sep 17 00:00:00 2001
From: Paul Schaub <vanitasvitae@fsfe.org>
Date: Wed, 12 Jul 2023 14:20:53 +0200
Subject: [PATCH] Reorder subcommands

---
 .../src/main/java/sop/cli/picocli/SopCLI.java | 27 +++++++++++--------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/sop-java-picocli/src/main/java/sop/cli/picocli/SopCLI.java b/sop-java-picocli/src/main/java/sop/cli/picocli/SopCLI.java
index e80c887..8eb18bf 100644
--- a/sop-java-picocli/src/main/java/sop/cli/picocli/SopCLI.java
+++ b/sop-java-picocli/src/main/java/sop/cli/picocli/SopCLI.java
@@ -32,22 +32,27 @@ import java.util.ResourceBundle;
         resourceBundle = "msg_sop",
         exitCodeOnInvalidInput = 69,
         subcommands = {
-                CommandLine.HelpCommand.class,
-                ArmorCmd.class,
-                DearmorCmd.class,
-                DecryptCmd.class,
-                InlineDetachCmd.class,
-                EncryptCmd.class,
-                ExtractCertCmd.class,
+                // Meta Subcommands
+                VersionCmd.class,
+                ListProfilesCmd.class,
+                // Key and Certificate Management Subcommands
                 GenerateKeyCmd.class,
+                ChangeKeyPasswordCmd.class,
+                RevokeKeyCmd.class,
+                ExtractCertCmd.class,
+                // Messaging Subcommands
                 SignCmd.class,
                 VerifyCmd.class,
+                EncryptCmd.class,
+                DecryptCmd.class,
+                InlineDetachCmd.class,
                 InlineSignCmd.class,
                 InlineVerifyCmd.class,
-                ListProfilesCmd.class,
-                RevokeKeyCmd.class,
-                ChangeKeyPasswordCmd.class,
-                VersionCmd.class,
+                // Transport Subcommands
+                ArmorCmd.class,
+                DearmorCmd.class,
+                // Miscellaneous Subcommands
+                CommandLine.HelpCommand.class,
                 AutoComplete.GenerateCompletion.class
         }
 )