Remove duplicate logic determining component type

Author: pmclain

src/com/magento/idea/magento2plugin/actions/generation/OverrideInThemeAction.java

@@ -13,13 +13,11 @@
 import com.magento.idea.magento2plugin.MagentoIcons;
 import com.magento.idea.magento2plugin.actions.generation.dialog.OverrideInThemeDialog;
 import com.magento.idea.magento2plugin.project.Settings;
-import com.magento.idea.magento2plugin.util.RegExUtil;
+import com.magento.idea.magento2plugin.util.magento.ComponentType;
 import com.magento.idea.magento2plugin.util.magento.GetComponentNameByDirectory;
+import com.magento.idea.magento2plugin.util.magento.GetComponentTypeByName;
 import org.jetbrains.annotations.NotNull;
 
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
 public class OverrideInThemeAction extends DumbAwareAction {
     public static String ACTION_NAME = "Override in theme...";
     public static String ACTION_DESCRIPTION = "Override template in project theme.";
@@ -56,31 +54,18 @@ private boolean isOverrideAllowed(VirtualFile file, Project project) throws Null
         boolean isAllowed = false;
 
         GetComponentNameByDirectory getComponentNameByDirectory = GetComponentNameByDirectory.getInstance(project);
-        String componentName = getComponentNameByDirectory.execute(psiFile.getContainingDirectory());
+        String componentType = GetComponentTypeByName.execute(getComponentNameByDirectory
+                .execute(psiFile.getContainingDirectory()));
 
-        if (isModule(componentName)) {
+        if (componentType.equals(ComponentType.TYPE_MODULE)) {
             isAllowed = file.getPath().contains("view");
-        } else if (isTheme(componentName)) {
+        } else if (componentType.equals(ComponentType.TYPE_THEME)) {
             isAllowed = true;
         }
 
         return isAllowed;
     }
 
-    private boolean isModule(String componentName) {
-        Pattern modulePattern = Pattern.compile(RegExUtil.Magento.MODULE_NAME);
-        Matcher moduleMatcher = modulePattern.matcher(componentName);
-
-        return moduleMatcher.find();
-    }
-
-    private boolean isTheme(String componentName) {
-        Pattern themePattern = Pattern.compile(RegExUtil.Magento.THEME_NAME);
-        Matcher themeMatcher = themePattern.matcher(componentName);
-
-        return themeMatcher.find();
-    }
-
     private void setStatus(AnActionEvent event, boolean status) {
         event.getPresentation().setVisible(status);
         event.getPresentation().setEnabled(status);

src/com/magento/idea/magento2plugin/actions/generation/generator/OverrideInThemeGenerator.java

@@ -6,7 +6,9 @@
 import com.intellij.psi.PsiFile;
 import com.magento.idea.magento2plugin.indexes.ModuleIndex;
 import com.magento.idea.magento2plugin.util.RegExUtil;
+import com.magento.idea.magento2plugin.util.magento.ComponentType;
 import com.magento.idea.magento2plugin.util.magento.GetComponentNameByDirectory;
+import com.magento.idea.magento2plugin.util.magento.GetComponentTypeByName;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -35,12 +37,16 @@ public void execute(PsiFile baseFile, String themeName) {
         ModuleIndex moduleIndex = ModuleIndex.getInstance(project);
         PsiDirectory directory = moduleIndex.getModuleDirectoryByModuleName(themeName);
         GetComponentNameByDirectory getComponentNameByDirectory = GetComponentNameByDirectory.getInstance(project);
-        String componentName = getComponentNameByDirectory.execute(baseFile.getContainingDirectory());
+        String componentType = GetComponentTypeByName.execute(getComponentNameByDirectory
+                .execute(baseFile.getContainingDirectory()));
 
         List<String> pathComponents;
-        if (isModule(componentName)) {
-            pathComponents = getModulePathComponents(baseFile, componentName);
-        } else if (isTheme(componentName)) {
+        if (componentType.equals(ComponentType.TYPE_MODULE)) {
+            pathComponents = getModulePathComponents(
+                    baseFile,
+                    getComponentNameByDirectory.execute(baseFile.getContainingDirectory())
+            );
+        } else if (componentType.equals(ComponentType.TYPE_THEME)) {
             pathComponents = getThemePathComponents(baseFile);
         } else {
             return;

src/com/magento/idea/magento2plugin/util/magento/ComponentType.java

@@ -0,0 +1,10 @@
+/*
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+package com.magento.idea.magento2plugin.util.magento;
+
+public class ComponentType {
+    public static String TYPE_MODULE = "module";
+    public static String TYPE_THEME = "theme";
+}

src/com/magento/idea/magento2plugin/util/magento/GetComponentTypeByName.java

@@ -0,0 +1,40 @@
+/*
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+package com.magento.idea.magento2plugin.util.magento;
+
+import com.magento.idea.magento2plugin.util.RegExUtil;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+public class GetComponentTypeByName {
+
+    @Nullable
+    public static String execute(String componentName) {
+        String componentType = null;
+        if (isModule(componentName)) {
+            componentType = ComponentType.TYPE_MODULE;
+        } else if (isTheme(componentName)) {
+            componentType = ComponentType.TYPE_THEME;
+        }
+
+        return componentType;
+    }
+
+    private static boolean isModule(String componentName) {
+        Pattern modulePattern = Pattern.compile(RegExUtil.Magento.MODULE_NAME);
+        Matcher moduleMatcher = modulePattern.matcher(componentName);
+
+        return moduleMatcher.find();
+    }
+
+    private static boolean isTheme(String componentName) {
+        Pattern themePattern = Pattern.compile(RegExUtil.Magento.THEME_NAME);
+        Matcher themeMatcher = themePattern.matcher(componentName);
+
+        return themeMatcher.find();
+    }
+}