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

52
.idea/workspace.xml generated
View File

@@ -9,8 +9,58 @@
<list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment=""> <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Database/Tables/DataSet.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Database/Tables/DataSet.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/Common/Database/Tables/DataSet.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Database/Tables/DataSet.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Visual/ControlWithCurrentForm.java" beforeDir="false" /> <change beforePath="$PROJECT_DIR$/src/Common/Visual/ControlForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/ControlForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Visual/DataSetControlForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/DataSetControlForm.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/Common/Visual/DataSetControlForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/DataSetControlForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Visual/Trees/TreeForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Trees/TreeForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Compiler/CompilersDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Compiler/CompilersDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/CompilerEnvironment/CompilerEnvironmentsSet.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/CompilerEnvironment/CompilerEnvironmentsSet.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/CompilerOption/CompilerOptionsSet.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/CompilerOption/CompilerOptionsSet.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/DVMParameter/DVMParameterDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/DVMParameter/DVMParameterDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/EnvironmentValue/EnvironmentValuesDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/EnvironmentValue/EnvironmentValuesDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/FileObject/DirInfosDataSet.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/FileObject/DirInfosDataSet.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Machine/MachinesDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Machine/MachinesDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Makefile/MakefilesDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Makefile/MakefilesDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Module/ModulesDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Module/ModulesDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/RemoteFile/UI/RemoteFileChooserFields.form" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/RemoteFile/UI/RemoteFileChooserFields.form" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/RemoteFile/UI/RemoteFileChooserFields.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/RemoteFile/UI/RemoteFileChooserFields.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/RunConfiguration/RunConfigurationsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/RunConfiguration/RunConfigurationsDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/SapforProfile/SapforProfilesDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/SapforProfile/SapforProfilesDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/SapforProfileSetting/SapforProfileSettingsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/SapforProfileSetting/SapforProfileSettingsDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/CompilationTask/CompilationTasksDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/CompilationTask/CompilationTasksDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/RunTask/RunTasksDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/RunTask/RunTasksDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/User/UsersDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/User/UsersDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/DBArray/ArraysDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/DBArray/ArraysDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Messages/MessagesDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Messages/MessagesDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Messages/Recommendations/RecommendationsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Messages/Recommendations/RecommendationsDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Arrays/ArraysSet.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Arrays/ArraysSet.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/DimensionsTableForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/DimensionsTableForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Functions/UI/Graph/FunctionsGraphForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Functions/UI/Graph/FunctionsGraphForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Regions/RegionsSet.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Regions/RegionsSet.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Variants/VariantsSet.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Variants/VariantsSet.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/BugReport/BugReportsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/BugReport/BugReportsDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Component/ComponentsSet.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/Component/ComponentsSet.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/SubscriberWorkspace/SubscriberWorkspaceDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/SubscriberWorkspace/SubscriberWorkspaceDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Subscribes/SubsribersDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/Subscribes/SubsribersDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Group/GroupsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Group/GroupsDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Test/TestDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Test/TestDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/DVMConfigurationDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/DVMConfigurationDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackageDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackageDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMSettings/DVMSettingsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMSettings/DVMSettingsDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMTasks/DVMRunTasksSet.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMTasks/DVMRunTasksSet.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/SapforPackageDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/SapforPackageDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/SapforSettingsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/SapforSettingsDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettingsCommand/SapforSettingsCommandsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettingsCommand/SapforSettingsCommandsDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/ServerSapfor/ServerSapforsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/ServerSapfor/ServerSapforsDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/FileForm.form" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/FileForm.form" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/FileForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/FileForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/FunctionsForm.form" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/FunctionsForm.form" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/FunctionsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/FunctionsForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/ProjectForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/ProjectForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/VariantsForm.form" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/VariantsForm.form" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/VariantsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/VariantsForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/VersionsForm.form" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/VersionsForm.form" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/VersionsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/VersionsForm.java" afterDir="false" />
</list> </list>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_CONFLICTS" value="true" />

2
properties
View File

@@ -10,7 +10,7 @@
"SMTPHost": "smtp.mail.ru", "SMTPHost": "smtp.mail.ru",
"SMTPPort": 465, "SMTPPort": 465,
"MailSocketPort": 465, "MailSocketPort": 465,
"collapseCredentials": true, "collapseCredentials": false,
"collapseFileGraphs": false, "collapseFileGraphs": false,
"collapseFileMessages": false, "collapseFileMessages": false,
"collapseProjectTrees": false, "collapseProjectTrees": false,

12
src/Common/Database/Tables/DataSet.java
View File

