M/VisualSapfor
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

чистка лишних импортов.и фикс бага с сохранением тестов

Browse Source
This commit is contained in:
02090095
2025-03-23 14:28:20 +03:00
parent 811acba5a7
commit b763c2c266
69 changed files with 134 additions and 246 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/Common/Database/Database.java
View File

@@ -11,7 +11,6 @@ import org.apache.commons.io.FileUtils;
import java.io.File;
import java.util.LinkedHashMap;
import java.util.Locale;
import java.util.Vector;
//самый общий интерфейс базы данных, независимо от реализации.
public abstract class Database {
@@ -227,7 +226,7 @@ public abstract class Database {
}
public <O extends iDBObject, F extends iDBObject> Vector<Integer> getFKi(
Integer owner_pk, Class<O> owner_class, Class<F> fk_class) {
String fk_name = owner_class.getSimpleName().toLowerCase()+"_id";
String fk_name = owner_class.getSimpleName().toLowerCase() + "_id";
Vector<Integer> res = new Vector<>();
try {
for (Object o : tables.get(fk_class).Data.values()) {
@@ -333,7 +332,7 @@ public abstract class Database {
prepareTablesStatements();
Synchronize();
}
public void DeleteDependencies(DBObject object) throws Exception{
public void DeleteDependencies(DBObject object) throws Exception {
DBTable object_table = getTable(object.getClass());
for (Class dep : object_table.getFKDependencies().keySet()) {
switch (object_table.getFKDependencies().get(dep).data) {

13
src/Common/Database/Tables/DBTable.java
View File

@@ -1,7 +1,6 @@
package Common.Database.Tables;
import Common.Database.Database;
import Common.Database.Objects.DBObject;
import _VisualDVM.TestingSystem.DVM.DVMConfigurationGroup.DVMConfigurationGroup;
import java.lang.reflect.Field;
import java.util.Vector;
@@ -36,9 +35,9 @@ public abstract class DBTable<K, D extends DBObject> extends DataSet<K, D> {
res.append(c).append("\n");
return res.toString();
}
boolean vectorContains(D object, Vector<D> vector){
for (D v_object: vector){
if (isEqual(object,v_object))
boolean vectorContains(D object, Vector<D> vector) {
for (D v_object : vector) {
if (isEqual(object, v_object))
return true;
}
return false;
@@ -48,7 +47,7 @@ public abstract class DBTable<K, D extends DBObject> extends DataSet<K, D> {
//те, что в нем появились вставить, те что отсутствуют но есть в old удалить
Vector<D> to_delete = new Vector<>();
Vector<D> to_insert = new Vector<>();
for (D object: old){
for (D object : old) {
if (!vectorContains(object, actual))
to_delete.add(object);
}
@@ -57,9 +56,9 @@ public abstract class DBTable<K, D extends DBObject> extends DataSet<K, D> {
to_insert.add(object);
}
db.BeginTransaction();
for (D object: to_delete)
for (D object : to_delete)
db.Delete(object);
for (D object: to_insert)
for (D object : to_insert)
db.Insert(object);
db.Commit();
}

2
src/Common/Database/Tables/DataSet.java
View File

@@ -88,7 +88,7 @@ public class DataSet<K, D extends DBObject> extends DataSetAnchestor {
return Data.containsKey(key);
}
//--
public boolean isEqual(D o1, D o2){
public boolean isEqual(D o1, D o2) {
return false;
}
}