рефакторинг. инкапсуляция таблиц бд

This commit is contained in:
2024-10-17 17:22:33 +03:00
parent 17c2644766
commit e34778d6be
65 changed files with 145 additions and 103 deletions

View File

@@ -13,11 +13,14 @@ import java.util.Vector;
//самый общий интерфейс базы данных, независимо от реализации.
public abstract class Database {
//------------------------------
public LinkedHashMap<Class<? extends DBObject>, DBTable> tables = new LinkedHashMap<>(); //таблицы
protected LinkedHashMap<Class<? extends DBObject>, DBTable> tables = new LinkedHashMap<>(); //таблицы
protected File file = null;
public Database(File file_in) {
file = file_in;
}
public <T extends DBObject> DBTable<?, T> getTable(Class<T> tableClass) {
return tables.get(tableClass);
}
public File getFile() {
return file;
}

View File

@@ -42,7 +42,9 @@ public class DataSet<K, D extends DBObject> extends DataSetAnchestor {
}
protected void createFilters() {
}
public boolean hasMenuBar(){return true;}
public boolean hasMenuBar() {
return true;
}
public DataMenuBar createMenuBar() {
return new DataMenuBar(getPluralDescription());
}
@@ -268,7 +270,7 @@ public class DataSet<K, D extends DBObject> extends DataSetAnchestor {
return MainModule_.instance.Check(log, CurrentName());
}
public boolean CheckSelectedOrCurrent(TextLog log) {
if ((getSelectedCount() == 0) && (CurrentName()==null || (getCurrent()==null))) {
if ((getSelectedCount() == 0) && (CurrentName() == null || (getCurrent() == null))) {
log.Writeln_(getPluralDescription() + ":");
log.Writeln_("Отсутствуют отмеченные объекты, или текущий объект!");
return false;
@@ -298,7 +300,7 @@ public class DataSet<K, D extends DBObject> extends DataSetAnchestor {
}
return res;
}
public Vector<K> getSelectedOrCurrentKeys(){
public Vector<K> getSelectedOrCurrentKeys() {
Vector<K> res = new Vector<>();
if (getSelectedCount() > 0)
res = getSelectedKeys();
@@ -328,5 +330,7 @@ public class DataSet<K, D extends DBObject> extends DataSetAnchestor {
}
}
//-------------------------------------------------------------------------------------
public PassCode_ getDeletePassCode(){return null;}
public PassCode_ getDeletePassCode() {
return null;
}
}