#1599 Mock Data. Generators are sorted alphabetically. NULL generator is the last.

plugins/org.jkiss.dbeaver.ext.mockdata/plugin.xml

@@ -117,17 +117,6 @@
 -->
         </generator>
 
-        <generator
-            id="nullGenerator"
-            label="NULL"
-            description="NULL values"
-            class="org.jkiss.dbeaver.ext.mockdata.generator.NullGenerator">
-            <type kind="BOOLEAN"/>
-            <type kind="DATETIME"/>
-            <type kind="NUMERIC"/>
-            <type kind="STRING"/>
-        </generator>
-
         <generator
                 id="numericRandomGenerator"
                 label="Random"
@@ -185,6 +174,17 @@
             </propertyGroup>
         </generator>
 
+        <generator
+                id="zeroGenerator"
+                label="NULL"
+                description="NULL values"
+                class="org.jkiss.dbeaver.ext.mockdata.generator.NullGenerator">
+            <type kind="BOOLEAN"/>
+            <type kind="DATETIME"/>
+            <type kind="NUMERIC"/>
+            <type kind="STRING"/>
+        </generator>
+
     </extension>
 
 </plugin>

plugins/org.jkiss.dbeaver.ext.mockdata/src/org/jkiss/dbeaver/ext/mockdata/MockDataSettings.java

@@ -229,7 +229,7 @@ public class MockDataSettings {
         private final DBSAttributeBase attribute;
         private String selectedGeneratorId = null;
         private String presetId = null;
-        private Map<String, PropertySourceCustom> generators = new HashMap<>(); // generatorId -> PropertySourceCustom
+        private Map<String, PropertySourceCustom> generators = new TreeMap<>(); // generatorId -> PropertySourceCustom
 
         public AttributeGeneratorProperties(DBSAttributeBase attribute) {
             this.attribute = attribute;