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 20:04:16 +03:00
parent 01d366e256
commit 66fa638ec4
55 changed files with 241 additions and 212 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/_VisualDVM/ProjectData/DBArray/ArraysDBTable.java
View File

@@ -4,6 +4,8 @@ import Common.Database.Tables.DataSet;
import Common.Visual.DataSetControlForm;
import Common.Visual.Menus.DataMenuBar;
import _VisualDVM.Current;
import javax.swing.*;
public class ArraysDBTable extends DBTable<String, DBArray> {
public ArraysDBTable() {
super(String.class, DBArray.class);
@@ -17,8 +19,8 @@ public class ArraysDBTable extends DBTable<String, DBArray> {
return "сохранённые состояния";
}
@Override
protected DataSetControlForm createUI() {
return new DataSetControlForm(this) {
protected DataSetControlForm createUI(JPanel mountPanel) {
return new DataSetControlForm(this,mountPanel) {
@Override
public boolean hasCheckBox() {
return true;

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

@@ -6,6 +6,7 @@ import Common.Visual.Tables.ColumnFilter;
import Common.Visual.Tables.RendererWrapText;
import _VisualDVM.Global;
import javax.swing.*;
import javax.swing.table.TableModel;
import javax.swing.table.TableRowSorter;
import java.util.Comparator;
@@ -17,9 +18,9 @@ public class MessagesDBTable<M extends Message> extends iDBTable<M> {
super(d_in);
}
@Override
protected DataSetControlForm createUI() {
protected DataSetControlForm createUI(JPanel mountPanel) {
DataSet dataset = this;
return new DataSetControlForm(this) {
return new DataSetControlForm(this,mountPanel) {
@Override
public void ShowCurrentObject() throws Exception {
super.ShowCurrentObject();
@@ -36,8 +37,8 @@ public class MessagesDBTable<M extends Message> extends iDBTable<M> {
ShowCurrentObject();
}
@Override
public void CreateControl() {
super.CreateControl();
protected void createControl() {
super.createControl();
columnsFilters.put(3, new ColumnFilter(dataset, 3));
control.setRowSorter(null);
TableRowSorter<TableModel> sorter = new TableRowSorter<>(control.getModel());

6
src/_VisualDVM/ProjectData/Messages/Recommendations/RecommendationsDBTable.java
View File

@@ -5,6 +5,8 @@ import Common.Visual.Tables.RendererWrapText;
import _VisualDVM.Current;
import _VisualDVM.GlobalData.Settings.SettingName;
import _VisualDVM.Passes.PassCode;
import javax.swing.*;
public class RecommendationsDBTable extends iDBTable<MessageRecommendation> {
//group=1 - настройка
//group=2 - преобразование
@@ -13,8 +15,8 @@ public class RecommendationsDBTable extends iDBTable<MessageRecommendation> {
// setUIContent(UI.getMainWindow().errorsPanel);
}
@Override
protected DataSetControlForm createUI() {
return new DataSetControlForm(this) {
protected DataSetControlForm createUI(JPanel mountPanel) {
return new DataSetControlForm(this,mountPanel) {
@Override
protected void AdditionalInitColumns() {
columns.get(0).setVisible(false);

5
src/_VisualDVM/ProjectData/SapforData/Arrays/ArraysSet.java
View File

@@ -9,6 +9,7 @@ import _VisualDVM.Passes.PassCode;
import _VisualDVM.Visual.Tables.EditorFilesHyperlinks;
import _VisualDVM.Visual.Tables.RendererHyperlinks;
import javax.swing.*;
import java.util.Vector;
public class ArraysSet extends DataSet<Long, ProjectArray> {
public ArraysSet() {
@@ -27,8 +28,8 @@ public class ArraysSet extends DataSet<Long, ProjectArray> {
return Current.ProjectArray;
}
@Override
protected DataSetControlForm createUI() {
return new DataSetControlForm(this) {
protected DataSetControlForm createUI(JPanel mountPanel) {
return new DataSetControlForm(this,mountPanel) {
@Override
public boolean hasCheckBox() {
return true;

18
src/_VisualDVM/ProjectData/SapforData/Arrays/UI/DimensionsTableForm.java
View File

@@ -8,25 +8,15 @@ import _VisualDVM.Global;
import _VisualDVM.ProjectData.SapforData.Arrays.ProjectArray;
import _VisualDVM.ProjectData.SapforData.Arrays.Templates.TemplateDimension;
import javax.swing.*;
import java.awt.*;
import java.util.Vector;
public class DimensionsTableForm extends ControlForm<StyledTable> {
public DimensionsTableForm() {
super(StyledTable.class);
public DimensionsTableForm(JPanel mountPanel_in) {
super(StyledTable.class,mountPanel_in);
}
@Override
public void Show() {
super.Show();
content.add(scroll, BorderLayout.CENTER);
content.updateUI();
}
@Override
public void Clear() {
super.Clear();
UI.Clear(content);
}
@Override
public void CreateControl() {
protected void createControl() {
Vector<String> columns = new Vector<>();
columns.add("шаблон");
for (int i = 0; i < Global.mainModule.getProject().maxdim; ++i)

20
src/_VisualDVM/ProjectData/SapforData/Functions/UI/Graph/FunctionsGraphForm.java
View File

@@ -1,27 +1,15 @@
package _VisualDVM.ProjectData.SapforData.Functions.UI.Graph;
import Common.Visual.ControlForm;
import Common.Visual.UI;
import _VisualDVM.Global;
import com.mxgraph.swing.mxGraphComponent;
import java.awt.*;
import javax.swing.*;
public class FunctionsGraphForm extends ControlForm<mxGraphComponent> {
public FunctionsGraphForm() {
super(mxGraphComponent.class);
public FunctionsGraphForm(JPanel mountPanel_in) {
super(mxGraphComponent.class, mountPanel_in);
}
@Override
public void CreateControl() {
protected void createControl() {
control = Global.mainModule.getProject().DrawFunctionsGraph();
}
@Override
public void Show() {
super.Show();
content.add(scroll, BorderLayout.CENTER);
content.updateUI();
}
@Override
public void Clear() {
super.Clear();
UI.Clear(content);
}
}

5
src/_VisualDVM/ProjectData/SapforData/Regions/RegionsSet.java
View File

@@ -5,6 +5,7 @@ import Common.Visual.Tables.RendererMultiline;
import Common.Visual.Tables.RendererTopLeft;
import _VisualDVM.Current;
import javax.swing.*;
import java.math.BigInteger;
public class RegionsSet extends DataSet<BigInteger, ParallelRegion> {
//суррогат. нужен только для сохры столбцов. во всяком случае пока.
@@ -24,8 +25,8 @@ public class RegionsSet extends DataSet<BigInteger, ParallelRegion> {
return "области распараллеливания";
}
@Override
protected DataSetControlForm createUI() {
return new DataSetControlForm(this) {
protected DataSetControlForm createUI(JPanel mountPanel) {
return new DataSetControlForm(this,mountPanel) {
@Override
protected void AdditionalInitColumns() {
columns.get(0).setVisible(false);

6
src/_VisualDVM/ProjectData/SapforData/Variants/VariantsSet.java
View File

@@ -8,6 +8,8 @@ import Common.Visual.Tables.RendererMultiline;
import _VisualDVM.Current;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.ProjectData.SapforData.Variants.UI.RendererVariantRank;
import javax.swing.*;
public class VariantsSet extends DataSet<String, ParallelVariant> {
public VariantsSet() {
super(String.class, ParallelVariant.class);
@@ -17,8 +19,8 @@ public class VariantsSet extends DataSet<String, ParallelVariant> {
return "варианты";
}
@Override
protected DataSetControlForm createUI() {
return new DataSetControlForm(this) {
protected DataSetControlForm createUI(JPanel mountPanel) {
return new DataSetControlForm(this,mountPanel) {
@Override
public boolean hasCheckBox() {
return true;