600: Code refactoring

Author: bohdan-harniuk

src/com/magento/idea/magento2plugin/completion/provider/xml/FieldNameCompletionProvider.java

@@ -40,8 +40,6 @@ protected void addCompletions(
         if (position == null || !Settings.isEnabled(position.getProject())) {
             return;
         }
-        final String prefix = result.getPrefixMatcher().getPrefix().trim();
-
         final XmlTag startingTag = PsiTreeUtil.getParentOfType(
                 position,
                 XmlTag.class
@@ -59,6 +57,7 @@ protected void addCompletions(
         if (currentPath == null) {
             return;
         }
+        final String prefix = result.getPrefixMatcher().getPrefix().trim();
         final String capture = currentPath + "." + prefix;
 
         for (final LookupElement element : makeCompletion(capture, position.getProject())) {
@@ -97,7 +96,7 @@ public static List<LookupElement> makeCompletion(
                             }
                             final String[] pathParts = input.split("\\.");
 
-                            if (pathParts.length != 3) {
+                            if (pathParts.length != 3) { //NOPMD
                                 return;
                             }
                             final String fieldId = pathParts[2];

src/com/magento/idea/magento2plugin/completion/provider/xml/GroupNameCompletionProvider.java

@@ -40,7 +40,6 @@ protected void addCompletions(
         if (position == null || !Settings.isEnabled(position.getProject())) {
             return;
         }
-        final String prefix = result.getPrefixMatcher().getPrefix().trim();
         final XmlTag startingTag = PsiTreeUtil.getParentOfType(
                 position,
                 XmlTag.class
@@ -57,6 +56,7 @@ protected void addCompletions(
         if (currentPath == null) {
             return;
         }
+        final String prefix = result.getPrefixMatcher().getPrefix().trim();
         final String capture = currentPath + "." + prefix;
 
         for (final LookupElement element : makeCompletion(capture, position.getProject())) {
@@ -97,7 +97,7 @@ public static List<LookupElement> makeCompletion(
                             }
                             final String[] groupNameParts = input.split("\\.");
 
-                            if (groupNameParts.length != 2) {
+                            if (groupNameParts.length != 2) { //NOPMD
                                 return;
                             }
                             final String groupId = groupNameParts[1];

src/com/magento/idea/magento2plugin/completion/xml/SystemConfigurationContributor.java

@@ -27,7 +27,9 @@ public class SystemConfigurationContributor extends CompletionContributor {
     /**
      * Contributes completions to the system.xml and config.xml files.
      */
+    @SuppressWarnings("PMD.ExcessiveMethodLength")
     public SystemConfigurationContributor() {
+        super();
         final XmlFilePattern.Capture systemXmlFileCapture = XmlPatterns
                 .xmlFile()
                 .withName(StandardPatterns.string().endsWith(ModuleSystemXmlFile.FILE_NAME));