@@ -48,11 +48,10 @@ public class DataSet<K, D extends DBObject> extends DataSetAnchestor {
public DataMenuBar createMenuBar() { public DataMenuBar createMenuBar() {
return new DataMenuBar(getPluralDescription()); return new DataMenuBar(getPluralDescription());
} }
public void mountUI(JPanel content_in) { public void mountUI(JPanel mountPanel_in) {
UI.Clear(content_in); UI.Clear(mountPanel_in);
//--> //-->
ui_ = createUI(); ui_ = createUI(mountPanel_in);
ui_.setContent(content_in);
//--> //-->
if (hasMenuBar()) { if (hasMenuBar()) {
try { try {
@@ -65,7 +64,7 @@ public class DataSet<K, D extends DBObject> extends DataSetAnchestor {
} else { } else {
bar = MainModule_.instance.getUI().menuBars.get(getClass()); bar = MainModule_.instance.getUI().menuBars.get(getClass());
} }
content_in.add(bar, BorderLayout.NORTH); mountPanel_in.add(bar, BorderLayout.NORTH);
//-- //--
setFilterUI(count -> MainModule_.instance.getUI().menuBars.get(getClass()).countLabel.setText(String.valueOf(count))); setFilterUI(count -> MainModule_.instance.getUI().menuBars.get(getClass()).countLabel.setText(String.valueOf(count)));
//-- //--
@@ -73,7 +72,6 @@ public class DataSet<K, D extends DBObject> extends DataSetAnchestor {
ex.printStackTrace(); ex.printStackTrace();
} }
} }
content_in.add(ui_.getDataPanel(), BorderLayout.CENTER);
//---- //----
createFilters(); createFilters();
if (!filters.isEmpty()) { if (!filters.isEmpty()) {
@@ -112,7 +110,7 @@ public class DataSet<K, D extends DBObject> extends DataSetAnchestor {
public String[] getUIColumnNames() { public String[] getUIColumnNames() {
return new String[]{}; return new String[]{};
} }
protected DataSetControlForm createUI() { protected DataSetControlForm createUI(JPanel mountPanel) {
return null; return null;
} }
public boolean hasUI() { public boolean hasUI() {

36
src/Common/Visual/ControlForm.java
View File

@@ -5,31 +5,30 @@ import javax.swing.*;
import java.awt.*; import java.awt.*;
//класс, представляющий собой прокручиваемую панель, на которой лежит нечто. //класс, представляющий собой прокручиваемую панель, на которой лежит нечто.
public class ControlForm<C extends Component> { public class ControlForm<C extends Component> {
JPanel mountPanel = null; //панель на которую монтируется UI.помимо контрола может содержать меню сверху.
JPanel scrollPanel = null; //панель на которой лежит скролл.
JScrollPane scroll = null; //панель прокрутки в которую встроен контрол
public C control = null; public C control = null;
public JScrollPane scroll = null; protected Class<C> control_class = null;
protected Class<C> control_class; public ControlForm(Class<C> class_in, JPanel mountPanel_in) {
protected JPanel content; //задник.
public ControlForm(Class<C> class_in) {
control_class = class_in; control_class = class_in;
setContent(new JPanel(new BorderLayout())); mountPanel = mountPanel_in;
mountPanel.add((scrollPanel = new JPanel(new BorderLayout())), BorderLayout.CENTER);
} }
//нужно будет вывестии сделать нормальные формы для деревьев а не ручное создание. public JPanel getMountPanel(){return mountPanel;} //todo осталось только в projectForm, вывести
public JPanel getContent() { //новое отображение предполагает полную перерисовку контрола.(?)
return content;
}
public void setContent(JPanel content_in) {
content = content_in;
}
//-
public void Show() { public void Show() {
Clear(); Clear();
CreateControl(); createControl();
//------------------------ //--
scroll = new JScrollPane(control); scroll = new JScrollPane(control);
scroll.setVerticalScrollBarPolicy(ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED); scroll.setVerticalScrollBarPolicy(ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED);
scroll.setHorizontalScrollBarPolicy(ScrollPaneConstants.HORIZONTAL_SCROLLBAR_AS_NEEDED); scroll.setHorizontalScrollBarPolicy(ScrollPaneConstants.HORIZONTAL_SCROLLBAR_AS_NEEDED);
//--
scrollPanel.add(scroll);
scrollPanel.updateUI();
} }
public void CreateControl() { protected void createControl() {
try { try {
control = control_class.newInstance(); control = control_class.newInstance();
} catch (Exception e) { } catch (Exception e) {
@@ -40,13 +39,14 @@ public class ControlForm<C extends Component> {
return control != null; return control != null;
} }
public void Clear() { public void Clear() {
UI.Clear(scrollPanel);
control = null; //очищено. control = null; //очищено.
} }
public void Refresh() { public void Refresh() {
if (control != null) if (control != null)
refresh(); redrawControl();
} }
//- //-
protected void refresh() { protected void redrawControl() {
} //перерисовать контрол. } //перерисовать контрол.
} }

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

@@ -1,6 +1,5 @@
package Common.Visual; package Common.Visual;
import Common.CommonConstants; import Common.CommonConstants;
import Common.Current_;
import Common.Database.Objects.DBObject; import Common.Database.Objects.DBObject;
import Common.Database.Objects.Grid.TableVisualData; import Common.Database.Objects.Grid.TableVisualData;
import Common.Database.Tables.DBTable; import Common.Database.Tables.DBTable;
@@ -27,35 +26,15 @@ import java.util.Vector;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import java.util.stream.IntStream; import java.util.stream.IntStream;
public class DataSetControlForm extends ControlForm<DataTable> { public class DataSetControlForm extends ControlForm<DataTable> {
protected JPanel dataPanel;
protected DataSet dataSource; protected DataSet dataSource;
protected int current_row_i; protected int current_row_i;
protected boolean events_on = true; protected boolean events_on = true;
protected String colNamesAndSizes = ""; protected String colNamesAndSizes = "";
protected Vector<ColumnInfo> columns = new Vector<>(); protected Vector<ColumnInfo> columns = new Vector<>();
public DataSetControlForm(DataSet dataSource_in) { public DataSetControlForm(DataSet dataSource_in, JPanel mountPanel_in) {
this(dataSource_in, DataTable.class); super(DataTable.class, mountPanel_in);
}
public DataSetControlForm(DataSet dataSource_in, Class tableClass) {
super(tableClass);
dataSource = dataSource_in; dataSource = dataSource_in;
//---
dataPanel = new JPanel(new BorderLayout());
content.add(dataPanel, BorderLayout.CENTER);
}
public JPanel getDataPanel() {
return dataPanel;
}
@Override
public void Show() {
super.Show();
dataPanel.add(scroll);
dataPanel.updateUI();
}
@Override
public void Clear() {
super.Clear();
UI.Clear(dataPanel);
} }
public void SaveColumns() { public void SaveColumns() {
if (MainModule_.instance.getDb() != null) { if (MainModule_.instance.getDb() != null) {
@@ -101,7 +80,7 @@ public class DataSetControlForm extends ControlForm<DataTable> {
} }
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
@Override @Override
public void CreateControl() { protected void createControl() {
CreateColumnsInfo(); CreateColumnsInfo();
GridAnchestor table_data_model = new GridAnchestor(getHeaders(), dataSource.getVisibleKeys()) { GridAnchestor table_data_model = new GridAnchestor(getHeaders(), dataSource.getVisibleKeys()) {
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
@@ -276,7 +255,7 @@ public class DataSetControlForm extends ControlForm<DataTable> {
} }
} }
@Override @Override
protected void refresh() { protected void redrawControl() {
control.CorrectSizes(); control.CorrectSizes();
} }
public void Show(Object pk) { public void Show(Object pk) {

18
src/Common/Visual/Trees/TreeForm.java
View File

@@ -2,29 +2,19 @@ package Common.Visual.Trees;
import Common.Visual.ControlForm; import Common.Visual.ControlForm;
import Common.Visual.UI; import Common.Visual.UI;
import javax.swing.*;
import java.awt.*; import java.awt.*;
public class TreeForm<C extends StyledTree> extends ControlForm<C> { public class TreeForm<C extends StyledTree> extends ControlForm<C> {
public TreeForm(Class<C> class_in) { public TreeForm(Class<C> class_in, JPanel mountPanel_in) {
super(class_in); super(class_in, mountPanel_in);
} }
//временно, чтобы не затрагивать коды раньше времени. //временно, чтобы не затрагивать коды раньше времени.
public StyledTree getTree() { public StyledTree getTree() {
return control; return control;
} }
@Override @Override
protected void refresh() { protected void redrawControl() {
getTree().revalidate(); getTree().revalidate();
getTree().repaint(); getTree().repaint();
} }
@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/GlobalData/Compiler/CompilersDBTable.java
View File

@@ -20,6 +20,7 @@ import _VisualDVM.Passes.PassCode;
import _VisualDVM.Utils; import _VisualDVM.Utils;
import _VisualDVM.Validators.PathValidator; import _VisualDVM.Validators.PathValidator;
import javax.swing.*;
import java.util.LinkedHashMap; import java.util.LinkedHashMap;
public class CompilersDBTable extends iDBTable<Compiler> { public class CompilersDBTable extends iDBTable<Compiler> {
public CompilersDBTable() { public CompilersDBTable() {
@@ -119,8 +120,8 @@ public class CompilersDBTable extends iDBTable<Compiler> {
}; };
} }
@Override @Override
protected DataSetControlForm createUI() { protected DataSetControlForm createUI(JPanel mountPanel) {
return new DataSetControlForm(this) { return new DataSetControlForm(this,mountPanel) {
@Override @Override
protected void AdditionalInitColumns() { protected void AdditionalInitColumns() {
columns.get(0).setVisible(false); columns.get(0).setVisible(false);

6
src/_VisualDVM/GlobalData/CompilerEnvironment/CompilerEnvironmentsSet.java
View File

@@ -4,6 +4,8 @@ import Common.Visual.DataSetControlForm;
import Common.Visual.Tables.RendererMultiline; import Common.Visual.Tables.RendererMultiline;
import _VisualDVM.GlobalData.CompilerEnvironment.UI.CompilerEnvironmentValueEditor; import _VisualDVM.GlobalData.CompilerEnvironment.UI.CompilerEnvironmentValueEditor;
import _VisualDVM.GlobalData.CompilerEnvironment.UI.CompilerEnvironmentValueRenderer; import _VisualDVM.GlobalData.CompilerEnvironment.UI.CompilerEnvironmentValueRenderer;
import javax.swing.*;
public class CompilerEnvironmentsSet extends DataSet<String, CompilerEnvironment> { public class CompilerEnvironmentsSet extends DataSet<String, CompilerEnvironment> {
public CompilerEnvironmentsSet() { public CompilerEnvironmentsSet() {
super(String.class, CompilerEnvironment.class); super(String.class, CompilerEnvironment.class);
@@ -26,8 +28,8 @@ public class CompilerEnvironmentsSet extends DataSet<String, CompilerEnvironment
} }
} }
@Override @Override
protected DataSetControlForm createUI() { protected DataSetControlForm createUI(JPanel mountPanel) {
return new DataSetControlForm(this) { return new DataSetControlForm(this,mountPanel) {
@Override @Override
public boolean hasCheckBox() { public boolean hasCheckBox() {
return true; return true;

6
src/_VisualDVM/GlobalData/CompilerOption/CompilerOptionsSet.java
View File

@@ -4,6 +4,8 @@ import Common.Visual.DataSetControlForm;
import Common.Visual.Tables.RendererMultiline; import Common.Visual.Tables.RendererMultiline;
import _VisualDVM.GlobalData.CompilerOption.UI.CompilerOptionParameterNameRenderer; import _VisualDVM.GlobalData.CompilerOption.UI.CompilerOptionParameterNameRenderer;
import _VisualDVM.GlobalData.CompilerOption.UI.CompilerOptionParameterValueRenderer; import _VisualDVM.GlobalData.CompilerOption.UI.CompilerOptionParameterValueRenderer;
import javax.swing.*;
public class CompilerOptionsSet extends DataSet<String, CompilerOption> { public class CompilerOptionsSet extends DataSet<String, CompilerOption> {
public CompilerOptionsSet() { public CompilerOptionsSet() {
super(String.class, CompilerOption.class); super(String.class, CompilerOption.class);
@@ -28,8 +30,8 @@ public class CompilerOptionsSet extends DataSet<String, CompilerOption> {
} }
} }
@Override @Override
protected DataSetControlForm createUI() { protected DataSetControlForm createUI(JPanel mountPanel) {
return new DataSetControlForm(this) { return new DataSetControlForm(this,mountPanel) {
@Override @Override
public boolean hasCheckBox() { public boolean hasCheckBox() {
return true; return true;

6
src/_VisualDVM/GlobalData/DVMParameter/DVMParameterDBTable.java
View File

@@ -11,6 +11,8 @@ import _VisualDVM.Global;
import _VisualDVM.GlobalData.DVMParameter.UI.DVMParameterFields; import _VisualDVM.GlobalData.DVMParameter.UI.DVMParameterFields;
import _VisualDVM.Passes.PassCode; import _VisualDVM.Passes.PassCode;
import _VisualDVM.Utils; import _VisualDVM.Utils;
import javax.swing.*;
public class DVMParameterDBTable extends iDBTable<DVMParameter> { public class DVMParameterDBTable extends iDBTable<DVMParameter> {
public DVMParameterDBTable() { public DVMParameterDBTable() {
super(DVMParameter.class); super(DVMParameter.class);
@@ -42,8 +44,8 @@ public class DVMParameterDBTable extends iDBTable<DVMParameter> {
return Current.DVMParameterValue; return Current.DVMParameterValue;
} }
@Override @Override
protected DataSetControlForm createUI() { protected DataSetControlForm createUI(JPanel mountPanel) {
return new DataSetControlForm(this) { return new DataSetControlForm(this,mountPanel) {
@Override @Override
protected void AdditionalInitColumns() { protected void AdditionalInitColumns() {
columns.get(0).setVisible(false); columns.get(0).setVisible(false);

6
src/_VisualDVM/GlobalData/EnvironmentValue/EnvironmentValuesDBTable.java
View File

@@ -11,6 +11,8 @@ import _VisualDVM.Global;
import _VisualDVM.GlobalData.EnvironmentValue.UI.EnvironmentValueFields; import _VisualDVM.GlobalData.EnvironmentValue.UI.EnvironmentValueFields;
import _VisualDVM.Passes.PassCode; import _VisualDVM.Passes.PassCode;
import _VisualDVM.Utils; import _VisualDVM.Utils;
import javax.swing.*;
public class EnvironmentValuesDBTable extends iDBTable<EnvironmentValue> { public class EnvironmentValuesDBTable extends iDBTable<EnvironmentValue> {
public EnvironmentValuesDBTable() { public EnvironmentValuesDBTable() {
super(EnvironmentValue.class); super(EnvironmentValue.class);
@@ -67,8 +69,8 @@ public class EnvironmentValuesDBTable extends iDBTable<EnvironmentValue> {
}; };
} }
@Override @Override
protected DataSetControlForm createUI() { protected DataSetControlForm createUI(JPanel mountPanel) {
return new DataSetControlForm(this) { return new DataSetControlForm(this,mountPanel) {
@Override @Override
protected void AdditionalInitColumns() { protected void AdditionalInitColumns() {
columns.get(0).setVisible(false); columns.get(0).setVisible(false);

6
src/_VisualDVM/GlobalData/FileObject/DirInfosDataSet.java
View File

@@ -2,13 +2,15 @@ package _VisualDVM.GlobalData.FileObject;
import Common.Database.Tables.DataSet; import Common.Database.Tables.DataSet;
import Common.Visual.DataSetControlForm; import Common.Visual.DataSetControlForm;
import Common.Visual.Tables.RendererDate; import Common.Visual.Tables.RendererDate;
import javax.swing.*;
public class DirInfosDataSet extends DataSet<String, DirInfo> { public class DirInfosDataSet extends DataSet<String, DirInfo> {
public DirInfosDataSet() { public DirInfosDataSet() {
super(String.class, DirInfo.class); super(String.class, DirInfo.class);
} }
@Override @Override
protected DataSetControlForm createUI() { protected DataSetControlForm createUI(JPanel mountPanel) {
return new DataSetControlForm(this) { return new DataSetControlForm(this,mountPanel) {
@Override @Override
protected void AdditionalInitColumns() { protected void AdditionalInitColumns() {
columns.get(1).setRendererClass(RendererDate.class); columns.get(1).setRendererClass(RendererDate.class);

5
src/_VisualDVM/GlobalData/Machine/MachinesDBTable.java
View File

@@ -24,6 +24,7 @@ import _VisualDVM.GlobalData.Tasks.RunTask.RunTask;
import _VisualDVM.GlobalData.User.User; import _VisualDVM.GlobalData.User.User;
import _VisualDVM.Passes.PassCode; import _VisualDVM.Passes.PassCode;
import javax.swing.*;
import java.awt.event.ActionEvent; import java.awt.event.ActionEvent;
import java.awt.event.ActionListener; import java.awt.event.ActionListener;
import java.util.LinkedHashMap; import java.util.LinkedHashMap;
@@ -88,8 +89,8 @@ public class MachinesDBTable extends iDBTable<Machine> {
return res; return res;
} }
@Override @Override
protected DataSetControlForm createUI() { protected DataSetControlForm createUI(JPanel mountPanel) {
return new DataSetControlForm(this) { return new DataSetControlForm(this,mountPanel) {
@Override @Override
public void ShowCurrentObject() throws Exception { public void ShowCurrentObject() throws Exception {
super.ShowCurrentObject(); super.ShowCurrentObject();

5
src/_VisualDVM/GlobalData/Makefile/MakefilesDBTable.java
View File

@@ -15,6 +15,7 @@ import _VisualDVM.GlobalData.Module.UI.ModuleAnchestorForm;
import _VisualDVM.GlobalData.Tasks.CompilationTask.CompilationTask; import _VisualDVM.GlobalData.Tasks.CompilationTask.CompilationTask;
import _VisualDVM.Passes.PassCode; import _VisualDVM.Passes.PassCode;
import javax.swing.*;
import java.util.LinkedHashMap; import java.util.LinkedHashMap;
public class MakefilesDBTable extends iDBTable<Makefile> { public class MakefilesDBTable extends iDBTable<Makefile> {
public MakefilesDBTable() { public MakefilesDBTable() {
@@ -40,8 +41,8 @@ public class MakefilesDBTable extends iDBTable<Makefile> {
return res; return res;
} }
@Override @Override
protected DataSetControlForm createUI() { protected DataSetControlForm createUI(JPanel mountPanel) {
return new DataSetControlForm(this) { return new DataSetControlForm(this,mountPanel) {
@Override @Override
protected void AdditionalInitColumns() { protected void AdditionalInitColumns() {
columns.get(0).setVisible(false); columns.get(0).setVisible(false);

6
src/_VisualDVM/GlobalData/Module/ModulesDBTable.java
View File

@@ -7,6 +7,8 @@ import Common.Visual.Windows.Dialog.DialogFields;
import _VisualDVM.Current; import _VisualDVM.Current;
import _VisualDVM.GlobalData.Module.UI.ModuleAnchestorForm; import _VisualDVM.GlobalData.Module.UI.ModuleAnchestorForm;
import _VisualDVM.Passes.PassCode; import _VisualDVM.Passes.PassCode;
import javax.swing.*;
public class ModulesDBTable extends iDBTable<Module> { public class ModulesDBTable extends iDBTable<Module> {
public ModulesDBTable() { public ModulesDBTable() {
super(Module.class); super(Module.class);
@@ -24,8 +26,8 @@ public class ModulesDBTable extends iDBTable<Module> {
return new ModuleAnchestorForm<>(); return new ModuleAnchestorForm<>();
} }
@Override @Override
protected DataSetControlForm createUI() { protected DataSetControlForm createUI(JPanel mountPanel) {
return new DataSetControlForm(this) { return new DataSetControlForm(this,mountPanel) {
@Override @Override
public boolean hasCheckBox() { public boolean hasCheckBox() {
return true; return true;

3
src/_VisualDVM/GlobalData/RemoteFile/UI/RemoteFileChooserFields.form
View File

@@ -37,8 +37,7 @@
</component> </component>
</children> </children>
</toolbar> </toolbar>
<grid id="a6308" binding="TreePanel" custom-create="true" layout-manager="GridLayoutManager" row-count="1" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1"> <grid id="a6308" binding="TreePanel" layout-manager="BorderLayout" hgap="0" vgap="0">
<margin top="0" left="0" bottom="0" right="0"/>
<constraints> <constraints>
<grid row="3" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/> <grid row="3" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
</constraints> </constraints>

3
src/_VisualDVM/GlobalData/RemoteFile/UI/RemoteFileChooserFields.java
View File

@@ -16,6 +16,7 @@ public class RemoteFileChooserFields implements DialogFields {
private JButton bBack; private JButton bBack;
private JButton bHome; private JButton bHome;
public RemoteFileChooserFields() { public RemoteFileChooserFields() {
treeForm = new TreeForm(RemoteFilesTree.class,TreePanel);
bBack.addActionListener(new ActionListener() { bBack.addActionListener(new ActionListener() {
@Override @Override
public void actionPerformed(ActionEvent e) { public void actionPerformed(ActionEvent e) {
@@ -31,7 +32,7 @@ public class RemoteFileChooserFields implements DialogFields {
} }
private void createUIComponents() { private void createUIComponents() {
// TODO: place custom component creation code here // TODO: place custom component creation code here
TreePanel = (treeForm = new TreeForm(RemoteFilesTree.class)).getContent();
} }
@Override @Override
public Component getContent() { public Component getContent() {

4
src/_VisualDVM/GlobalData/RunConfiguration/RunConfigurationsDBTable.java
View File

@@ -118,8 +118,8 @@ public class RunConfigurationsDBTable extends iDBTable<RunConfiguration> {
return res; return res;
} }
@Override @Override
protected DataSetControlForm createUI() { protected DataSetControlForm createUI(JPanel mountPanel) {
return new DataSetControlForm(this) { return new DataSetControlForm(this,mountPanel) {
@Override @Override
protected void AdditionalInitColumns() { protected void AdditionalInitColumns() {
columns.get(0).setVisible(false); columns.get(0).setVisible(false);

5
src/_VisualDVM/GlobalData/SapforProfile/SapforProfilesDBTable.java
View File

@@ -13,6 +13,7 @@ import _VisualDVM.GlobalData.SapforProfile.UI.SapforProfileFields;
import _VisualDVM.GlobalData.SapforProfileSetting.SapforProfileSetting; import _VisualDVM.GlobalData.SapforProfileSetting.SapforProfileSetting;
import _VisualDVM.Passes.PassCode; import _VisualDVM.Passes.PassCode;
import javax.swing.*;
import java.util.Date; import java.util.Date;
import java.util.LinkedHashMap; import java.util.LinkedHashMap;
public class SapforProfilesDBTable extends iDBTable<SapforProfile> { public class SapforProfilesDBTable extends iDBTable<SapforProfile> {
@@ -28,8 +29,8 @@ public class SapforProfilesDBTable extends iDBTable<SapforProfile> {
return "профиль SAPFOR"; return "профиль SAPFOR";
} }
@Override @Override
protected DataSetControlForm createUI() { protected DataSetControlForm createUI(JPanel mountPanel) {
return new DataSetControlForm(this) { return new DataSetControlForm(this,mountPanel) {
@Override @Override
public boolean hasCheckBox() { public boolean hasCheckBox() {
return true; return true;

6
src/_VisualDVM/GlobalData/SapforProfileSetting/SapforProfileSettingsDBTable.java
View File

@@ -2,6 +2,8 @@ package _VisualDVM.GlobalData.SapforProfileSetting;
import Common.Database.Tables.iDBTable; import Common.Database.Tables.iDBTable;
import Common.Visual.DataSetControlForm; import Common.Visual.DataSetControlForm;
import _VisualDVM.Current; import _VisualDVM.Current;
import javax.swing.*;
public class SapforProfileSettingsDBTable extends iDBTable<SapforProfileSetting> { public class SapforProfileSettingsDBTable extends iDBTable<SapforProfileSetting> {
public SapforProfileSettingsDBTable() { public SapforProfileSettingsDBTable() {
super(SapforProfileSetting.class); super(SapforProfileSetting.class);
@@ -11,8 +13,8 @@ public class SapforProfileSettingsDBTable extends iDBTable<SapforProfileSetting>
return false; return false;
} }
@Override @Override
protected DataSetControlForm createUI() { protected DataSetControlForm createUI(JPanel mountPanel) {
return new DataSetControlForm(this) { return new DataSetControlForm(this,mountPanel) {
@Override @Override
protected void AdditionalInitColumns() { protected void AdditionalInitColumns() {
columns.get(0).setVisible(false); columns.get(0).setVisible(false);

5
src/_VisualDVM/GlobalData/Tasks/CompilationTask/CompilationTasksDBTable.java
View File

@@ -14,6 +14,7 @@ import _VisualDVM.Global;
import _VisualDVM.GlobalData.Tasks.RunTask.RunTask; import _VisualDVM.GlobalData.Tasks.RunTask.RunTask;
import _VisualDVM.Passes.PassCode; import _VisualDVM.Passes.PassCode;
import javax.swing.*;
import java.util.LinkedHashMap; import java.util.LinkedHashMap;
public class CompilationTasksDBTable extends iDBTable<CompilationTask> { public class CompilationTasksDBTable extends iDBTable<CompilationTask> {
public CompilationTasksDBTable() { public CompilationTasksDBTable() {
@@ -34,8 +35,8 @@ public class CompilationTasksDBTable extends iDBTable<CompilationTask> {
return res; return res;
} }
@Override @Override
protected DataSetControlForm createUI() { protected DataSetControlForm createUI(JPanel mountPanel) {
return new DataSetControlForm(this) { return new DataSetControlForm(this,mountPanel) {
@Override @Override
public boolean hasCheckBox() { public boolean hasCheckBox() {
return true; return true;

6
src/_VisualDVM/GlobalData/Tasks/RunTask/RunTasksDBTable.java
View File

@@ -8,6 +8,8 @@ import Common.Visual.Tables.RendererStatusEnum;
import _VisualDVM.Current; import _VisualDVM.Current;
import _VisualDVM.Global; import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode; import _VisualDVM.Passes.PassCode;
import javax.swing.*;
public class RunTasksDBTable extends iDBTable<RunTask> { public class RunTasksDBTable extends iDBTable<RunTask> {
public RunTasksDBTable() { public RunTasksDBTable() {
super(RunTask.class); super(RunTask.class);
@@ -21,8 +23,8 @@ public class RunTasksDBTable extends iDBTable<RunTask> {
return "задачи на запуск"; return "задачи на запуск";
} }
@Override @Override
protected DataSetControlForm createUI() { protected DataSetControlForm createUI(JPanel mountPanel) {
return new DataSetControlForm(this) { return new DataSetControlForm(this,mountPanel) {
@Override @Override
public boolean hasCheckBox() { public boolean hasCheckBox() {
return true; return true;

5
src/_VisualDVM/GlobalData/User/UsersDBTable.java
View File

@@ -17,6 +17,7 @@ import _VisualDVM.GlobalData.Tasks.RunTask.RunTask;
import _VisualDVM.GlobalData.User.UI.UserFields; import _VisualDVM.GlobalData.User.UI.UserFields;
import _VisualDVM.Passes.PassCode; import _VisualDVM.Passes.PassCode;
import javax.swing.*;
import java.util.LinkedHashMap; import java.util.LinkedHashMap;
public class UsersDBTable extends iDBTable<User> { public class UsersDBTable extends iDBTable<User> {
public UsersDBTable() { public UsersDBTable() {
@@ -73,8 +74,8 @@ public class UsersDBTable extends iDBTable<User> {
}; };
} }
@Override @Override
protected DataSetControlForm createUI() { protected DataSetControlForm createUI(JPanel mountPanel) {
return new DataSetControlForm(this) { return new DataSetControlForm(this,mountPanel) {
@Override @Override
protected void AdditionalInitColumns() { protected void AdditionalInitColumns() {
columns.get(0).setVisible(false); columns.get(0).setVisible(false);

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.DataSetControlForm;
import Common.Visual.Menus.DataMenuBar; import Common.Visual.Menus.DataMenuBar;
import _VisualDVM.Current; import _VisualDVM.Current;
import javax.swing.*;
public class ArraysDBTable extends DBTable<String, DBArray> { public class ArraysDBTable extends DBTable<String, DBArray> {
public ArraysDBTable() { public ArraysDBTable() {
super(String.class, DBArray.class); super(String.class, DBArray.class);
@@ -17,8 +19,8 @@ public class ArraysDBTable extends DBTable<String, DBArray> {
return "сохранённые состояния"; return "сохранённые состояния";
} }
@Override @Override
protected DataSetControlForm createUI() { protected DataSetControlForm createUI(JPanel mountPanel) {
return new DataSetControlForm(this) { return new DataSetControlForm(this,mountPanel) {
@Override @Override
public boolean hasCheckBox() { public boolean hasCheckBox() {
return true; 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 Common.Visual.Tables.RendererWrapText;
import _VisualDVM.Global; import _VisualDVM.Global;
import javax.swing.*;
import javax.swing.table.TableModel; import javax.swing.table.TableModel;
import javax.swing.table.TableRowSorter; import javax.swing.table.TableRowSorter;
import java.util.Comparator; import java.util.Comparator;
@@ -17,9 +18,9 @@ public class MessagesDBTable<M extends Message> extends iDBTable<M> {
super(d_in); super(d_in);
} }
@Override @Override
protected DataSetControlForm createUI() { protected DataSetControlForm createUI(JPanel mountPanel) {
DataSet dataset = this; DataSet dataset = this;
return new DataSetControlForm(this) { return new DataSetControlForm(this,mountPanel) {
@Override @Override
public void ShowCurrentObject() throws Exception { public void ShowCurrentObject() throws Exception {
super.ShowCurrentObject(); super.ShowCurrentObject();
@@ -36,8 +37,8 @@ public class MessagesDBTable<M extends Message> extends iDBTable<M> {
ShowCurrentObject(); ShowCurrentObject();
} }
@Override @Override
public void CreateControl() { protected void createControl() {
super.CreateControl(); super.createControl();
columnsFilters.put(3, new ColumnFilter(dataset, 3)); columnsFilters.put(3, new ColumnFilter(dataset, 3));
control.setRowSorter(null); control.setRowSorter(null);
TableRowSorter<TableModel> sorter = new TableRowSorter<>(control.getModel()); 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.Current;
import _VisualDVM.GlobalData.Settings.SettingName; import _VisualDVM.GlobalData.Settings.SettingName;
import _VisualDVM.Passes.PassCode; import _VisualDVM.Passes.PassCode;
import javax.swing.*;
public class RecommendationsDBTable extends iDBTable<MessageRecommendation> { public class RecommendationsDBTable extends iDBTable<MessageRecommendation> {
//group=1 - настройка //group=1 - настройка
//group=2 - преобразование //group=2 - преобразование
@@ -13,8 +15,8 @@ public class RecommendationsDBTable extends iDBTable<MessageRecommendation> {
// setUIContent(UI.getMainWindow().errorsPanel); // setUIContent(UI.getMainWindow().errorsPanel);
} }
@Override @Override
protected DataSetControlForm createUI() { protected DataSetControlForm createUI(JPanel mountPanel) {
return new DataSetControlForm(this) { return new DataSetControlForm(this,mountPanel) {
@Override @Override
protected void AdditionalInitColumns() { protected void AdditionalInitColumns() {
columns.get(0).setVisible(false); 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.EditorFilesHyperlinks;
import _VisualDVM.Visual.Tables.RendererHyperlinks; import _VisualDVM.Visual.Tables.RendererHyperlinks;
import javax.swing.*;
import java.util.Vector; import java.util.Vector;
public class ArraysSet extends DataSet<Long, ProjectArray> { public class ArraysSet extends DataSet<Long, ProjectArray> {
public ArraysSet() { public ArraysSet() {
@@ -27,8 +28,8 @@ public class ArraysSet extends DataSet<Long, ProjectArray> {
return Current.ProjectArray; return Current.ProjectArray;
} }
@Override @Override
protected DataSetControlForm createUI() { protected DataSetControlForm createUI(JPanel mountPanel) {
return new DataSetControlForm(this) { return new DataSetControlForm(this,mountPanel) {
@Override @Override
public boolean hasCheckBox() { public boolean hasCheckBox() {
return true; 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.ProjectArray;
import _VisualDVM.ProjectData.SapforData.Arrays.Templates.TemplateDimension; import _VisualDVM.ProjectData.SapforData.Arrays.Templates.TemplateDimension;
import javax.swing.*;
import java.awt.*; import java.awt.*;
import java.util.Vector; import java.util.Vector;
public class DimensionsTableForm extends ControlForm<StyledTable> { public class DimensionsTableForm extends ControlForm<StyledTable> {
public DimensionsTableForm() { public DimensionsTableForm(JPanel mountPanel_in) {
super(StyledTable.class); super(StyledTable.class,mountPanel_in);
} }
@Override @Override
public void Show() { protected void createControl() {
super.Show();
content.add(scroll, BorderLayout.CENTER);
content.updateUI();
}
@Override
public void Clear() {
super.Clear();
UI.Clear(content);
}
@Override
public void CreateControl() {
Vector<String> columns = new Vector<>(); Vector<String> columns = new Vector<>();
columns.add("шаблон"); columns.add("шаблон");
for (int i = 0; i < Global.mainModule.getProject().maxdim; ++i) 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; package _VisualDVM.ProjectData.SapforData.Functions.UI.Graph;
import Common.Visual.ControlForm; import Common.Visual.ControlForm;
import Common.Visual.UI;
import _VisualDVM.Global; import _VisualDVM.Global;
import com.mxgraph.swing.mxGraphComponent; import com.mxgraph.swing.mxGraphComponent;
import java.awt.*; import javax.swing.*;
public class FunctionsGraphForm extends ControlForm<mxGraphComponent> { public class FunctionsGraphForm extends ControlForm<mxGraphComponent> {
public FunctionsGraphForm() { public FunctionsGraphForm(JPanel mountPanel_in) {
super(mxGraphComponent.class); super(mxGraphComponent.class, mountPanel_in);
} }
@Override @Override
public void CreateControl() { protected void createControl() {
control = Global.mainModule.getProject().DrawFunctionsGraph(); 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 Common.Visual.Tables.RendererTopLeft;
import _VisualDVM.Current; import _VisualDVM.Current;
import javax.swing.*;
import java.math.BigInteger; import java.math.BigInteger;
public class RegionsSet extends DataSet<BigInteger, ParallelRegion> { public class RegionsSet extends DataSet<BigInteger, ParallelRegion> {
//суррогат. нужен только для сохры столбцов. во всяком случае пока. //суррогат. нужен только для сохры столбцов. во всяком случае пока.
@@ -24,8 +25,8 @@ public class RegionsSet extends DataSet<BigInteger, ParallelRegion> {
return "области распараллеливания"; return "области распараллеливания";
} }
@Override @Override
protected DataSetControlForm createUI() { protected DataSetControlForm createUI(JPanel mountPanel) {
return new DataSetControlForm(this) { return new DataSetControlForm(this,mountPanel) {
@Override @Override
protected void AdditionalInitColumns() { protected void AdditionalInitColumns() {
columns.get(0).setVisible(false); 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.Current;
import _VisualDVM.Passes.PassCode; import _VisualDVM.Passes.PassCode;
import _VisualDVM.ProjectData.SapforData.Variants.UI.RendererVariantRank; import _VisualDVM.ProjectData.SapforData.Variants.UI.RendererVariantRank;
import javax.swing.*;
public class VariantsSet extends DataSet<String, ParallelVariant> { public class VariantsSet extends DataSet<String, ParallelVariant> {
public VariantsSet() { public VariantsSet() {
super(String.class, ParallelVariant.class); super(String.class, ParallelVariant.class);
@@ -17,8 +19,8 @@ public class VariantsSet extends DataSet<String, ParallelVariant> {
return "варианты"; return "варианты";
} }
@Override @Override
protected DataSetControlForm createUI() { protected DataSetControlForm createUI(JPanel mountPanel) {
return new DataSetControlForm(this) { return new DataSetControlForm(this,mountPanel) {
@Override @Override
public boolean hasCheckBox() { public boolean hasCheckBox() {
return true; return true;

8
src/_VisualDVM/Repository/BugReport/BugReportsDBTable.java
View File

@@ -29,8 +29,8 @@ public class BugReportsDBTable extends DBTable<String, BugReport> {
return "отчёты об ошибках"; return "отчёты об ошибках";
} }
@Override @Override
protected DataSetControlForm createUI() { protected DataSetControlForm createUI(JPanel mountPanel) {
return new DataSetControlForm(this) { return new DataSetControlForm(this,mountPanel) {
@Override @Override
public void ShowCurrentObject() throws Exception { public void ShowCurrentObject() throws Exception {
super.ShowCurrentObject(); super.ShowCurrentObject();
@@ -54,9 +54,9 @@ public class BugReportsDBTable extends DBTable<String, BugReport> {
Global.mainModule.getPass(PassCode.OpenBugReportTestProject).Do(); Global.mainModule.getPass(PassCode.OpenBugReportTestProject).Do();
} }
@Override @Override
public void CreateControl() { protected void createControl() {
//https://stackoverflow.com/questions/9091208/jtable-enter-key //https://stackoverflow.com/questions/9091208/jtable-enter-key
super.CreateControl(); super.createControl();
final String solve = "Solve"; final String solve = "Solve";
KeyStroke enter = KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, 0); KeyStroke enter = KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, 0);
control.getInputMap(JTable.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT).put(enter, solve); control.getInputMap(JTable.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT).put(enter, solve);

5
src/_VisualDVM/Repository/Component/ComponentsSet.java
View File

@@ -11,6 +11,7 @@ import _VisualDVM.Current;
import _VisualDVM.Global; import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode; import _VisualDVM.Passes.PassCode;
import javax.swing.*;
import java.util.Vector; import java.util.Vector;
public class ComponentsSet extends DataSet<ComponentType, Component> { public class ComponentsSet extends DataSet<ComponentType, Component> {
public ComponentsSet() { public ComponentsSet() {
@@ -25,8 +26,8 @@ public class ComponentsSet extends DataSet<ComponentType, Component> {
return "компоненты"; return "компоненты";
} }
@Override @Override
protected DataSetControlForm createUI() { protected DataSetControlForm createUI(JPanel mountPanel) {
return new DataSetControlForm(this) { return new DataSetControlForm(this,mountPanel) {
@Override @Override
public boolean hasCheckBox() { public boolean hasCheckBox() {
return true; return true;

6
src/_VisualDVM/Repository/SubscriberWorkspace/SubscriberWorkspaceDBTable.java
View File

@@ -5,6 +5,8 @@ import Common.Visual.DataSetControlForm;
import Common.Visual.Menus.DataMenuBar; import Common.Visual.Menus.DataMenuBar;
import _VisualDVM.Current; import _VisualDVM.Current;
import _VisualDVM.Passes.PassCode; import _VisualDVM.Passes.PassCode;
import javax.swing.*;
public class SubscriberWorkspaceDBTable extends iDBTable<SubscriberWorkspace> { public class SubscriberWorkspaceDBTable extends iDBTable<SubscriberWorkspace> {
public SubscriberWorkspaceDBTable() { public SubscriberWorkspaceDBTable() {
super(SubscriberWorkspace.class); super(SubscriberWorkspace.class);
@@ -34,8 +36,8 @@ public class SubscriberWorkspaceDBTable extends iDBTable<SubscriberWorkspace> {
return new String[]{"URL", "пользователь", "папка"}; return new String[]{"URL", "пользователь", "папка"};
} }
@Override @Override
protected DataSetControlForm createUI() { protected DataSetControlForm createUI(JPanel mountPanel) {
return new DataSetControlForm(this); return new DataSetControlForm(this,mountPanel);
} }
@Override @Override
public Object getFieldAt(SubscriberWorkspace object, int columnIndex) { public Object getFieldAt(SubscriberWorkspace object, int columnIndex) {

5
src/_VisualDVM/Repository/Subscribes/SubsribersDBTable.java
View File

@@ -16,6 +16,7 @@ import _VisualDVM.Repository.SubscriberWorkspace.SubscriberWorkspace;
import _VisualDVM.Repository.Subscribes.UI.SubscriberFields; import _VisualDVM.Repository.Subscribes.UI.SubscriberFields;
import _VisualDVM.Repository.Subscribes.UI.SubscriberForm; import _VisualDVM.Repository.Subscribes.UI.SubscriberForm;
import javax.swing.*;
import java.util.LinkedHashMap; import java.util.LinkedHashMap;
public class SubsribersDBTable extends DBTable<String, Subscriber> { public class SubsribersDBTable extends DBTable<String, Subscriber> {
public SubsribersDBTable() { public SubsribersDBTable() {
@@ -30,8 +31,8 @@ public class SubsribersDBTable extends DBTable<String, Subscriber> {
return "адресаты"; return "адресаты";
} }
@Override @Override
protected DataSetControlForm createUI() { protected DataSetControlForm createUI(JPanel mountPanel) {
return new DataSetControlForm(this) { return new DataSetControlForm(this,mountPanel) {
@Override @Override
public boolean hasCheckBox() { public boolean hasCheckBox() {
return true; return true;

4
src/_VisualDVM/TestingSystem/Common/Group/GroupsDBTable.java
View File

@@ -75,8 +75,8 @@ public class GroupsDBTable extends iDBTable<Group> {
return res; return res;
} }
@Override @Override
protected DataSetControlForm createUI() { protected DataSetControlForm createUI(JPanel mountPanel) {
return new DataSetControlForm(this) { return new DataSetControlForm(this,mountPanel) {
@Override @Override
public boolean hasCheckBox() { public boolean hasCheckBox() {
return true; return true;

5
src/_VisualDVM/TestingSystem/Common/Test/TestDBTable.java
View File

@@ -12,6 +12,7 @@ import _VisualDVM.TestingSystem.Common.Test.UI.AddTestMenu;
import _VisualDVM.TestingSystem.Common.Test.UI.EditTestMenu; import _VisualDVM.TestingSystem.Common.Test.UI.EditTestMenu;
import _VisualDVM.TestingSystem.Common.Test.UI.TestFields; import _VisualDVM.TestingSystem.Common.Test.UI.TestFields;
import javax.swing.*;
import java.util.Vector; import java.util.Vector;
public class TestDBTable extends iDBTable<Test> { public class TestDBTable extends iDBTable<Test> {
public TestDBTable() { public TestDBTable() {
@@ -26,8 +27,8 @@ public class TestDBTable extends iDBTable<Test> {
return "тесты"; return "тесты";
} }
@Override @Override
protected DataSetControlForm createUI() { protected DataSetControlForm createUI(JPanel mountPanel) {
return new DataSetControlForm(this) { return new DataSetControlForm(this,mountPanel) {
@Override @Override
protected void AdditionalInitColumns() { protected void AdditionalInitColumns() {
//columns.get(0).setVisible(false); //columns.get(0).setVisible(false);

6
src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/DVMConfigurationDBTable.java
View File

@@ -12,6 +12,8 @@ import _VisualDVM.Passes.PassCode;
import _VisualDVM.ServerObjectsCache.ConfigurationCache; import _VisualDVM.ServerObjectsCache.ConfigurationCache;
import _VisualDVM.ServerObjectsCache.VisualCaches; import _VisualDVM.ServerObjectsCache.VisualCaches;
import _VisualDVM.TestingSystem.DVM.DVMConfiguration.UI.ConfigurationFields; import _VisualDVM.TestingSystem.DVM.DVMConfiguration.UI.ConfigurationFields;
import javax.swing.*;
public class DVMConfigurationDBTable extends iDBTable<DVMConfiguration> { public class DVMConfigurationDBTable extends iDBTable<DVMConfiguration> {
public DVMConfigurationDBTable() { public DVMConfigurationDBTable() {
super(DVMConfiguration.class); super(DVMConfiguration.class);
@@ -29,8 +31,8 @@ public class DVMConfigurationDBTable extends iDBTable<DVMConfiguration> {
return "конфигурации"; return "конфигурации";
} }
@Override @Override
protected DataSetControlForm createUI() { protected DataSetControlForm createUI(JPanel mountPanel) {
return new DataSetControlForm(this) { return new DataSetControlForm(this,mountPanel) {
@Override @Override
public boolean hasCheckBox() { public boolean hasCheckBox() {
return true; return true;

4
src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackageDBTable.java
View File

@@ -37,8 +37,8 @@ public class DVMPackageDBTable extends iDBTable<DVMPackage> {
return "пакеты"; return "пакеты";
} }
@Override @Override
protected DataSetControlForm createUI() { protected DataSetControlForm createUI(JPanel mountPanel) {
return new DataSetControlForm(this) { return new DataSetControlForm(this,mountPanel) {
@Override @Override
public boolean hasCheckBox() { public boolean hasCheckBox() {
return true; return true;

6
src/_VisualDVM/TestingSystem/DVM/DVMSettings/DVMSettingsDBTable.java
View File

@@ -9,6 +9,8 @@ import _VisualDVM.Current;
import _VisualDVM.Global; import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode; import _VisualDVM.Passes.PassCode;
import _VisualDVM.TestingSystem.DVM.DVMSettings.UI.DVMSettingsFields; import _VisualDVM.TestingSystem.DVM.DVMSettings.UI.DVMSettingsFields;
import javax.swing.*;
public class DVMSettingsDBTable extends iDBTable<DVMSettings> { public class DVMSettingsDBTable extends iDBTable<DVMSettings> {
public DVMSettingsDBTable() { public DVMSettingsDBTable() {
super(DVMSettings.class); super(DVMSettings.class);
@@ -68,8 +70,8 @@ public class DVMSettingsDBTable extends iDBTable<DVMSettings> {
} }
//- //-
@Override @Override
protected DataSetControlForm createUI() { protected DataSetControlForm createUI(JPanel mountPanel) {
return new DataSetControlForm(this) { return new DataSetControlForm(this,mountPanel) {
@Override @Override
public boolean hasCheckBox() { public boolean hasCheckBox() {
return true; return true;

5
src/_VisualDVM/TestingSystem/DVM/DVMTasks/DVMRunTasksSet.java
View File

@@ -11,6 +11,7 @@ import _VisualDVM.GlobalData.Tasks.TaskState;
import _VisualDVM.Passes.PassCode; import _VisualDVM.Passes.PassCode;
import _VisualDVM.TestingSystem.DVM.DVMPackage.DVMPackage; import _VisualDVM.TestingSystem.DVM.DVMPackage.DVMPackage;
import javax.swing.*;
import java.util.Comparator; import java.util.Comparator;
public class DVMRunTasksSet extends DataSet<Integer, DVMRunTask> { public class DVMRunTasksSet extends DataSet<Integer, DVMRunTask> {
//todo обобщить бы наличие фильтров для всех таблиц. //todo обобщить бы наличие фильтров для всех таблиц.
@@ -60,8 +61,8 @@ public class DVMRunTasksSet extends DataSet<Integer, DVMRunTask> {
return "задачи"; return "задачи";
} }
@Override @Override
protected DataSetControlForm createUI() { protected DataSetControlForm createUI(JPanel mountPanel) {
return new DataSetControlForm(this) { return new DataSetControlForm(this,mountPanel) {
@Override @Override
public boolean hasCheckBox() { public boolean hasCheckBox() {
return true; return true;

5
src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationDBTable.java
View File

@@ -14,6 +14,7 @@ import _VisualDVM.TestingSystem.SAPFOR.SapforConfiguration.UI.SapforConfiguratio
import _VisualDVM.Visual.Tables.RendererConfigurationAuto; import _VisualDVM.Visual.Tables.RendererConfigurationAuto;
import _VisualDVM.Visual.Tables.SwitcherConfigurationAuto; import _VisualDVM.Visual.Tables.SwitcherConfigurationAuto;
import javax.swing.*;
import java.util.Vector; import java.util.Vector;
public class SapforConfigurationDBTable extends iDBTable<SapforConfiguration> { public class SapforConfigurationDBTable extends iDBTable<SapforConfiguration> {
public SapforConfigurationDBTable() { public SapforConfigurationDBTable() {
@@ -32,8 +33,8 @@ public class SapforConfigurationDBTable extends iDBTable<SapforConfiguration> {
return "конфигурации"; return "конфигурации";
} }
@Override @Override
protected DataSetControlForm createUI() { protected DataSetControlForm createUI(JPanel mountPanel) {
return new DataSetControlForm(this) { return new DataSetControlForm(this,mountPanel) {
@Override @Override
public boolean hasCheckBox() { public boolean hasCheckBox() {
return true; return true;

4
src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/SapforPackageDBTable.java
View File

@@ -37,8 +37,8 @@ public class SapforPackageDBTable extends iDBTable<SapforPackage> {
return "пакеты"; return "пакеты";
} }
@Override @Override
protected DataSetControlForm createUI() { protected DataSetControlForm createUI(JPanel mountPanel) {
return new DataSetControlForm(this) { return new DataSetControlForm(this,mountPanel) {
@Override @Override
public boolean hasCheckBox() { public boolean hasCheckBox() {
return true; return true;

5
src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/SapforSettingsDBTable.java
View File

@@ -14,6 +14,7 @@ import _VisualDVM.Passes.PassCode;
import _VisualDVM.TestingSystem.SAPFOR.SapforSettings.UI.SapforSettingsFields; import _VisualDVM.TestingSystem.SAPFOR.SapforSettings.UI.SapforSettingsFields;
import _VisualDVM.TestingSystem.SAPFOR.SapforSettingsCommand.SapforSettingsCommand; import _VisualDVM.TestingSystem.SAPFOR.SapforSettingsCommand.SapforSettingsCommand;
import javax.swing.*;
import java.util.LinkedHashMap; import java.util.LinkedHashMap;
public class SapforSettingsDBTable extends iDBTable<SapforSettings> { public class SapforSettingsDBTable extends iDBTable<SapforSettings> {
public SapforSettingsDBTable() { public SapforSettingsDBTable() {
@@ -32,8 +33,8 @@ public class SapforSettingsDBTable extends iDBTable<SapforSettings> {
return "параметры тестирования"; return "параметры тестирования";
} }
@Override @Override
protected DataSetControlForm createUI() { protected DataSetControlForm createUI(JPanel mountPanel) {
return new DataSetControlForm(this) { return new DataSetControlForm(this,mountPanel) {
@Override @Override
public boolean hasCheckBox() { public boolean hasCheckBox() {
return true; return true;

5
src/_VisualDVM/TestingSystem/SAPFOR/SapforSettingsCommand/SapforSettingsCommandsDBTable.java
View File

@@ -11,6 +11,7 @@ import _VisualDVM.Passes.PassCode;
import _VisualDVM.TestingSystem.SAPFOR.SapforSettings.SapforSettings; import _VisualDVM.TestingSystem.SAPFOR.SapforSettings.SapforSettings;
import _VisualDVM.TestingSystem.SAPFOR.SapforSettings.UI.SapforSettingsCommandFields; import _VisualDVM.TestingSystem.SAPFOR.SapforSettings.UI.SapforSettingsCommandFields;
import javax.swing.*;
import java.util.Vector; import java.util.Vector;
public class SapforSettingsCommandsDBTable extends iDBTable<SapforSettingsCommand> { public class SapforSettingsCommandsDBTable extends iDBTable<SapforSettingsCommand> {
public SapforSettingsCommandsDBTable() { public SapforSettingsCommandsDBTable() {
@@ -44,8 +45,8 @@ public class SapforSettingsCommandsDBTable extends iDBTable<SapforSettingsComman
return Current.SapforSettingsCommand; return Current.SapforSettingsCommand;
} }
@Override @Override
protected DataSetControlForm createUI() { protected DataSetControlForm createUI(JPanel mountPanel) {
return new DataSetControlForm(this) { return new DataSetControlForm(this,mountPanel) {
@Override @Override
public boolean hasCheckBox() { public boolean hasCheckBox() {
return true; return true;

5
src/_VisualDVM/TestingSystem/SAPFOR/ServerSapfor/ServerSapforsDBTable.java
View File

@@ -9,6 +9,7 @@ import _VisualDVM.Current;
import _VisualDVM.Global; import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode; import _VisualDVM.Passes.PassCode;
import javax.swing.*;
import java.util.Comparator; import java.util.Comparator;
public class ServerSapforsDBTable extends iDBTable<ServerSapfor> { public class ServerSapforsDBTable extends iDBTable<ServerSapfor> {
public ServerSapforsDBTable() { public ServerSapforsDBTable() {
@@ -45,8 +46,8 @@ public class ServerSapforsDBTable extends iDBTable<ServerSapfor> {
return null; return null;
} }
@Override @Override
protected DataSetControlForm createUI() { protected DataSetControlForm createUI(JPanel mountPanel) {
return new DataSetControlForm(this) { return new DataSetControlForm(this,mountPanel) {
@Override @Override
protected void AdditionalInitColumns() { protected void AdditionalInitColumns() {
// columns.get(0).setVisible(false); // columns.get(0).setVisible(false);

9
src/_VisualDVM/Visual/Windows/FileForm.form
View File

@@ -230,8 +230,7 @@
<properties/> <properties/>
<border type="none"/> <border type="none"/>
<children> <children>
<grid id="f6da5" binding="loopsGraphPanel" custom-create="true" layout-manager="GridLayoutManager" row-count="1" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1"> <grid id="f6da5" binding="loopsGraphPanel" layout-manager="BorderLayout" hgap="0" vgap="0">
<margin top="0" left="0" bottom="0" right="0"/>
<constraints> <constraints>
<grid row="0" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/> <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
</constraints> </constraints>
@@ -251,8 +250,7 @@
<properties/> <properties/>
<border type="none"/> <border type="none"/>
<children> <children>
<grid id="f80d0" binding="functionsGraphPanel" custom-create="true" layout-manager="GridLayoutManager" row-count="1" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1"> <grid id="f80d0" binding="functionsGraphPanel" layout-manager="BorderLayout" hgap="0" vgap="0">
<margin top="0" left="0" bottom="0" right="0"/>
<constraints> <constraints>
<grid row="0" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/> <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
</constraints> </constraints>
@@ -272,8 +270,7 @@
<properties/> <properties/>
<border type="none"/> <border type="none"/>
<children> <children>
<grid id="1d5e4" binding="arraysGraphPanel" custom-create="true" layout-manager="GridLayoutManager" row-count="1" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1"> <grid id="1d5e4" binding="arraysGraphPanel" layout-manager="BorderLayout" hgap="0" vgap="0">
<margin top="0" left="0" bottom="0" right="0"/>
<constraints> <constraints>
<grid row="0" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/> <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
</constraints> </constraints>

13
src/_VisualDVM/Visual/Windows/FileForm.java
View File

@@ -76,6 +76,11 @@ public class FileForm implements FileWindow, FormWithSplitters {
MessageNote.filterValue = ""; MessageNote.filterValue = "";
//- //-
file = file_in; file = file_in;
//--
loopsForm = new TreeForm(FileLoopsTree.class, loopsGraphPanel);
functionsForm = new TreeForm(FileFunctionsTree.class, functionsGraphPanel);
arraysForm = new TreeForm(FileArraysTree.class, arraysGraphPanel);
//--
file.father.db.notes.mountUI(notesPanel); file.father.db.notes.mountUI(notesPanel);
file.father.db.warnings.mountUI(warningsPanel); file.father.db.warnings.mountUI(warningsPanel);
file.father.db.errors.mountUI(errorsPanel); file.father.db.errors.mountUI(errorsPanel);
@@ -332,7 +337,7 @@ public class FileForm implements FileWindow, FormWithSplitters {
} }
@Override @Override
public void ShowFirstError() { public void ShowFirstError() {
if (file.father.db.errors.ui_.control.getRowCount() > 0) if (file.father.db.errors.ui_.getRowCount() > 0)
file.father.db.errors.ui_.control.SelectRow(0); file.father.db.errors.ui_.control.SelectRow(0);
} }
@Override @Override
@@ -351,12 +356,6 @@ public class FileForm implements FileWindow, FormWithSplitters {
public void ShowNoRunOutput() { public void ShowNoRunOutput() {
runOutput.setText(""); runOutput.setText("");
} }
private void createUIComponents() {
// TODO: place custom component creation code here
loopsGraphPanel = (loopsForm = new TreeForm(FileLoopsTree.class)).getContent();
functionsGraphPanel = (functionsForm = new TreeForm(FileFunctionsTree.class)).getContent();
arraysGraphPanel = (arraysForm = new TreeForm(FileArraysTree.class)).getContent();
}
@Override @Override
public JPanel getContent() { public JPanel getContent() {
return content; return content;

2
src/_VisualDVM/Visual/Windows/FunctionsForm.form
View File

@@ -258,7 +258,7 @@
</component> </component>
</children> </children>
</toolbar> </toolbar>
<grid id="9d9dc" binding="functionsGraphPanel" custom-create="true" layout-manager="BorderLayout" hgap="0" vgap="0"> <grid id="9d9dc" binding="functionsGraphPanel" layout-manager="BorderLayout" hgap="0" vgap="0">
<constraints border-constraint="Center"/> <constraints border-constraint="Center"/>
<properties> <properties>
<background color="-4144960"/> <background color="-4144960"/>

2
src/_VisualDVM/Visual/Windows/FunctionsForm.java
View File

@@ -42,6 +42,7 @@ public class FunctionsForm implements FunctionsWindow {
private FunctionsGraphForm functionsGraphForm; private FunctionsGraphForm functionsGraphForm;
public FunctionsForm() { public FunctionsForm() {
LoadSplitters(); LoadSplitters();
functionsGraphForm = new FunctionsGraphForm(functionsGraphPanel);
bZoomIn.addActionListener(new ActionListener() { bZoomIn.addActionListener(new ActionListener() {
@Override @Override
public void actionPerformed(ActionEvent e) { public void actionPerformed(ActionEvent e) {
@@ -188,7 +189,6 @@ public class FunctionsForm implements FunctionsWindow {
} }
private void createUIComponents() { private void createUIComponents() {
// TODO: place custom component creation code here // TODO: place custom component creation code here
functionsGraphPanel = (functionsGraphForm = new FunctionsGraphForm()).getContent();
filterName = new StyledTextField(); filterName = new StyledTextField();
} }
} }

16
src/_VisualDVM/Visual/Windows/ProjectForm.java
View File

@@ -102,13 +102,13 @@ public class ProjectForm implements FormWithSplitters, ProjectWindow {
} }
private void createUIComponents() { private void createUIComponents() {
// TODO: place custom component creation code here // TODO: place custom component creation code here
filesForm = new TreeForm(FilesTree.class); filesForm = new TreeForm(FilesTree.class, new JPanel(new BorderLayout()));
projectDescription = new Viewer(); projectDescription = new Viewer();
logText = new Viewer(); logText = new Viewer();
logScroll = new JScrollPane(logText); logScroll = new JScrollPane(logText);
includesForm = new TreeForm(IncludesTree.class); includesForm = new TreeForm(IncludesTree.class, new JPanel(new BorderLayout()));
inlineForm = new TreeForm(InlineTree.class); inlineForm = new TreeForm(InlineTree.class, new JPanel(new BorderLayout()));
inlineForm2 = new TreeForm(InlineTree2.class); inlineForm2 = new TreeForm(InlineTree2.class, new JPanel(new BorderLayout()));
} }
@Override @Override
public void RefreshProjectFiles() { public void RefreshProjectFiles() {
@@ -262,16 +262,16 @@ public class ProjectForm implements FormWithSplitters, ProjectWindow {
menuBar.getProjectViewMenu().setIcon(Utils_.getIcon(view.getIcon())); menuBar.getProjectViewMenu().setIcon(Utils_.getIcon(view.getIcon()));
switch (view) { switch (view) {
case Files: case Files:
projectViewPanel.add(filesForm.getContent()); projectViewPanel.add(filesForm.getMountPanel());
break; break;
case Includes: case Includes:
projectViewPanel.add(includesForm.getContent()); projectViewPanel.add(includesForm.getMountPanel());
break; break;
case FunctionsHierarchy: case FunctionsHierarchy:
projectViewPanel.add(inlineForm2.getContent()); projectViewPanel.add(inlineForm2.getMountPanel());
break; break;
case FunctionsCallsPoints: case FunctionsCallsPoints:
projectViewPanel.add(inlineForm.getContent()); projectViewPanel.add(inlineForm.getMountPanel());
break; break;
} }
projectViewPanel.revalidate(); projectViewPanel.revalidate();

5
src/_VisualDVM/Visual/Windows/VariantsForm.form
View File

@@ -139,7 +139,7 @@
</component> </component>
</children> </children>
</toolbar> </toolbar>
<grid id="c476f" binding="dimensionsPanel" custom-create="true" layout-manager="BorderLayout" hgap="0" vgap="0"> <grid id="c476f" binding="dimensionsPanel" layout-manager="BorderLayout" hgap="0" vgap="0">
<constraints border-constraint="Center"/> <constraints border-constraint="Center"/>
<properties/> <properties/>
<border type="none"/> <border type="none"/>
@@ -159,8 +159,7 @@
</properties> </properties>
<border type="none"/> <border type="none"/>
<children> <children>
<grid id="d862" binding="distributionPanel" custom-create="true" layout-manager="GridLayoutManager" row-count="1" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1"> <grid id="d862" binding="distributionPanel" layout-manager="BorderLayout" hgap="0" vgap="0">
<margin top="0" left="0" bottom="0" right="0"/>
<constraints> <constraints>
<grid row="0" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/> <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
</constraints> </constraints>

7
src/_VisualDVM/Visual/Windows/VariantsForm.java
View File

@@ -29,6 +29,8 @@ public class VariantsForm implements VariantsWindow {
public VariantsForm() { public VariantsForm() {
LoadSplitters(); LoadSplitters();
Global.mainModule.getProject().parallelVariants.mountUI(variantsPanel); Global.mainModule.getProject().parallelVariants.mountUI(variantsPanel);
distributionForm1 = new TreeForm(RulesTree.class, distributionPanel);
dimensionsForm = new DimensionsTableForm(dimensionsPanel);
//- //-
BDistributed.addActionListener(new ActionListener() { BDistributed.addActionListener(new ActionListener() {
@Override @Override
@@ -49,11 +51,6 @@ public class VariantsForm implements VariantsWindow {
} }
}); });
} }
private void createUIComponents() {
// TODO: place custom component creation code here
distributionPanel = (distributionForm1 = new TreeForm(RulesTree.class)).getContent();
dimensionsPanel = (dimensionsForm = new DimensionsTableForm()).getContent();
}
@Override @Override
public JPanel getContent() { public JPanel getContent() {
return content; return content;

2
src/_VisualDVM/Visual/Windows/VersionsForm.form
View File

@@ -30,7 +30,7 @@
</properties> </properties>
<border type="none"/> <border type="none"/>
<children> <children>
<grid id="3dd9a" binding="versionsPanel" custom-create="true" layout-manager="BorderLayout" hgap="0" vgap="0"> <grid id="3dd9a" binding="versionsPanel" layout-manager="BorderLayout" hgap="0" vgap="0">
<constraints border-constraint="Center"/> <constraints border-constraint="Center"/>
<properties/> <properties/>
<border type="none"/> <border type="none"/>

5
src/_VisualDVM/Visual/Windows/VersionsForm.java
View File

@@ -28,6 +28,7 @@ public class VersionsForm implements FormWithSplitters, VersionsWindow {
public VersionsForm(db_project_info root_in) { public VersionsForm(db_project_info root_in) {
LoadSplitters(); LoadSplitters();
root = root_in; root = root_in;
versionsTreeForm = new TreeForm(VersionsTree.class, versionsPanel);
MasterComparsionForm = new VersionsComparisonForm(SlaveComparsionForm = new VersionsComparisonForm(null)); MasterComparsionForm = new VersionsComparisonForm(SlaveComparsionForm = new VersionsComparisonForm(null));
SC9.setLeftComponent(MasterComparsionForm.getContent()); SC9.setLeftComponent(MasterComparsionForm.getContent());
SC9.setRightComponent(SlaveComparsionForm.getContent()); SC9.setRightComponent(SlaveComparsionForm.getContent());
@@ -36,10 +37,6 @@ public class VersionsForm implements FormWithSplitters, VersionsWindow {
versionsTabs.setEnabledAt(0, false); versionsTabs.setEnabledAt(0, false);
versionsPanel.add(Global.mainModule.getUI().getVersionsMenuBar(), BorderLayout.NORTH); versionsPanel.add(Global.mainModule.getUI().getVersionsMenuBar(), BorderLayout.NORTH);
} }
private void createUIComponents() {
// TODO: place custom component creation code here
versionsPanel = (versionsTreeForm = new TreeForm(VersionsTree.class)).getContent();
}
@Override @Override
public VariantsWindow getVariantsWindow() { public VariantsWindow getVariantsWindow() {
return variantsForm; return variantsForm;