Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed bugs tables editing #544

Merged
merged 4 commits into from
Apr 20, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,10 @@ public static void open(final Project project, final PsiDirectory directory) {
* Proceed with generation.
*/
private void onOK() {
if (propertyTable.isEditing()) {
propertyTable.getCellEditor().stopCellEditing();
}

if (validateFormFields()) {
formatProperties();
generateDataModelFile();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -129,9 +129,14 @@ public void windowClosing(final WindowEvent event) {
* On buttonOK action listener.
*/
private void onOK() {
if (columnsTable.isEditing()) {
columnsTable.getCellEditor().stopCellEditing();
}

if (!validateFormFields()) {
return;
}

final DbSchemaXmlData dbSchemaXmlData = new DbSchemaXmlData(
getTableName(),
getTableResource(),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -402,6 +402,18 @@ public static void open(final Project project, final PsiDirectory directory) {
}

private void onOK() {
if (formButtons.isEditing()) {
formButtons.getCellEditor().stopCellEditing();
}

if (fieldsets.isEditing()) {
fieldsets.getCellEditor().stopCellEditing();
}

if (fields.isEditing()) {
fields.getCellEditor().stopCellEditing();
}

if (!validateFormFields()) {
return;
}
Expand Down