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

no message

Browse Source
This commit is contained in:
02090095
2025-03-13 00:32:20 +03:00
parent 91e40c4393
commit 1d97048de1
204 changed files with 984 additions and 889 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/Common/Visual/DataSetControlForm.java
View File

@@ -2,7 +2,6 @@ package Common.Visual;
import Common.CommonConstants;
import Common.Database.Objects.DBObject;
import Common.Database.Objects.Grid.TableVisualData;
import Common.Database.Objects.riDBObject;
import Common.Database.Tables.DBTable;
import Common.Database.Tables.DataSet;
import Common.Database.Tables.FKBehaviour;
@@ -15,7 +14,6 @@ import Common.Visual.Menus.TableMenu;
import Common.Visual.Tables.*;
import Common.Visual.Tables.Grid.GridAnchestor;
import Common.Visual.Windows.Dialog.DBObjectDialog;
import _VisualDVM.Global;
import javax.swing.*;
import javax.swing.table.TableColumn;
@@ -42,8 +40,6 @@ public abstract class DataSetControlForm<D extends DBObject> extends ControlForm
//--
Object savedCurrentKey = null;
Vector<Object> savedSelectedKeys = new Vector<>();
//--
public DataMenuBar getMenuBar() {return bar;}
public DataSetControlForm(DataSet<?, D> dataSource_in, JPanel mountPanel_in) {
super(DataTable.class, mountPanel_in);
dataSource = dataSource_in;
@@ -71,7 +67,7 @@ public abstract class DataSetControlForm<D extends DBObject> extends ControlForm
//--
counter_ui = (count -> bar.countLabel.setText(String.valueOf(count)));
//--фильтры всегда в конец бара.
// bar.add(new JSeparator());
// bar.add(new JSeparator());
for (FilterFlag filter : getFilters(FilterFlag.class)) {
bar.add(filter.getControl());
}
@@ -84,6 +80,10 @@ public abstract class DataSetControlForm<D extends DBObject> extends ControlForm
}
}
}
//--
public DataMenuBar getMenuBar() {
return bar;
}
protected boolean isPKVisible() {
return true;
}
@@ -575,12 +575,10 @@ public abstract class DataSetControlForm<D extends DBObject> extends ControlForm
public PassCode_ getDeletePassCode() {
return null;
}
public Object getCurrentPK(Object nanValue){
return current==null? nanValue: current.getPK();
public Object getCurrentPK(Object nanValue) {
return current == null ? nanValue : current.getPK();
}
//todo временное решение ? ->>>
public boolean canModifyCurrent(TextLog Log){
return CheckCurrent(Log) && (
!(current instanceof riDBObject) || Global.mainModule.getAccount().CheckAuthorship(((riDBObject)current).sender_address,Log));
public boolean canModifyCurrent(TextLog Log) {
return CheckCurrent(Log);
}
}