Fixed plugin generation sort order requirement

Author: drpayyne

resources/fileTemplates/code/Magento Module DI Xml Plugin.xml.ft

@@ -2,7 +2,12 @@
 <type name="${TYPE}">
 #end
 <plugin name="${NAME}"
-            type="${PLUGIN_TYPE}" sortOrder="${SORT_ORDER}" />
+#if (${SORT_ORDER})
+        type="${PLUGIN_TYPE}"
+        sortOrder="${SORT_ORDER}" />
+#else
+        type="${PLUGIN_TYPE}" />
+#end
 #if (${TYPE})
 </type>
 #end

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

@@ -131,7 +131,6 @@
               </grid>
             </constraints>
             <properties>
-              <text value="10"/>
               <toolTipText value="Plugin sort order in di.xml"/>
             </properties>
             <clientProperties>

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

@@ -82,8 +82,6 @@ public class CreateAPluginDialog extends AbstractDialog {
             message = {DirectoryRule.MESSAGE, DIRECTORY})
     private JTextField pluginDirectory;
 
-    @FieldValidation(rule = RuleRegistry.NOT_EMPTY,
-            message = {NotEmptyRule.MESSAGE, SORT_ORDER})
     @FieldValidation(rule = RuleRegistry.NUMERIC,
             message = {NumericRule.MESSAGE, SORT_ORDER})
     private JTextField pluginSortOrder;

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

@@ -161,6 +161,9 @@ protected void fillAttributes(final Properties attributes) {
         attributes.setProperty("NAME", pluginFileData.getPluginName());
         attributes.setProperty("PLUGIN_TYPE", pluginFileData.getPluginFqn());
         attributes.setProperty("PLUGIN_NAME", pluginFileData.getPluginName());
-        attributes.setProperty("SORT_ORDER", pluginFileData.getSortOrder());
+        final String sortOrder = pluginFileData.getSortOrder();
+        if (!sortOrder.isEmpty()) {
+            attributes.setProperty("SORT_ORDER", sortOrder);
+        }
     }
 }