Refactoring

Author: Vitaliy Boyko

src/com/magento/idea/magento2plugin/inspections/xml/CacheableFalseInDefaultLayoutInspection.java

@@ -24,14 +24,14 @@ public PsiElementVisitor buildVisitor(final @NotNull ProblemsHolder holder, fina
             @Override
             public void visitXmlAttribute(XmlAttribute attribute) {
                 String fileName = holder.getFile().getName();
-                if (!fileName.equals(LayoutXml.DefaultFileName)) return;
+                if (!fileName.equals(LayoutXml.DEFAULT_FILENAME)) return;
                 final String text = attribute.getValue();
                 final String attributeName = attribute.getName();
-                if (!attributeName.equals(LayoutXml.CacheableAttributeName)) return;
-                if (!attribute.getParent().getName().equals(LayoutXml.BlockAttributeTagName)
-                && !attribute.getParent().getName().equals(LayoutXml.ReferenceBlockAttributeTagName)) return;
+                if (!attributeName.equals(LayoutXml.CACHEABLE_ATTRIBUTE_NAME)) return;
+                if (!attribute.getParent().getName().equals(LayoutXml.BLOCK_ATTRIBUTE_TAG_NAME)
+                && !attribute.getParent().getName().equals(LayoutXml.REFERENCE_BLOCK_ATTRIBUTE_TAG_NAME)) return;
                 if (text == null) return;
-                if (text.equals(LayoutXml.CacheableAttributeFalseValue)) {
+                if (text.equals(LayoutXml.CACHEABLE_ATTRIBUTE_VALUE_FALSE)) {
                     holder.registerProblem(attribute, CacheDisableProblemDescription,
                             ProblemHighlightType.WARNING,
                             new XmlRemoveCacheableAttributeQuickFix());

src/com/magento/idea/magento2plugin/magento/files/LayoutXml.java

@@ -5,10 +5,10 @@
 package com.magento.idea.magento2plugin.magento.files;
 
 public class LayoutXml {
-    public static String DefaultFileName = "default.xml";
-    public static String CacheableAttributeName = "cacheable";
-    public static String CacheableAttributeFalseValue = "false";
-    public static String BlockAttributeTagName = "block";
-    public static String ReferenceBlockAttributeTagName = "referenceBlock";
+    public static String DEFAULT_FILENAME = "default.xml";
+    public static String CACHEABLE_ATTRIBUTE_NAME = "cacheable";
+    public static String CACHEABLE_ATTRIBUTE_VALUE_FALSE = "false";
+    public static String BLOCK_ATTRIBUTE_TAG_NAME = "block";
+    public static String REFERENCE_BLOCK_ATTRIBUTE_TAG_NAME = "referenceBlock";
     public static String XML_ATTRIBUTE_TEMPLATE = "template";
 }

src/com/magento/idea/magento2plugin/magento/packages/Package.java

@@ -4,8 +4,6 @@
  */
 package com.magento.idea.magento2plugin.magento.packages;
 
-import java.util.ArrayList;
-
 public class Package {
     public static String PACKAGES_ROOT = "app/code";
     public static String VENDOR = "vendor";

src/com/magento/idea/magento2plugin/project/SettingsForm.java

@@ -79,7 +79,10 @@ public void mouseClicked(MouseEvent e) {
             new RegenerateUrnMapListener(project)
         );
 
-        magentoVersion.setText("Magento version: ".concat(magentoVersionModel.get()));
+        String version = magentoVersionModel.get();
+        if (version != null) {
+            magentoVersion.setText("Magento version: " . concat(version));
+        }
 
         return (JComponent) panel1;
     }

tests/com/magento/idea/magento2plugin/inspections/xml/CacheableFalseInDefaultLayoutInspectionTest.java

@@ -29,12 +29,12 @@ protected boolean isWriteActionRequired() {
     }
 
     public void testWithCacheableFalseBlock() throws Exception {
-        myFixture.configureByFile(getTestName(true) + "/" + LayoutXml.DefaultFileName);
+        myFixture.configureByFile(getTestName(true) + "/" + LayoutXml.DEFAULT_FILENAME);
         myFixture.testHighlighting(true, false, false);
     }
 
     public void testWithoutCacheableFalseBlock() throws Exception {
-        myFixture.configureByFile(getTestName(true) + "/" + LayoutXml.DefaultFileName);
+        myFixture.configureByFile(getTestName(true) + "/" + LayoutXml.DEFAULT_FILENAME);
         myFixture.testHighlighting(true, true, true);
     }