Merge pull request #450 from dylanngo95/issues-444

[#444]_Add options for override and extend layout

Author: coderimus

src/com/magento/idea/magento2plugin/actions/generation/dialog/OverrideInTheme.form

@@ -20,11 +20,6 @@
         <properties/>
         <border type="none"/>
         <children>
-          <hspacer id="98af6">
-            <constraints>
-              <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="1" hsize-policy="6" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
-            </constraints>
-          </hspacer>
           <grid id="9538f" layout-manager="GridLayoutManager" row-count="1" column-count="2" same-size-horizontally="true" same-size-vertically="false" hgap="-1" vgap="-1">
             <margin top="0" left="0" bottom="0" right="0"/>
             <constraints>
@@ -51,6 +46,33 @@
               </component>
             </children>
           </grid>
+          <grid id="5bb09" layout-manager="GridLayoutManager" row-count="2" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+            <margin top="0" left="0" bottom="0" right="0"/>
+            <constraints>
+              <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
+            </constraints>
+            <properties/>
+            <border type="none"/>
+            <children>
+              <component id="51c12" class="javax.swing.JRadioButton" binding="radioButtonOverride">
+                <constraints>
+                  <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+                </constraints>
+                <properties>
+                  <selected value="true"/>
+                  <text value="Override Layout"/>
+                </properties>
+              </component>
+              <component id="d677f" class="javax.swing.JRadioButton" binding="radioButtonExtend">
+                <constraints>
+                  <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+                </constraints>
+                <properties>
+                  <text value="Extend Layout"/>
+                </properties>
+              </component>
+            </children>
+          </grid>
         </children>
       </grid>
       <grid id="e3588" layout-manager="GridLayoutManager" row-count="2" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">

src/com/magento/idea/magento2plugin/actions/generation/dialog/OverrideInThemeDialog.java

@@ -23,6 +23,7 @@
 import javax.swing.JComponent;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
+import javax.swing.JRadioButton;
 import javax.swing.KeyStroke;
 import org.jetbrains.annotations.NotNull;
 
@@ -39,6 +40,8 @@ public class OverrideInThemeDialog extends AbstractDialog {
     @FieldValidation(rule = RuleRegistry.NOT_EMPTY,
             message = {NotEmptyRule.MESSAGE, THEME_NAME})
     private JComboBox theme;
+    private JRadioButton radioButtonOverride;
+    private JRadioButton radioButtonExtend;
 
     /**
      * Constructor.
@@ -61,6 +64,9 @@ public OverrideInThemeDialog(final @NotNull Project project, final PsiFile psiFi
         buttonOK.addActionListener((final ActionEvent event) -> onOK());
         buttonCancel.addActionListener((final ActionEvent event) -> onCancel());
 
+        radioButtonOverride.addActionListener((final ActionEvent event) -> onOverride());
+        radioButtonExtend.addActionListener((final ActionEvent event) -> onExtend());
+
         setDefaultCloseOperation(DO_NOTHING_ON_CLOSE);
         addWindowListener(new WindowAdapter() {
             @Override
@@ -76,14 +82,24 @@ public void windowClosing(final WindowEvent event) {
         );
     }
 
+    private void onOverride() {
+        this.radioButtonOverride.setSelected(true);
+        this.radioButtonExtend.setSelected(false);
+    }
+
+    private void onExtend() {
+        this.radioButtonOverride.setSelected(false);
+        this.radioButtonExtend.setSelected(true);
+    }
+
     private void onOK() {
         if (!validateFormFields()) {
             return;
         }
 
         final OverrideInThemeGenerator overrideInThemeGenerator =
                 new OverrideInThemeGenerator(project);
-        overrideInThemeGenerator.execute(psiFile, this.getTheme());
+        overrideInThemeGenerator.execute(psiFile, this.getTheme(), this.isOverride());
 
         this.setVisible(false);
     }
@@ -92,6 +108,15 @@ public String getTheme() {
         return this.theme.getSelectedItem().toString();
     }
 
+    /**
+     * Is Override.
+     *
+     * @return boolean
+     */
+    public boolean isOverride() {
+        return this.radioButtonOverride.isSelected();
+    }
+
     /**
      * Open popup.
      *

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

@@ -41,8 +41,9 @@ public OverrideInThemeGenerator(final Project project) {
      *
      * @param baseFile PsiFile
      * @param themeName String
+     * @param isOverride boolean
      */
-    public void execute(final PsiFile baseFile, final String themeName) {
+    public void execute(final PsiFile baseFile, final String themeName, final boolean isOverride) {
         final String componentType = GetComponentTypeByNameUtil.execute(
                 GetComponentNameByDirectoryUtil
                     .execute(baseFile.getContainingDirectory(), project));
@@ -56,6 +57,10 @@ public void execute(final PsiFile baseFile, final String themeName) {
                             project
                     )
             );
+            if (isOverride) {
+                pathComponents.add("override");
+                pathComponents.add("base");
+            }
         } else if (componentType.equals(ComponentType.theme.toString())) {
             pathComponents = getThemePathComponents(baseFile);
         } else {