From e90a15b84ac1837a409d3db7c6bf943acb99b999 Mon Sep 17 00:00:00 2001
From: serge-rider <serge@jkiss.org>
Date: Fri, 16 Mar 2018 09:59:18 +0300
Subject: [PATCH] Data type descriptor fix

---
 .../datatype/DataTypeAbstractDescriptor.java         |  4 ++--
 .../ext/mockdata/model/MockGeneratorDescriptor.java  | 12 +++++++++++-
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/registry/datatype/DataTypeAbstractDescriptor.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/registry/datatype/DataTypeAbstractDescriptor.java
index 8771d73769..a14e7db1bd 100644
--- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/registry/datatype/DataTypeAbstractDescriptor.java
+++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/registry/datatype/DataTypeAbstractDescriptor.java
@@ -39,7 +39,7 @@ public abstract class DataTypeAbstractDescriptor<DESCRIPTOR> extends AbstractDes
     public static final String ALL_TYPES_PATTERN = "*";
 
     private final Class<DESCRIPTOR> instanceType;
-    protected String id;
+    private final String id;
     private ObjectType implType;
     private Set<Object> supportedTypes = new HashSet<>();
     private List<String> supportedDataSources = new ArrayList<>();
@@ -136,7 +136,7 @@ public abstract class DataTypeAbstractDescriptor<DESCRIPTOR> extends AbstractDes
             return implType.createInstance(instanceType);
         }
         catch (Exception e) {
-            throw new IllegalStateException("Can't instantiate data type provider '" + this.id + "'", e); //$NON-NLS-1$
+            throw new IllegalStateException("Can't instantiate data type provider '" + this.getId() + "'", e); //$NON-NLS-1$
         }
     }
 
diff --git a/plugins/org.jkiss.dbeaver.ext.mockdata/src/org/jkiss/dbeaver/ext/mockdata/model/MockGeneratorDescriptor.java b/plugins/org.jkiss.dbeaver.ext.mockdata/src/org/jkiss/dbeaver/ext/mockdata/model/MockGeneratorDescriptor.java
index d973957716..90e92ced79 100644
--- a/plugins/org.jkiss.dbeaver.ext.mockdata/src/org/jkiss/dbeaver/ext/mockdata/model/MockGeneratorDescriptor.java
+++ b/plugins/org.jkiss.dbeaver.ext.mockdata/src/org/jkiss/dbeaver/ext/mockdata/model/MockGeneratorDescriptor.java
@@ -38,6 +38,7 @@ public class MockGeneratorDescriptor extends DataTypeAbstractDescriptor<MockValu
 
     public static final String TAG_PRESET = "preset"; //NON-NLS-1
 
+    private Preset preset;
     private String label;
     private String description;
     private final String link;
@@ -73,7 +74,7 @@ public class MockGeneratorDescriptor extends DataTypeAbstractDescriptor<MockValu
     public MockGeneratorDescriptor(IConfigurationElement config, Preset preset) {
         this(config);
 
-        this.id += "_" + preset.id;
+        this.preset = preset;
         this.label = "   " + preset.label;
         if (!CommonUtils.isEmpty(preset.description)) {
             this.description = preset.description;
@@ -93,6 +94,15 @@ public class MockGeneratorDescriptor extends DataTypeAbstractDescriptor<MockValu
 
     }
 
+    @Override
+    public String getId() {
+        if (preset != null) {
+            return super.getId() + "_" + preset.id;
+        } else {
+            return super.getId();
+        }
+    }
+
     public String getLabel() {
         return label;
     }
-- 
GitLab