1139: Code refactoring

Author: bohdan-harniuk

resources/fileTemplates/internal/Magento Module Observer File.php.ft

@@ -6,12 +6,16 @@ namespace ${NAMESPACE};
 use Magento\Framework\Event\ObserverInterface;
 use Magento\Framework\Event\Observer;
 
+/**
+* Observes the `${EVENT_NAME}` event.
+*/
 class ${CLASS_NAME} implements ObserverInterface
 {
     /**
      * Observer for ${EVENT_NAME}.
      *
      * @param Observer $observer
+     *
      * @return void
      */
     public function execute(Observer $observer)

src/com/magento/idea/magento2plugin/actions/context/php/NewObserverAction.java

@@ -52,7 +52,8 @@ protected boolean isVisible(
             final PsiDirectory targetDirectory,
             final PsiFile targetFile
     ) {
-        if (!moduleData.getType().equals(ComponentType.module)) {
+        if (!moduleData.getType().equals(ComponentType.module)
+                || !moduleData.getModuleDir().equals(targetDirectory.getParentDirectory())) {
             return false;
         }
 

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

@@ -7,15 +7,15 @@
     </constraints>
     <properties>
       <opaque value="true"/>
-      <preferredSize width="720" height="280"/>
+      <preferredSize width="420" height="280"/>
       <requestFocusEnabled value="true"/>
     </properties>
     <border type="none"/>
     <children>
       <grid id="9ad5" layout-manager="GridLayoutManager" row-count="1" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
         <margin top="0" left="0" bottom="0" right="0"/>
         <constraints>
-          <grid row="2" column="0" row-span="1" col-span="1" vsize-policy="1" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
+          <grid row="2" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties/>
         <border type="none"/>
@@ -102,7 +102,9 @@
           </component>
           <component id="12752" class="com.magento.idea.magento2plugin.ui.FilteredComboBox" binding="eventName" custom-create="true">
             <constraints>
-              <grid row="7" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="2" anchor="8" fill="1" indent="0" use-parent-layout="false"/>
+              <grid row="7" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="2" anchor="8" fill="1" indent="0" use-parent-layout="false">
+                <preferred-size width="150" height="-1"/>
+              </grid>
             </constraints>
             <properties/>
           </component>
@@ -116,7 +118,9 @@
           </component>
           <component id="ec3f4" class="javax.swing.JComboBox" binding="observerArea" custom-create="true">
             <constraints>
-              <grid row="6" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="2" anchor="8" fill="1" indent="0" use-parent-layout="false"/>
+              <grid row="6" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="2" anchor="8" fill="1" indent="0" use-parent-layout="false">
+                <preferred-size width="150" height="-1"/>
+              </grid>
             </constraints>
             <properties/>
           </component>
@@ -146,9 +150,7 @@
           </component>
           <component id="662ad" class="javax.swing.JLabel" binding="classNameLabel">
             <constraints>
-              <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false">
-                <preferred-size width="113" height="16"/>
-              </grid>
+              <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
             </constraints>
             <properties>
               <text value="Class Name"/>

testData/actions/generation/generator/ModuleObserverGenerator/generateModuleObserverFile/TestClassObserver.php

@@ -5,12 +5,16 @@
 use Magento\Framework\Event\ObserverInterface;
 use Magento\Framework\Event\Observer;
 
+/**
+ * Observes the `test_event_name` event.
+ */
 class TestClassObserver implements ObserverInterface
 {
     /**
      * Observer for test_event_name.
      *
      * @param Observer $observer
+     *
      * @return void
      */
     public function execute(Observer $observer)

tests/com/magento/idea/magento2plugin/actions/generation/generator/ModuleObserverGeneratorTest.java

@@ -10,6 +10,7 @@
 import com.magento.idea.magento2plugin.magento.files.ModuleObserverFile;
 
 public final class ModuleObserverGeneratorTest extends BaseGeneratorTestCase {
+
     private static final String CLASS_NAME = "TestClassObserver";
 
     /**