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-24 23:40:24 +03:00
parent f811d9b3ac
commit 36c11ac93f
153 changed files with 765 additions and 739 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/_VisualDVM/ProjectData/DBArray/UI/DBArraysForm.java
View File

@@ -11,8 +11,8 @@ public class DBArraysForm extends DataSetControlForm<DBArray> {
super(dataSource_in, mountPanel_in);
}
@Override
protected Current CurrentName() {
return Current.DBArray;
protected boolean needsCurrent() {
return true;
}
@Override
public String[] getUIColumnNames() {

9
src/_VisualDVM/ProjectData/Messages/Errors/ErrorsDBTable.java
View File

@@ -9,13 +9,4 @@ public class ErrorsDBTable extends MessagesDBTable<MessageError> {
public ErrorsDBTable() {
super(MessageError.class);
}
@Override
protected DataSetControlForm createUI(JPanel mountPanel) {
return new MessagesControlForm(this, mountPanel) {
@Override
protected Current CurrentName() {
return Current.Errors;
}
};
}
}

4
src/_VisualDVM/ProjectData/Messages/MessagesControlForm.java
View File

@@ -14,6 +14,10 @@ public class MessagesControlForm extends DataSetControlForm<Message> {
super(dataSource_in, mountPanel_in);
}
@Override
protected boolean needsCurrent() {
return true;
}
@Override
public String[] getUIColumnNames() {
return new String[]{
"группа",

8
src/_VisualDVM/ProjectData/Messages/MessagesDBTable.java
View File

@@ -1,5 +1,8 @@
package _VisualDVM.ProjectData.Messages;
import Common.Database.Tables.iDBTable;
import Common.Visual.DataSetControlForm;
import javax.swing.*;
//https://stackoverflow.com/questions/2026965/can-i-add-a-button-to-a-jtable-column-header
//https://stackoverflow.com/questions/7137786/how-can-i-put-a-control-in-the-jtableheader-of-a-jtable/29963916#29963916
//https://stackoverflow.com/questions/7137786/how-can-i-put-a-control-in-the-jtableheader-of-a-jtable ->>
@@ -7,4 +10,9 @@ public class MessagesDBTable<M extends Message> extends iDBTable<M> {
public MessagesDBTable(Class<M> d_in) {
super(d_in);
}
@Override
protected DataSetControlForm createUI(JPanel mountPanel) {
return new MessagesControlForm(this, mountPanel);
}
}

9
src/_VisualDVM/ProjectData/Messages/Notes/NotesDBTable.java
View File

@@ -9,13 +9,4 @@ public class NotesDBTable extends MessagesDBTable<MessageNote> {
public NotesDBTable() {
super(MessageNote.class);
}
@Override
protected DataSetControlForm createUI(JPanel mountPanel) {
return new MessagesControlForm(this, mountPanel) {
@Override
protected Current CurrentName() {
return Current.Notes;
}
};
}
}

4
src/_VisualDVM/ProjectData/Messages/Recommendations/UI/RecommendationsForm.java
View File

@@ -12,8 +12,8 @@ public class RecommendationsForm extends DataSetControlForm<MessageRecommendatio
super(dataSource_in, mountPanel_in);
}
@Override
protected Current CurrentName() {
return Current.Recommendations;
protected boolean needsCurrent() {
return true;
}
@Override
public String[] getUIColumnNames() {

9
src/_VisualDVM/ProjectData/Messages/Warnings/WarningsDBTable.java
View File

@@ -10,13 +10,4 @@ public class WarningsDBTable extends MessagesDBTable<MessageWarning> {
public WarningsDBTable() {
super(MessageWarning.class);
}
@Override
protected DataSetControlForm createUI(JPanel mountPanel) {
return new MessagesControlForm(this, mountPanel) {
@Override
protected Current CurrentName() {
return Current.Warnings;
}
};
}
}

3
src/_VisualDVM/ProjectData/Project/db_project_info.java
View File

@@ -1,6 +1,7 @@
package _VisualDVM.ProjectData.Project;
import Common.CommonConstants;
import Common.Database.Objects.DBObject;
import Common.MainModule_;
import Common.Passes.PassException;
import Common.Utils.Index;
import Common.Utils.TextLog;
@@ -1078,7 +1079,7 @@ public class db_project_info extends DBObject {
target.Close();
}
public void undoLastTransformation() throws Exception {
Global.mainModule.set(Current.Version, null);
MainModule_.instance.set(Current.Version, null); //?
//---
Global.mainModule.getUI().getVersionsWindow().getVersionsForm().getTree().RemoveNode(last_version.node);
Utils_.forceDeleteWithCheck(last_version.Home);

5
src/_VisualDVM/ProjectData/SapforData/Arrays/UI/ProjectArraysForm.java
View File

@@ -24,9 +24,10 @@ public class ProjectArraysForm extends DataSetControlForm<ProjectArray> {
super(dataSource_in, mountPanel_in);
}
//--
@Override
protected Current CurrentName() {
return Current.ProjectArray;
protected boolean needsCurrent() {
return true;
}
@Override
public String[] getUIColumnNames() {

5
src/_VisualDVM/ProjectData/SapforData/Arrays/UI/RulesTree.java
View File

@@ -13,7 +13,7 @@ public class RulesTree extends StyledTree {
setRootVisible(false);
expandRow(0);
ExpandAll();
Global.mainModule.set(Current.ParallelRegion, null);
Global.mainModule.getProject().parallelRegions.getUI().dropCurrent();
}
@Override
protected GraphMenu createMenu() {
@@ -36,6 +36,7 @@ public class RulesTree extends StyledTree {
region = (ParallelRegion) o;
}
}
Global.mainModule.set(Current.ParallelRegion, region);
//todo(?)
Global.mainModule.getProject().parallelRegions.getUI().SetCurrentByPK(region.getPK());
}
}

7
src/_VisualDVM/ProjectData/SapforData/Regions/UI/ArrayAlignmentBar.java
View File

@@ -1,7 +1,9 @@
package _VisualDVM.ProjectData.SapforData.Regions.UI;
import Common.MainModule_;
import Common.Visual.Tables.StyledCellLabel;
import _VisualDVM.Global;
import _VisualDVM.ProjectData.SapforData.Arrays.ProjectArray;
import _VisualDVM.ProjectData.SapforData.Regions.ParallelRegion;
import javafx.util.Pair;
import javax.swing.*;
@@ -46,9 +48,10 @@ public class ArrayAlignmentBar extends JToolBar {
//это массивы из объявлений. прежде чем их трогать проверим а есть ли они в текущей области.
// по адресам принадлежность смотреть нельзя.
// на момент поиска массивов у них их еще нет. а вот ид совпадают.
if (Global.mainModule.getParallelRegion().ArrayBelongsToRegion(d_link.id)) {
ParallelRegion currentRegion = MainModule_.instance.getDb().getTable(ParallelRegion.class).getUI().getCurrent();
if (currentRegion.ArrayBelongsToRegion(d_link.id)) {
//инфа о массиве уже из области. имеющая адрес и бар.
ProjectArray r_link = Global.mainModule.getParallelRegion().getArrayById(d_link.id);
ProjectArray r_link = currentRegion.getArrayById(d_link.id);
Pair<JSpinner, JSpinner> pair = r_link.bar.dimensions.get(dim);
pair.getKey().setValue(K.getValue());
pair.getValue().setValue(B.getValue());

4
src/_VisualDVM/ProjectData/SapforData/Regions/UI/ParallelRegionsForm.java
View File

@@ -12,8 +12,8 @@ public class ParallelRegionsForm extends DataSetControlForm<ParallelRegion> {
super(dataSource_in, mountPanel_in);
}
@Override
protected Current CurrentName() {
return Current.ParallelRegionInfo;
protected boolean needsCurrent() {
return true;
}
@Override
public String[] getUIColumnNames() {

5
src/_VisualDVM/ProjectData/SapforData/Variants/UI/ParallelVariantsForm.java
View File

@@ -14,9 +14,10 @@ public class ParallelVariantsForm extends DataSetControlForm<ParallelVariant> {
public ParallelVariantsForm(DataSet<?, ParallelVariant> dataSource_in, JPanel mountPanel_in) {
super(dataSource_in, mountPanel_in);
}
@Override
protected Current CurrentName() {
return Current.ParallelVariant;
protected boolean needsCurrent() {
return true;
}
@Override
protected boolean hasCheckBox() {