Skip to content

CAY-2626 DbImport: Allow empty value for table types field #435

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.

Sign up for GitHub

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

Open
KravchenkoAS wants to merge 1 commit into
base: master
Choose a base branch
from
Open

CAY-2626 DbImport: Allow empty value for table types field #435

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
30 changes: 14 additions & 16 deletions ...c/main/java/org/apache/cayenne/modeler/editor/dbimport/ReverseEngineeringConfigPanel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,26 +151,24 @@ protected void updateModel(String text) {
@Override
protected void updateModel(String text) throws ValidationException {
ReverseEngineering reverseEngineering = getReverseEngineeringBySelectedMap();
if(text == null || text.isEmpty()) {
String[] tableTypesFromReverseEngineering = reverseEngineering.getTableTypes();
tableTypes.setText(String.join(",", tableTypesFromReverseEngineering));
if (text == null || text.isEmpty()) {
text = "TABLE, VIEW";
JOptionPane.showMessageDialog(
Application.getFrame(),
"Table types field can't be empty.",
"Error setting table types",
JOptionPane.ERROR_MESSAGE);
} else {
reverseEngineering.getTableTypesCollection().clear();
String[] types = text.split("\\s*,\\s*");
for(String type : types) {
if(!type.isEmpty()) {
reverseEngineering.addTableType(type.trim());
}
}
if(!dbImportView.isInitFromModel()) {
projectController.setDirty(true);
"If table types field is empty, default value will be set \"TABLE, VIEW\".",
null,
JOptionPane.WARNING_MESSAGE);
}
reverseEngineering.getTableTypesCollection().clear();
String[] types = text.split("\\s*,\\s*");
for (String type : types) {
if (!type.isEmpty()) {
reverseEngineering.addTableType(type.trim());
}
}
if (!dbImportView.isInitFromModel()) {
projectController.setDirty(true);
}
}
};

Expand Down