提交 8425de4f 编写于 作者: J jurgen

Bad date/time value handle fix

Former-commit-id: c77a116d
上级 77d8b141
......@@ -27,6 +27,7 @@ import org.eclipse.swt.events.TraverseEvent;
import org.eclipse.swt.events.TraverseListener;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Shell;
import org.jkiss.dbeaver.DBException;
import org.jkiss.dbeaver.model.data.DBDValueController;
import org.jkiss.dbeaver.model.data.DBDValueEditor;
......@@ -155,7 +156,8 @@ public abstract class BaseValueEditor<T extends Control> implements DBDValueEdit
valueController.closeInlineEditor();
valueController.updateValue(newValue);
} catch (DBException e) {
UIUtils.showErrorDialog(getControl().getShell(), "Value save", "Can't save edited value", e);
valueController.closeInlineEditor();
UIUtils.showErrorDialog(null, "Value save", "Can't save edited value", e);
}
}
}
......@@ -68,8 +68,7 @@ public class DateTimeInlineEditor extends BaseValueEditor<Control> {
}
@Override
public Date extractEditorValue()
{
public Date extractEditorValue() throws DBException {
return timeEditor.getValue();
}
......
......@@ -26,6 +26,7 @@ import org.eclipse.swt.widgets.Button;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
import org.jkiss.code.Nullable;
import org.jkiss.dbeaver.DBException;
import org.jkiss.dbeaver.model.data.DBDDataFormatter;
import org.jkiss.dbeaver.model.data.DBDValueController;
import org.jkiss.dbeaver.ui.UIUtils;
......@@ -96,8 +97,7 @@ public class DateTimeStandaloneEditor extends ValueViewDialog {
}
@Override
public Object extractEditorValue()
{
public Object extractEditorValue() throws DBException {
return timeEditor.getValue();
}
......
......@@ -22,6 +22,7 @@ import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Text;
import org.jkiss.code.Nullable;
import org.jkiss.dbeaver.DBException;
import org.jkiss.dbeaver.model.data.DBDDataFormatter;
import org.jkiss.dbeaver.ui.UIUtils;
......@@ -49,18 +50,13 @@ public class CustomTimeEditor {
}
public Date getValue()
throws DBException
{
final String timeText = timeEditor.getText();
try {
return (Date)formatter.parseValue(timeText, Date.class);
} catch (final Exception e) {
timeEditor.getDisplay().asyncExec(new Runnable() {
@Override
public void run() {
UIUtils.showErrorDialog(null, "Bad time", "Bad time value: [" + timeText + "]", e);
}
});
return new Date();
throw new DBException("Error parsing date value [" + timeText + "]", e);
}
}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册