1 files changed, 8 insertions, 9 deletions

diff --git a/src/main/ui/TemplatesScreen.java b/src/main/ui/TemplatesScreen.java
index 3bdbebe..e08df50 100644
--- a/src/main/ui/TemplatesScreen.java
+++ b/src/main/ui/TemplatesScreen.java
@@ -1,6 +1,7 @@
 package ui;
 
 import model.ca.Template;
+import model.x501.Name;
 
 /**
  * The screen that allows users to list templates and manage them.
@@ -34,7 +35,7 @@ public class TemplatesScreen implements UIHandler {
      */
     @Override
     public void show() {
-        session.getTemplates().forEach(tem ->
+        session.getCa().getTemplates().forEach(tem ->
                 System.out.printf("%s[%s]\t%s\t%d Days\n",
                         tem.getName(),
                         tem.isEnabled() ? "ENABLED" : "DISABLED",
@@ -50,13 +51,13 @@ public class TemplatesScreen implements UIHandler {
             System.out.println("Usage: add <name>");
             return;
         }
-        if (session.findTemplate(args[1], false) != null) {
+        if (session.getCa().findTemplate(args[1], false) != null) {
             System.out.println("The template already exists.");
             return;
         }
 
         session.setScreen(Screen.TEMPLATE_SET,
-                new Template(args[1], false, null, 30));
+                new Template(args[1], false, (Name) null, 30));
     }
 
     /**
@@ -68,13 +69,12 @@ public class TemplatesScreen implements UIHandler {
             System.out.printf("Usage: %s <template>\n", enable ? "enable" : "disable");
             return;
         }
-        Template tmp = session.findTemplate(args[1], false);
+        Template tmp = session.getCa().findTemplate(args[1], false);
         if (tmp == null) {
             System.out.println("Cannot find the template specified");
             return;
         }
-        tmp.setEnabled(enable);
-        session.log("A template was enabled / disabled.");
+        session.getCa().setTemplateEnable(tmp, enable);
     }
 
     /**
@@ -86,13 +86,12 @@ public class TemplatesScreen implements UIHandler {
             System.out.println("Usage: delete <template>");
             return;
         }
-        Template tmp = session.findTemplate(args[1], true);
+        Template tmp = session.getCa().findTemplate(args[1], true);
         if (tmp == null) {
             System.out.println("Cannot find the template specified");
             return;
         }
-        session.getTemplates().remove(tmp);
-        session.log("A template was deleted.");
+        session.getCa().removeTemplate(tmp);
     }
 
     /**