Refactor: move all logics into CertificationAuthority

Signed-off-by: Yuuta Liang <yuutaw@student.cs.ubc.ca>

1 files changed, 6 insertions, 7 deletions

diff --git a/src/main/ui/TemplateSetScreen.java b/src/main/ui/TemplateSetScreen.java
index 42f393b..a0b39c1 100644
--- a/src/main/ui/TemplateSetScreen.java
+++ b/src/main/ui/TemplateSetScreen.java
@@ -32,11 +32,11 @@ public class TemplateSetScreen implements UIHandler {
 
     /**
      * EFFECTS: Parse and set / unset the subject of the template
-     * MODIFIES: this#template
+     * MODIFIES: this
      */
     private void handleSetSubject(String val) {
         try {
-            template.setSubject(val);
+            template = new Template(template.getName(), template.isEnabled(), val, template.getValidity());
         } catch (ParseException e) {
             System.out.println(e.getMessage());
         }
@@ -44,7 +44,7 @@ public class TemplateSetScreen implements UIHandler {
 
     /**
      * EFFECTS: Set the validity of the template to the given integer
-     * MODIFIES: this#template
+     * MODIFIES: this
      */
     private void handleSetValidity(String val) {
         if (val == null) {
@@ -57,7 +57,7 @@ public class TemplateSetScreen 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");
         }
@@ -65,7 +65,7 @@ public class TemplateSetScreen implements UIHandler {
 
     /**
      * EFFECTS: Handle the `set` command.
-     * MODIFIES: this#template
+     * MODIFIES: this
      */
     private void handleSet(String... args) {
         if (args.length != 2 && args.length != 3) {
@@ -93,9 +93,8 @@ public class TemplateSetScreen implements UIHandler {
      */
     @Override
     public void commit() {
-        session.getTemplates().add(template);
+        session.getCa().addTemplate(template);
         session.setScreen(Screen.TEMPLATES);
-        session.log("A new template is added.");
     }
 
     /**