clean up. Remove unnecessary commands.

Author: thsc42

libs/ASAPJava.jar

@@ -17,7 +17,6 @@
 import net.sharksystem.cmdline.sharkmessengerUI.commands.persons.UICommandListPersons;
 import net.sharksystem.cmdline.sharkmessengerUI.commands.testing.UICommandSaveLog;
 import net.sharksystem.cmdline.sharkmessengerUI.commands.testing.UICommandShowLog;
-import net.sharksystem.cmdline.sharkmessengerUI.commands.simpleMessenger.*;
 import net.sharksystem.cmdline.sharkmessengerUI.commands.pki.*;
 import net.sharksystem.cmdline.sharkmessengerUI.commands.tcp.UICommandCloseTCP;
 import net.sharksystem.cmdline.sharkmessengerUI.commands.tcp.UICommandConnectTCP;
@@ -134,6 +133,8 @@ public static void main(String[] args) throws SharkException, IOException {
         smUI.addCommand(new UICommandListPersons(sharkMessengerApp, smUI, "lsPersons", true));
 
         // PKI
+        smUI.addCommand(new UICommandListCertificateIssuer(sharkMessengerApp, smUI, "lsCertIssuer", true));
+        smUI.addCommand(new UICommandListCertificateIssuer(sharkMessengerApp, smUI, "lsCertSubjects", true));
         smUI.addCommand(new UICommandShowCertificatesByIssuer(sharkMessengerApp, smUI, "certByIssuer", true));
         smUI.addCommand(new UICommandShowCertificatesBySubject(sharkMessengerApp, smUI, "certBySubject", true));
         smUI.addCommand(new UICommandShowPendingCredentials(sharkMessengerApp, smUI, "lsCredentials", true));
@@ -166,18 +167,6 @@ public static void main(String[] args) throws SharkException, IOException {
         //smUI.addCommand(new UICommandSetChannelAge(sharkMessengerApp, smUI, "setChannelAge", true));
         smUI.addCommand(new UICommandRemoveChannelByIndex(sharkMessengerApp, smUI, "rmChannel", true));
 
-        smUI.addCommand(new UICommandGetIdentityAssurance(sharkMessengerApp, smUI, "ia", true));
-        smUI.addCommand(new UICommandGetSigningFailureRate(sharkMessengerApp, smUI, "getSF", true));
-        smUI.addCommand(new UICommandSetSigningFailureRate(sharkMessengerApp, smUI, "setSF", true));
-        //smUI.addCommand(new UICommandCreateCredentialMessage(sharkMessengerApp, smUI, "mkCredentialMsg", true));
-        smUI.addCommand(new UICommandExchangeCertificates(sharkMessengerApp, smUI, "exchCert", true));
-        smUI.addCommand(new UICommandGetCertificationPath(sharkMessengerApp, smUI, "certPath", true));
-        smUI.addCommand(new UICommandGetOwnerInfo(sharkMessengerApp, smUI, "ownerInfo", true));
-        smUI.addCommand(new UICommandGetNumberOfKnownPeers(sharkMessengerApp, smUI, "numPeers", true));
-        smUI.addCommand(new UICommandCreateNewKeyPair(sharkMessengerApp, smUI, "mkKeys", true));
-        smUI.addCommand(new UICommandGetKeysCreationTime(sharkMessengerApp, smUI, "keysTime", true));
-        smUI.addCommand(new UICommandGetMessageDetails(sharkMessengerApp, smUI, "getMessageDetails", true));
-
         smUI.printUsage();
         smUI.runCommandLoop();
     }

src/net/sharksystem/cmdline/sharkmessengerUI/ProductionUI.java

@@ -299,6 +299,7 @@ public void runCommandLoop() {
 
             } catch (Exception e) {
                 this.errStream.println("exception caught: " + e.getLocalizedMessage());
+                e.printStackTrace(errStream);
             }
         }
     }

src/net/sharksystem/cmdline/sharkmessengerUI/SharkMessengerUI.java

@@ -182,9 +182,9 @@ private void addHobDetails(StringBuilder sb, ASAPHop hop) {
         sb.append(" | ");
         sb.append("via: ");
         switch(hop.getConnectionType()) {
-            case INTERNET -> sb.append("DIRECT TCP");
+            case INTERNET -> sb.append("TCP");
             case ASAP_HUB -> sb.append("HUB");
-            case AD_HOC_LAYER_2_NETWORK -> sb.append("Ad-HOC");
+            case AD_HOC_LAYER_2_NETWORK -> sb.append("Ad-Hoc");
             case ONION_NETWORK -> sb.append("Onion");
         }
     }

src/net/sharksystem/cmdline/sharkmessengerUI/commands/extendedMessenger/ChannelPrinter.java

@@ -1,18 +1,13 @@
-package net.sharksystem.cmdline.sharkmessengerUI.commands.simpleMessenger;
+package net.sharksystem.cmdline.sharkmessengerUI.commands.extendedMessenger;
 
 import net.sharksystem.SharkException;
 import net.sharksystem.cmdline.sharkmessengerUI.*;
-import net.sharksystem.cmdline.sharkmessengerUI.commandarguments.UICommandIntegerArgument;
-import net.sharksystem.cmdline.sharkmessengerUI.commandarguments.UICommandQuestionnaire;
-import net.sharksystem.cmdline.sharkmessengerUI.commands.extendedMessenger.ChannelPrinter;
-import net.sharksystem.cmdline.sharkmessengerUI.commands.extendedMessenger.UICommandProduceChannelListBefore;
 import net.sharksystem.cmdline.sharkmessengerUI.commands.helper.AbstractCommandWithSingleInteger;
 import net.sharksystem.messenger.SharkMessageList;
 import net.sharksystem.messenger.SharkMessengerChannel;
 import net.sharksystem.messenger.SharkMessengerComponent;
 
 import java.io.IOException;
-import java.util.List;
 
 /**
  * This command lists all known messages of a channel.
@@ -36,6 +31,7 @@ public void execute() throws Exception {
             }
             catch (SharkException se) {
                 this.getSharkMessengerApp().tellUI("there is no channel at all (yet)");
+                return;
             }
 
             SharkMessageList messages = channel.getMessages();

…mpleMessenger/UICommandListMessages.java …ndedMessenger/UICommandListMessages.javasrc/net/sharksystem/cmdline/sharkmessengerUI/commands/simpleMessenger/UICommandListMessages.java renamed to src/net/sharksystem/cmdline/sharkmessengerUI/commands/extendedMessenger/UICommandListMessages.java src/net/sharksystem/cmdline/sharkmessengerUI/commands/simpleMessenger/UICommandListMessages.java renamed to src/net/sharksystem/cmdline/sharkmessengerUI/commands/extendedMessenger/UICommandListMessages.java

@@ -1,4 +1,4 @@
-package net.sharksystem.cmdline.sharkmessengerUI.commands.simpleMessenger;
+package net.sharksystem.cmdline.sharkmessengerUI.commands.extendedMessenger;
 
 import net.sharksystem.asap.utils.ASAPSerialization;
 import net.sharksystem.cmdline.sharkmessengerUI.*;