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

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

Browse Source
This commit is contained in:
02090095
2024-10-17 17:22:33 +03:00
parent 17c2644766
commit e34778d6be
65 changed files with 145 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Common/Passes/AddObjectPass.java
View File

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

4
src/Common/Passes/DeleteObjectPass.java
View File

@@ -23,7 +23,7 @@ public abstract class DeleteObjectPass<D extends DBObject> extends ObjectPass<D>
case DROP:
break;
case DELETE:
getDb().tables.get(dep).ClearUI();
getDb().getTable(dep).ClearUI();
break;
}
}
@@ -49,7 +49,7 @@ public abstract class DeleteObjectPass<D extends DBObject> extends ObjectPass<D>
protected void performFinish() throws Exception {
getTable().ShowUI();
for (Class dep : getTable().getFKDependencies().keySet()) {
getDb().tables.get(dep).RefreshUI();
getDb().getTable(dep).RefreshUI();
}
}
}

10
src/Common/Passes/DeleteObjectsPass.java
View File

@@ -1,6 +1,6 @@
package Common.Passes;
import Common.Database.Objects.DBObject;
public abstract class DeleteObjectsPass<D extends DBObject> extends ObjectsPass<D>{
public abstract class DeleteObjectsPass<D extends DBObject> extends ObjectsPass<D> {
public DeleteObjectsPass(Class<D> d_in) {
super(d_in);
}
@@ -12,7 +12,7 @@ public abstract class DeleteObjectsPass<D extends DBObject> extends ObjectsPass<
protected boolean canStart(Object... args) throws Exception {
if (!getTable().CheckSelectedOrCurrent(Log))
return false;
target = getTable().getSelectedOrCurrent();
target = getTable().getSelectedOrCurrent();
return getTable().ShowDeleteObjectsDialog(target.size());
}
//Очищаем все связанные таблицы, чтобы не допустить перерисовки во время удаления объекта.
@@ -25,14 +25,14 @@ public abstract class DeleteObjectsPass<D extends DBObject> extends ObjectsPass<
case DROP:
break;
case DELETE:
getDb().tables.get(dep).ClearUI();
getDb().getTable(dep).ClearUI();
break;
}
}
}
@Override
protected void body() throws Exception {
for (D d: target){
for (D d : target) {
getDb().Delete(d);
for (Class dep : getTable().getFKDependencies().keySet()) {
switch (getTable().getFKDependencies().get(dep).data) {
@@ -53,7 +53,7 @@ public abstract class DeleteObjectsPass<D extends DBObject> extends ObjectsPass<
protected void performFinish() throws Exception {
getTable().ShowUI();
for (Class dep : getTable().getFKDependencies().keySet()) {
getDb().tables.get(dep).RefreshUI();
getDb().getTable(dep).RefreshUI();
}
}
}

2
src/Common/Passes/EditObjectPass.java
View File

@@ -21,6 +21,6 @@ public abstract class EditObjectPass<D extends DBObject> extends ObjectPass<D> {
protected void showFinish() throws Exception {
getTable().ShowUI(target.getPK());
for (Class dep : getTable().getFKDependencies().keySet())
getDb().tables.get(dep).RefreshUI();
getDb().getTable(dep).RefreshUI();
}
}

2
src/Common/Passes/ObjectPass.java
View File

@@ -13,7 +13,7 @@ public abstract class ObjectPass<D extends DBObject> extends Pass<D> {
}
; //источник данных
public DBTable getTable() {
return getDb().tables.get(d);
return getDb().getTable(d);
} //таблица в источнике данных
@Override//sorted
public String getButtonText() {

2
src/Common/Passes/ObjectsPass.java
View File

@@ -15,7 +15,7 @@ public abstract class ObjectsPass<D extends DBObject> extends Pass<Vector<D>> {
return MainModule_.instance.getDb();
}
public DBTable getTable() {
return getDb().tables.get(d);
return getDb().getTable(d);
} //таблица в источнике данных
@Override//sorted
public String getButtonText() {