dbeaver#5758 Data type edit reflect fix

shaoxh · Feb 11, 2020 · d246ab6 · d246ab6
1 parent 0716b41
commit d246ab6
Showing 1 changed file with 16 additions and 6 deletions.
diff --git a/...ui.navigator/src/org/jkiss/dbeaver/ui/editors/entity/properties/TabbedFolderPageForm.java b/...ui.navigator/src/org/jkiss/dbeaver/ui/editors/entity/properties/TabbedFolderPageForm.java
@@ -458,12 +458,22 @@ private void createPropertyEditor(Composite group, DBPPropertyDescriptor prop) {
             Control finalEditControl = editControl;
 
             if (finalEditControl instanceof Combo) {
-                ((Combo) finalEditControl).addSelectionListener(new SelectionAdapter() {
-                    @Override
-                    public void widgetSelected(SelectionEvent e) {
-                        updatePropertyValue(prop, ((Combo) finalEditControl).getText());
-                    }
-                });
+                if ((finalEditControl.getStyle() & SWT.READ_ONLY) == SWT.READ_ONLY) {
+                    ((Combo) finalEditControl).addSelectionListener(new SelectionAdapter() {
+                        @Override
+                        public void widgetSelected(SelectionEvent e) {
+                            updatePropertyValue(prop, ((Combo) finalEditControl).getText());
+                        }
+                    });
+                } else {
+                    ((Combo) finalEditControl).addModifyListener(e -> {
+                        try {
+                            updatePropertyValue(prop, ((Combo) finalEditControl).getText());
+                        } catch (Exception ex) {
+                            log.debug("Error setting value from combo: " + ex.getMessage());
+                        }
+                    });
+                }
             } else if (finalEditControl instanceof Text) {
                 ((Text) finalEditControl).addModifyListener(e -> updatePropertyValue(prop, ((Text) finalEditControl).getText()));
             } else if (finalEditControl instanceof Button) {