Improve reusability

Author: faebeee

src/fabs/component/ComponentCreator.java

@@ -2,8 +2,10 @@
 
 import com.intellij.openapi.vfs.VfsUtil;
 import com.intellij.openapi.vfs.VirtualFile;
+import com.samskivert.mustache.Template;
 import fabs.util.AbstractCreator;
 import fabs.util.FileUtils;
+import fabs.util.StringFormatter;
 import fabs.util.TemplateRenderer;
 
 import java.io.IOException;
@@ -31,36 +33,15 @@ public void create() throws IOException {
         VirtualFile componentDirectory = directory.createChildDirectory(directory, componentName);
 
         FileUtils utils = new FileUtils();
-        TemplateRenderer renderer = new TemplateRenderer();
 
-        templateModel.put("componentCamelcaseName", toCamelCase(componentName));
+        templateModel.put("componentCamelcaseName", StringFormatter.toCamelCase(componentName));
 
         for (int i = 0; i < filesToInclude.length; i++) {
             String file = filesToInclude[i];
-            utils.writeFile(renderer.render(file, templateModel), componentDirectory.createChildData(componentDirectory, transformTemplateName(file, componentName)));
+            utils.writeFile(
+                TemplateRenderer.render(file, templateModel),
+                componentDirectory.createChildData(componentDirectory, TemplateRenderer.transformTemplateName(file, componentName)
+            ));
         }
     }
-
-    private String toCamelCase(String input) {
-        StringBuffer sb = new StringBuffer();
-        for (String s : input.split("-")) {
-            sb.append(Character.toUpperCase(s.charAt(0)));
-            if (s.length() > 1) {
-                sb.append(s.substring(1, s.length()).toLowerCase());
-            }
-        }
-        return sb.toString();
-
-    }
-
-    private String transformTemplateName(String templateString, String componentName) {
-        String[] parts = templateString.split("/");
-        String fileName = parts[parts.length - 1];
-        return fileName
-                .replace(".mustache", "")
-                .replace("component", componentName)
-                ;
-    }
-
-
 }

src/fabs/component/ComponentCreatorAction.java

@@ -11,6 +11,5 @@ public class ComponentCreatorAction extends AbstractCreatorAction {
     @Override
     protected AbstractCreator createCreator(VirtualFile directory, String componentName, Map<String, Object> templateModel, String[] files) {
         return new ComponentCreator(directory, componentName, templateModel, files);
-
     }
 }

src/fabs/component/ComponentCreatorDialog.java

@@ -1,12 +1,15 @@
 package fabs.component;
 
+
+import fabs.util.AbstractDialog;
+
 import javax.swing.*;
 import java.awt.event.*;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Map;
 
-public class ComponentCreatorDialog extends JDialog {
+public class ComponentCreatorDialog extends AbstractDialog {
     private JPanel contentPane;
     private JButton buttonOK;
     private JButton buttonCancel;
@@ -22,24 +25,15 @@ public class ComponentCreatorDialog extends JDialog {
     private final String storyTemplateFile = "templates/component/component.story.tsx.mustache";
     private final String markdownTemplateFile = "templates/component/component.md.mustache";
 
-    private boolean hasCanceled = false;
 
     public ComponentCreatorDialog() {
         setContentPane(contentPane);
         setModal(true);
         getRootPane().setDefaultButton(buttonOK);
 
-        buttonOK.addActionListener(new ActionListener() {
-            public void actionPerformed(ActionEvent e) {
-                onOK();
-            }
-        });
+        buttonOK.addActionListener(e -> onOK());
 
-        buttonCancel.addActionListener(new ActionListener() {
-            public void actionPerformed(ActionEvent e) {
-                onCancel();
-            }
-        });
+        buttonCancel.addActionListener(e -> onCancel());
 
         // call onCancel() when cross is clicked
         setDefaultCloseOperation(DO_NOTHING_ON_CLOSE);
@@ -50,12 +44,7 @@ public void windowClosing(WindowEvent e) {
         });
 
         // call onCancel() on ESCAPE
-        contentPane.registerKeyboardAction(new ActionListener() {
-            public void actionPerformed(ActionEvent e) {
-                onCancel();
-            }
-        }, KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0), JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT);
-
+        contentPane.registerKeyboardAction(e -> onCancel(), KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0), JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT);
     }
 
     public Map<String, Object> getTemplateVars() {
@@ -90,19 +79,4 @@ public String[] getFiles() {
 
         return files.toArray(new String[files.size()]);
     }
-
-    public boolean isCanceled() {
-        return hasCanceled;
-    }
-
-    private void onOK() {
-        hasCanceled = false;
-        dispose();
-    }
-
-    private void onCancel() {
-        hasCanceled = true;
-        dispose();
-    }
-
 }

src/fabs/util/AbstractDialog.java

@@ -0,0 +1,29 @@
+package fabs.util;
+
+import javax.swing.*;
+import java.util.Map;
+
+public abstract class AbstractDialog extends JDialog {
+
+    public abstract String[] getFiles();
+
+    public abstract Map<String, Object> getTemplateVars();
+
+    public abstract String getComponentName();
+
+    protected boolean hasCanceled = false;
+
+    public boolean isCanceled() {
+        return hasCanceled;
+    }
+
+    protected void onOK() {
+        hasCanceled = false;
+        dispose();
+    }
+
+    protected void onCancel() {
+        hasCanceled = true;
+        dispose();
+    }
+}

src/fabs/util/StringFormatter.java

@@ -11,4 +11,21 @@ public static String toSnakeCase(String name) {
 
         return buffer.toString();
     }
+
+    /**
+     * Transform a string from dash case to camel case
+     * @param input
+     * @return
+     */
+    public static String toCamelCase(String input) {
+        StringBuffer sb = new StringBuffer();
+        for (String s : input.split("-")) {
+            sb.append(Character.toUpperCase(s.charAt(0)));
+            if (s.length() > 1) {
+                sb.append(s.substring(1, s.length()).toLowerCase());
+            }
+        }
+        return sb.toString();
+
+    }
 }

src/fabs/util/TemplateRenderer.java

@@ -6,9 +6,30 @@
 import java.util.Map;
 
 public class TemplateRenderer {
-    public String render(String file, Map<String, Object> context) {
+    /**
+     * Render a template
+     * @param file
+     * @param context
+     * @return
+     */
+    public static String render(String file, Map<String, Object> context) {
         FileUtils utils = new FileUtils();
         Template tmpl = Mustache.compiler().compile(utils.getContent(file));
         return tmpl.execute(context);
     }
+
+    /**
+     * Transform a filename
+     * @param templateString
+     * @param componentName
+     * @return
+     */
+    public static String transformTemplateName(String templateString, String componentName) {
+        String[] parts = templateString.split("/");
+        String fileName = parts[parts.length - 1];
+        return fileName
+                .replace(".mustache", "")
+                .replace("component", componentName)
+                ;
+    }
 }