исправил старый баг. при синхронизации бд не восстанавливались поставленные галки а текущий объект был реализован странно
This commit is contained in:
@@ -272,12 +272,16 @@ public abstract class Database {
|
||||
protected abstract void resetAI(DBTable table) throws Exception;
|
||||
//-
|
||||
public void SaveLastSelections() {
|
||||
for (DataSet dataSet : tables.values())
|
||||
dataSet.SaveLastSelections();
|
||||
for (DataSet dataSet : tables.values()) {
|
||||
if (dataSet.getUI() != null)
|
||||
dataSet.getUI().SaveLastCurrent();
|
||||
}
|
||||
}
|
||||
public void RestoreLastSelections() {
|
||||
for (DataSet dataSet : tables.values())
|
||||
dataSet.RestoreLastSelections();
|
||||
for (DataSet dataSet : tables.values()) {
|
||||
if (dataSet.getUI() != null)
|
||||
dataSet.getUI().RestoreLastCurrent();
|
||||
}
|
||||
}
|
||||
//---
|
||||
public abstract PassCode_ getSynchronizePassCode(); //если бд есть на сервере.
|
||||
|
||||
@@ -15,9 +15,6 @@ import java.util.LinkedHashMap;
|
||||
import java.util.Vector;
|
||||
import java.util.stream.Collectors;
|
||||
public class DataSet<K, D extends DBObject> extends DataSetAnchestor {
|
||||
//-
|
||||
public LinkedHashMap<Class, Object> selections = new LinkedHashMap<>();
|
||||
//---
|
||||
public String Name;
|
||||
public Class<K> k; //класс первичного ключа.
|
||||
public Class<D> d; //класс объектов.
|
||||
@@ -52,7 +49,7 @@ public class DataSet<K, D extends DBObject> extends DataSetAnchestor {
|
||||
public void SetCurrentObjectByUI(Object pk) {
|
||||
if (ui != null) {
|
||||
ui.ClearSelection(); //сброс текущего объекта и всего что с ним связано.
|
||||
ui.Select(pk);
|
||||
ui.SetCurrentByPK(pk);
|
||||
}
|
||||
}
|
||||
protected DataSetControlForm createUI(JPanel mountPanel) {
|
||||
@@ -218,24 +215,6 @@ public class DataSet<K, D extends DBObject> extends DataSetAnchestor {
|
||||
}
|
||||
return res;
|
||||
}
|
||||
public void SaveLastSelections() {
|
||||
if (ui!=null) {
|
||||
Object lastPk = null;
|
||||
if ((CurrentName() != null) && (getCurrent() != null))
|
||||
lastPk = getCurrent().getPK();
|
||||
if (!selections.containsKey(getClass()))
|
||||
selections.put(getClass(), lastPk);
|
||||
else selections.replace(getClass(), lastPk);
|
||||
}
|
||||
}
|
||||
public void RestoreLastSelections() {
|
||||
if (ui!=null) {
|
||||
Object lastPk = selections.get(getClass());
|
||||
if ((CurrentName() != null) && (lastPk != null)) {
|
||||
ui.Select(lastPk);
|
||||
}
|
||||
}
|
||||
}
|
||||
//-------------------------------------------------------------------------------------
|
||||
public PassCode_ getDeletePassCode() {
|
||||
return null;
|
||||
|
||||
@@ -35,6 +35,10 @@ public class DataSetControlForm extends ControlForm<DataTable> {
|
||||
public LinkedHashMap<Integer, HeaderTextFilter> headersTextFilters = new LinkedHashMap<>(); //текстовые фильтры столбцов
|
||||
//фильтры и подсчеты. todo слить с баром (?)
|
||||
MatchesCounter f_ui = null;
|
||||
//--
|
||||
Object savedCurrentKey = null;
|
||||
Vector<Object> savedSelectedKeys = new Vector<>();
|
||||
//--
|
||||
public DataSetControlForm(DataSet dataSource_in, JPanel mountPanel_in) {
|
||||
super(DataTable.class, mountPanel_in);
|
||||
dataSource = dataSource_in;
|
||||
@@ -316,9 +320,9 @@ public class DataSetControlForm extends ControlForm<DataTable> {
|
||||
}
|
||||
public void Show(Object pk) {
|
||||
Show();
|
||||
Select(pk);
|
||||
SetCurrentByPK(pk);
|
||||
}
|
||||
public void Select(Object pk) {
|
||||
public void SetCurrentByPK(Object pk) {
|
||||
if (isShown())
|
||||
control.SelectRowByPK(pk);
|
||||
}
|
||||
@@ -372,4 +376,23 @@ public class DataSetControlForm extends ControlForm<DataTable> {
|
||||
public boolean hasMenuBar() {
|
||||
return true;
|
||||
}
|
||||
//-
|
||||
public void SaveLastCurrent() {
|
||||
savedCurrentKey = null;
|
||||
savedSelectedKeys.clear();
|
||||
if ((dataSource.CurrentName() != null) && (dataSource.getCurrent() != null)) {
|
||||
savedCurrentKey = dataSource.getCurrent().getPK();
|
||||
}
|
||||
savedSelectedKeys = dataSource.getSelectedKeys();
|
||||
}
|
||||
public void RestoreLastCurrent() {
|
||||
|
||||
for (Object key: savedSelectedKeys){
|
||||
if (dataSource.containsKey(key))
|
||||
dataSource.get(key).Select(true);
|
||||
}
|
||||
if ((savedCurrentKey!=null)&&(dataSource.containsKey(savedCurrentKey))){
|
||||
SetCurrentByPK(savedCurrentKey);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -24,7 +24,7 @@ public class SynchronizeBugReports extends ComponentsRepositoryPass<Object> {
|
||||
}
|
||||
@Override
|
||||
protected void showPreparation() throws Exception {
|
||||
server.db.bugReports.SaveLastSelections();
|
||||
server.db.bugReports.getUI().SaveLastCurrent();
|
||||
server.db.bugReports.ClearUI();
|
||||
server.db.subscribers.ClearUI();
|
||||
server.db.workspaces.ClearUI();
|
||||
@@ -48,9 +48,9 @@ public class SynchronizeBugReports extends ComponentsRepositoryPass<Object> {
|
||||
protected void showDone() throws Exception {
|
||||
if (Global.mainModule.getUI().hasMainWindow()) {
|
||||
Global.mainModule.getUI().getMainWindow().getCallbackWindow().ShowBugReports();
|
||||
Global.componentsServer.db.bugReports.RestoreLastSelections();
|
||||
server.db.subscribers.RestoreLastSelections();
|
||||
server.db.workspaces.RestoreLastSelections();
|
||||
server.db.bugReports.getUI().RestoreLastCurrent();
|
||||
server.db.subscribers.getUI().RestoreLastCurrent();
|
||||
server.db.workspaces.getUI().RestoreLastCurrent();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -41,7 +41,7 @@ public class UpdateSelectedComponents extends Pass<Vector<Component>> {
|
||||
@Override
|
||||
protected void body() throws Exception {
|
||||
for (Component component : target) {
|
||||
Global.Components.getUI().Select(component.getPK());
|
||||
Global.Components.getUI().SetCurrentByPK(component.getPK());
|
||||
Global.mainModule.getPass(PassCode.UpdateComponent).Do();
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user