1 files changed, 9 insertions, 13 deletions
diff --git a/src/main/ui/IssueScreen.java b/src/main/ui/IssueScreen.java
index 8376146..5e3ad50 100644
--- a/src/main/ui/IssueScreen.java
+++ b/src/main/ui/IssueScreen.java
@@ -66,7 +66,6 @@ public class IssueScreen implements UIHandler {
         try {
             Certificate certificate = session.getCa().signCert(incomingCSR.getCertificationRequestInfo(), template);
             System.out.println(Utils.toPEM(certificate.encodeDER(), "CERTIFICATE"));
-            session.log("A certificate was issued.");
             session.setScreen(Screen.MAIN);
         } catch (Throwable e) {
             System.out.println(e.getMessage());
@@ -75,11 +74,11 @@ public class IssueScreen implements UIHandler {
 
     /**
      * EFFECTS: Set or unset the subject.
-     * MODIFIES: template
+     * MODIFIES: this
      */
     private void handleIssueSetSubject(String val) {
         try {
-            template.setSubject(val);
+            template = new Template(template.getName(), template.isEnabled(), val, template.getValidity());
         } catch (ParseException e) {
             System.out.println(e.getMessage());
         }
@@ -87,7 +86,7 @@ public class IssueScreen implements UIHandler {
 
     /**
      * EFFECTS: Set or unset the validity.
-     * MODIFIES: template
+     * MODIFIES: this
      */
     private void handleIssueSetValidity(String val) {
         if (val == null) {
@@ -100,7 +99,7 @@ public class IssueScreen implements UIHandler {
                 System.out.println("Invalid validity days");
                 return;
             }
-            template.setValidity(i);
+            template = new Template(template.getName(), template.isEnabled(), template.getSubject(), i);
         } catch (NumberFormatException ignored) {
             System.out.println("Invalid validity days");
         }
@@ -108,7 +107,7 @@ public class IssueScreen implements UIHandler {
 
     /**
      * EFFECTS: Handle the set command.
-     * MODIFIES: template
+     * MODIFIES: this
      */
     private void handleIssueSet(String... args) {
         if (args.length != 2 && args.length != 3) {
@@ -132,13 +131,10 @@ public class IssueScreen implements UIHandler {
 
     @Override
     public void command(String... args) {
-        switch (args[0]) {
-            case "set":
-                handleIssueSet(args);
-                break;
-            default:
-                help();
-                break;
+        if (args[0].equals("set")) {
+            handleIssueSet(args);
+        } else {
+            help();
         }
     }