Fixed override interface by preference bug

Author: drpayyne

resources/fileTemplates/internal/Magento Preference Class.php.ft

@@ -9,6 +9,6 @@ namespace ${NAMESPACE};
 use ${USE};
 #end
 
-class ${NAME} #if (${EXTENDS})extends ${EXTENDS}#end {
+#if (${INTERFACE})interface#else class#end ${NAME} #if (${EXTENDS})extends ${EXTENDS}#end {
 
 }

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

@@ -22,6 +22,7 @@
 public class OverrideClassByAPreferenceAction extends DumbAwareAction {
     public static final String ACTION_NAME = "Override this class by a new Preference";
     public static final String ACTION_DESCRIPTION = "Create a new Magento 2 Preference";
+    public static final String INTERFACE_ACTION = "Override this interface by a new Preference";
     private final GetFirstClassOfFile getFirstClassOfFile;
     private PhpClass targetClass;
 
@@ -44,6 +45,9 @@ public void update(final AnActionEvent event) {
             targetClass = phpClass;
             if (psiFile instanceof PhpFile && phpClass != null) {
                 this.setStatus(event, true);
+                if (phpClass.isInterface()) {
+                    event.getPresentation().setText(INTERFACE_ACTION);
+                }
             } else  {
                 this.setStatus(event, false);
             }

src/com/magento/idea/magento2plugin/actions/generation/data/PreferenceFileData.java

@@ -14,6 +14,7 @@ public class PreferenceFileData {
     private String preferenceFqn;
     private String namespace;
     private boolean inheritClass;
+    private boolean isInterface;
 
     public PreferenceFileData(
             String preferenceDirectory,
@@ -22,7 +23,8 @@ public PreferenceFileData(
             PhpClass targetClass,
             String preferenceFqn,
             String namespace,
-            boolean inheritClass
+            boolean inheritClass,
+            boolean isInterface
     ) {
         this.preferenceDirectory = preferenceDirectory;
         this.preferenceClassName = preferenceClassName;
@@ -31,6 +33,7 @@ public PreferenceFileData(
         this.preferenceFqn = preferenceFqn;
         this.namespace = namespace;
         this.inheritClass = inheritClass;
+        this.isInterface = isInterface;
     }
 
     public String getPreferenceClassName() {
@@ -60,4 +63,8 @@ public String getNamespace() {
     public boolean isInheritClass() {
         return inheritClass;
     }
+
+    public boolean isInterface() {
+        return isInterface;
+    }
 }

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

@@ -48,6 +48,7 @@ public class OverrideClassByAPreferenceDialog extends AbstractDialog { //NOPMD
     @NotNull
     private final Project project;
     private final PhpClass targetClass;
+    private boolean isInterface;
     private JPanel contentPane;
     private JButton buttonOK;
     private JButton buttonCancel;
@@ -98,6 +99,7 @@ public OverrideClassByAPreferenceDialog(
         this.targetClass = targetClass;
         this.validatorBundle = new ValidatorBundle();
         this.commonBundle = new CommonBundle();
+        this.isInterface = false;
 
         setContentPane(contentPane);
         setModal(true);
@@ -108,6 +110,9 @@ public OverrideClassByAPreferenceDialog(
             inheritClass.setVisible(false);
             inheritClassLabel.setVisible(false);
         }
+        if (targetClass.isInterface()) {
+            this.isInterface = true;
+        }
         suggestPreferenceClassName(targetClass);
         suggestPreferenceDirectory(targetClass);
 
@@ -188,7 +193,8 @@ protected void onOK() {
                 targetClass,
                 getPreferenceClassFqn(),
                 getNamespace(),
-                isInheritClass()
+                isInheritClass(),
+                isInterface
         ), project).generate(OverrideClassByAPreferenceAction.ACTION_NAME, true);
 
         this.setVisible(false);

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

@@ -79,6 +79,9 @@ protected void fillAttributes(Properties attributes) {
         String preferenceClassName = preferenceFileData.getPreferenceClassName();
         attributes.setProperty("NAME", preferenceClassName);
         attributes.setProperty("NAMESPACE", preferenceFileData.getNamespace());
+        if (preferenceFileData.isInterface()) {
+            attributes.setProperty("INTERFACE", "interface");
+        }
         if (!preferenceFileData.isInheritClass()) {
             return;
         }