From 75471d94d0d5024de710d57d78a0b747a0b9ebde Mon Sep 17 00:00:00 2001 From: andreykravchenko Date: Wed, 23 Sep 2020 12:40:44 +0300 Subject: [PATCH] CAY-2626 DbImport: Allow empty value for table types field --- .../ReverseEngineeringConfigPanel.java | 30 +++++++++---------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/dbimport/ReverseEngineeringConfigPanel.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/dbimport/ReverseEngineeringConfigPanel.java index c9ce342159..b5266c5105 100644 --- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/dbimport/ReverseEngineeringConfigPanel.java +++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/dbimport/ReverseEngineeringConfigPanel.java @@ -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); + } } };