#6883 Dialog settings map fix. Processor settings save/load fix

Former-commit-id: ed2c0ac1

plugins/org.jkiss.dbeaver.data.transfer.ui/src/org/jkiss/dbeaver/tools/transfer/ui/wizard/DataTransferWizard.java

@@ -450,7 +450,6 @@ public class DataTransferWizard extends TaskConfigurationWizard implements IExpo
         // Save processors' properties
         Map<String, Object> processorsSection = new LinkedHashMap<>();
 
-        config.put("processors", processorsSection);
         for (DataTransferProcessorDescriptor procDescriptor : settings.getProcessorPropsHistory().keySet()) {
 
             Map<String, Object> procSettings = new LinkedHashMap<>();
@@ -468,6 +467,8 @@ public class DataTransferWizard extends TaskConfigurationWizard implements IExpo
             }
             processorsSection.put(procDescriptor.getFullId(), procSettings);
         }
+        config.put("processors", processorsSection);
+
         return config;
     }
 

plugins/org.jkiss.dbeaver.ui/src/org/jkiss/dbeaver/ui/DialogSettingsMap.java

@@ -40,7 +40,14 @@ public class DialogSettingsMap extends AbstractMap<String, Object> {
     @NotNull
     @Override
     public Set<Entry<String, Object>> entrySet() {
-        return new LinkedHashSet<>();
+        Set<Entry<String, Object>> sectionSet = new LinkedHashSet<>();
+        IDialogSettings[] sections = settings.getSections();
+        if (sections != null) {
+            for (IDialogSettings section : sections) {
+                sectionSet.add(new SimpleEntry<>(section.getName(), new DialogSettingsMap(section)));
+            }
+        }
+        return sectionSet;
     }
 
     @Override
@@ -90,4 +97,13 @@ public class DialogSettingsMap extends AbstractMap<String, Object> {
         return settingsMap;
     }
 
+    @Override
+    public int hashCode() {
+        return settings.hashCode();
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        return o instanceof DialogSettingsMap && settings.equals(((DialogSettingsMap) o).settings);
+    }
 }
\ No newline at end of file