no message

This commit is contained in:
2024-10-25 00:50:19 +03:00
parent 9482abefcc
commit f2de9054d0
52 changed files with 101 additions and 85 deletions

View File

@@ -285,11 +285,11 @@ public abstract class Database {
}
}
//---
public boolean Check(TextLog log, Class... tablesClasses) {
public boolean CheckCurrent(TextLog log, Class... tablesClasses) {
for (Class tableClass : tablesClasses) {
DBTable table = getTable(tableClass);
if (table.getUI() != null)
table.getUI().Check(log);
table.getUI().CheckCurrent(log);
}
return log.isEmpty();
}

View File

@@ -17,7 +17,7 @@ public abstract class AddObjectPass<D extends DBObject> extends ObjectPass<D> {
@Override
protected boolean canStart(Object... args) throws Exception {
target = d.newInstance();
return ((getOwnerClass() == null) || (getDb().getTable(getOwnerClass()).getUI().Check(Log))) && fillObjectFields();
return ((getOwnerClass() == null) || (getDb().getTable(getOwnerClass()).getUI().CheckCurrent(Log))) && fillObjectFields();
}
protected boolean fillObjectFields() throws Exception {
return getTable().getUI().ShowAddObjectDialog(target);

View File

@@ -15,7 +15,7 @@ public abstract class DeleteObjectPass<D extends DBObject> extends ObjectPass<D>
@Override
protected boolean canStart(Object... args) throws Exception {
target = (D) getTable().getUI().getCurrent();
return getTable().getUI().Check(Log) && getTable().getUI().ShowDeleteObjectDialog(target);
return getTable().getUI().CheckCurrent(Log) && getTable().getUI().ShowDeleteObjectDialog(target);
}
//Очищаем все связанные таблицы, чтобы не допустить перерисовки во время удаления объекта.
@Override

View File

@@ -14,7 +14,7 @@ public abstract class EditObjectPass<D extends DBObject> extends ObjectPass<D> {
@Override
protected boolean canStart(Object... args) throws Exception {
target = (D) getTable().getUI().getCurrent();
return getTable().getUI().Check(Log) && getTable().getUI().ShowEditObjectDialog(target);
return getTable().getUI().CheckCurrent(Log) && getTable().getUI().ShowEditObjectDialog(target);
}
@Override
protected void body() throws Exception {

View File

@@ -450,8 +450,7 @@ public class DataSetControlForm<D extends DBObject> extends ControlForm<DataTabl
public Vector<Object> getSelectedKeys() {
return dataSource.Data.values().stream().filter(DBObject::isSelected).map(d -> d.getPK()).collect(Collectors.toCollection(Vector::new));
}
//переименовать в CheckCurrent
public boolean Check(TextLog log) {
public boolean CheckCurrent(TextLog log) {
if (current == null) {
log.Writeln_(dataSource.getSingleDescription() + " не выбран(а)");
return false;