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-20 17:27:58 +03:00
parent 10422327ba
commit 3f42f61c76
81 changed files with 1637 additions and 1173 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/_VisualDVM/GlobalData/Compiler/CompilersDBTable.java
View File

@@ -13,6 +13,7 @@ import Common.Visual.Windows.Dialog.DBObjectDialog;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.Compiler.UI.CompilerFields;
import _VisualDVM.GlobalData.Compiler.UI.CompilersForm;
import _VisualDVM.GlobalData.Makefile.Makefile;
import _VisualDVM.GlobalData.Module.Module;
import _VisualDVM.GlobalData.RunConfiguration.RunConfiguration;
@@ -121,42 +122,7 @@ public class CompilersDBTable extends iDBTable<Compiler> {
}
@Override
protected DataSetControlForm createUI(JPanel mountPanel) {
return new DataSetControlForm(this, mountPanel) {
@Override
public String[] getUIColumnNames() {
return new String[]{
"описание",
"команда вызова",
"версия",
"ревизия"};
}
@Override
protected void AdditionalInitColumns() {
columns.get(0).setVisible(false);
}
@Override
public void ShowCurrentObject() throws Exception {
super.ShowCurrentObject();
Global.mainModule.getUI().getMainWindow().getTestingWindow().ShowCurrentCompiler();
}
@Override
public void ShowNoCurrentObject() throws Exception {
super.ShowNoCurrentObject();
Global.mainModule.getUI().getMainWindow().getTestingWindow().ShowCurrentCompiler();
}
@Override
public boolean hasCheckBox() {
return true;
}
@Override
public DataMenuBar createMenuBar() {
return new DataMenuBar(getPluralDescription(), PassCode.AddCompiler,
PassCode.EditCompiler,
PassCode.DeleteCompiler,
PassCode.ShowCompilerVersion,
PassCode.ShowCompilerHelp);
}
};
return new CompilersForm(this, mountPanel);
}
@Override
public Current CurrentName() {

48
src/_VisualDVM/GlobalData/Compiler/UI/CompilersForm.java Normal file
View File

@@ -0,0 +1,48 @@
package _VisualDVM.GlobalData.Compiler.UI;
import Common.Database.Tables.DataSet;
import Common.Visual.DataSetControlForm;
import Common.Visual.Menus.DataMenuBar;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.Compiler.Compiler;
import _VisualDVM.Passes.PassCode;
import javax.swing.*;
public class CompilersForm extends DataSetControlForm<Compiler> {
public CompilersForm(DataSet<?, Compiler> dataSource_in, JPanel mountPanel_in) {
super(dataSource_in, mountPanel_in);
}
@Override
public boolean hasCheckBox() {
return true;
}
@Override
public String[] getUIColumnNames() {
return new String[]{
"описание",
"команда вызова",
"версия",
"ревизия"};
}
@Override
protected void AdditionalInitColumns() {
columns.get(0).setVisible(false);
}
@Override
public void ShowCurrentObject() throws Exception {
super.ShowCurrentObject();
Global.mainModule.getUI().getMainWindow().getTestingWindow().ShowCurrentCompiler();
}
@Override
public void ShowNoCurrentObject() throws Exception {
super.ShowNoCurrentObject();
Global.mainModule.getUI().getMainWindow().getTestingWindow().ShowCurrentCompiler();
}
@Override
public DataMenuBar createMenuBar() {
return new DataMenuBar(dataSource.getPluralDescription(), PassCode.AddCompiler,
PassCode.EditCompiler,
PassCode.DeleteCompiler,
PassCode.ShowCompilerVersion,
PassCode.ShowCompilerHelp);
}
}

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

@@ -4,6 +4,7 @@ import Common.Visual.DataSetControlForm;
import Common.Visual.Tables.RendererMultiline;
import _VisualDVM.GlobalData.CompilerEnvironment.UI.CompilerEnvironmentValueEditor;
import _VisualDVM.GlobalData.CompilerEnvironment.UI.CompilerEnvironmentValueRenderer;
import _VisualDVM.GlobalData.CompilerEnvironment.UI.CompilerEnvironmentsForm;
import javax.swing.*;
public class CompilerEnvironmentsSet extends DataSet<String, CompilerEnvironment> {
@@ -12,24 +13,6 @@ public class CompilerEnvironmentsSet extends DataSet<String, CompilerEnvironment
}
@Override
protected DataSetControlForm createUI(JPanel mountPanel) {
return new DataSetControlForm(this, mountPanel) {
@Override
public boolean hasCheckBox() {
return true;
}
@Override
public String[] getUIColumnNames() {
return new String[]{
"Значение", "Описание"
};
}
@Override
protected void AdditionalInitColumns() {
columns.get(2).setRendererClass(CompilerEnvironmentValueRenderer.class);
columns.get(2).setEditorClass(CompilerEnvironmentValueEditor.class);
//-
columns.get(3).setRendererClass(RendererMultiline.class);
}
};
return new CompilerEnvironmentsForm(this, mountPanel);
}
}

28
src/_VisualDVM/GlobalData/CompilerEnvironment/UI/CompilerEnvironmentsForm.java Normal file
View File

@@ -0,0 +1,28 @@
package _VisualDVM.GlobalData.CompilerEnvironment.UI;
import Common.Database.Tables.DataSet;
import Common.Visual.DataSetControlForm;
import Common.Visual.Tables.RendererMultiline;
import _VisualDVM.GlobalData.CompilerEnvironment.CompilerEnvironment;
import javax.swing.*;
public class CompilerEnvironmentsForm extends DataSetControlForm<CompilerEnvironment> {
public CompilerEnvironmentsForm(DataSet<?, CompilerEnvironment> dataSource_in, JPanel mountPanel_in) {
super(dataSource_in, mountPanel_in);
}
@Override
public boolean hasCheckBox() {
return true;
}
@Override
public String[] getUIColumnNames() {
return new String[]{
"Значение", "Описание"
};
}
@Override
protected void AdditionalInitColumns() {
columns.get(2).setRendererClass(CompilerEnvironmentValueRenderer.class);
columns.get(2).setEditorClass(CompilerEnvironmentValueEditor.class);
columns.get(3).setRendererClass(RendererMultiline.class);
}
}

32
src/_VisualDVM/GlobalData/CompilerOption/CompilerOptionsForm.java Normal file
View File

@@ -0,0 +1,32 @@
package _VisualDVM.GlobalData.CompilerOption;
import Common.Database.Tables.DataSet;
import Common.Visual.DataSetControlForm;
import Common.Visual.Tables.RendererMultiline;
import _VisualDVM.GlobalData.CompilerOption.UI.CompilerOptionParameterNameRenderer;
import _VisualDVM.GlobalData.CompilerOption.UI.CompilerOptionParameterValueRenderer;
import javax.swing.*;
public class CompilerOptionsForm extends DataSetControlForm<CompilerOption> {
public CompilerOptionsForm(DataSet<?, CompilerOption> dataSource_in, JPanel mountPanel_in) {
super(dataSource_in, mountPanel_in);
}
@Override
public boolean hasCheckBox() {
return true;
}
@Override
public String[] getUIColumnNames() {
return new String[]{
"Параметр",
"Значение",
"Описание"
};
}
@Override
protected void AdditionalInitColumns() {
columns.get(2).setRendererClass(CompilerOptionParameterNameRenderer.class);
columns.get(3).setRendererClass(CompilerOptionParameterValueRenderer.class);
columns.get(3).setEditorClass(CompilerOptionParameterValueRenderer.class);
columns.get(4).setRendererClass(RendererMultiline.class);
}
}

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

@@ -12,26 +12,6 @@ public class CompilerOptionsSet extends DataSet<String, CompilerOption> {
}
@Override
protected DataSetControlForm createUI(JPanel mountPanel) {
return new DataSetControlForm(this, mountPanel) {
@Override
public boolean hasCheckBox() {
return true;
}
@Override
public String[] getUIColumnNames() {
return new String[]{
"Параметр",
"Значение",
"Описание"
};
}
@Override
protected void AdditionalInitColumns() {
columns.get(2).setRendererClass(CompilerOptionParameterNameRenderer.class);
columns.get(3).setRendererClass(CompilerOptionParameterValueRenderer.class);
columns.get(3).setEditorClass(CompilerOptionParameterValueRenderer.class);
columns.get(4).setRendererClass(RendererMultiline.class);
}
};
return new CompilerOptionsForm(this, mountPanel);
}
}

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

@@ -9,6 +9,7 @@ import Common.Visual.Windows.Dialog.DBObjectDialog;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.DVMParameter.UI.DVMParameterFields;
import _VisualDVM.GlobalData.DVMParameter.UI.DVMParametersForm;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Utils;
@@ -31,26 +32,7 @@ public class DVMParameterDBTable extends iDBTable<DVMParameter> {
}
@Override
protected DataSetControlForm createUI(JPanel mountPanel) {
return new DataSetControlForm(this, mountPanel) {
@Override
public String[] getUIColumnNames() {
return new String[]{
"имя",
"значение"
};
}
@Override
protected void AdditionalInitColumns() {
columns.get(0).setVisible(false);
}
@Override
public DataMenuBar createMenuBar() {
return new DataMenuBar(getPluralDescription(),
PassCode.AddDVMParameter,
PassCode.EditDVMParameter,
PassCode.DeleteDVMParameter);
}
};
return new DVMParametersForm(this, mountPanel);
}
@Override
public DBObjectDialog<DVMParameter, DVMParameterFields> getDialog() {

31
src/_VisualDVM/GlobalData/DVMParameter/UI/DVMParametersForm.java Normal file
View File

@@ -0,0 +1,31 @@
package _VisualDVM.GlobalData.DVMParameter.UI;
import Common.Database.Tables.DataSet;
import Common.Visual.DataSetControlForm;
import Common.Visual.Menus.DataMenuBar;
import _VisualDVM.GlobalData.DVMParameter.DVMParameter;
import _VisualDVM.Passes.PassCode;
import javax.swing.*;
public class DVMParametersForm extends DataSetControlForm<DVMParameter> {
public DVMParametersForm(DataSet<?, DVMParameter> dataSource_in, JPanel mountPanel_in) {
super(dataSource_in, mountPanel_in);
}
@Override
public String[] getUIColumnNames() {
return new String[]{
"имя",
"значение"
};
}
@Override
protected void AdditionalInitColumns() {
columns.get(0).setVisible(false);
}
@Override
public DataMenuBar createMenuBar() {
return new DataMenuBar(dataSource.getPluralDescription(),
PassCode.AddDVMParameter,
PassCode.EditDVMParameter,
PassCode.DeleteDVMParameter);
}
}

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

@@ -9,6 +9,7 @@ import Common.Visual.Windows.Dialog.DBObjectDialog;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.EnvironmentValue.UI.EnvironmentValueFields;
import _VisualDVM.GlobalData.EnvironmentValue.UI.EnvironmentsValuesForm;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Utils;
@@ -70,26 +71,7 @@ public class EnvironmentValuesDBTable extends iDBTable<EnvironmentValue> {
}
@Override
protected DataSetControlForm createUI(JPanel mountPanel) {
return new DataSetControlForm(this, mountPanel) {
@Override
public String[] getUIColumnNames() {
return new String[]{
"имя",
"значение"};
}
@Override
protected void AdditionalInitColumns() {
columns.get(0).setVisible(false);
}
@Override
public DataMenuBar createMenuBar() {
return new DataMenuBar(getPluralDescription(),
PassCode.AddEnvironmentValue,
PassCode.EditEnvironmentValue,
PassCode.DeleteEnvironmentValue,
PassCode.PickCompilerEnvironments);
}
};
return new EnvironmentsValuesForm(this, mountPanel);
}
@Override
public Current CurrentName() {

31
src/_VisualDVM/GlobalData/EnvironmentValue/UI/EnvironmentsValuesForm.java Normal file
View File

@@ -0,0 +1,31 @@
package _VisualDVM.GlobalData.EnvironmentValue.UI;
import Common.Database.Tables.DataSet;
import Common.Visual.DataSetControlForm;
import Common.Visual.Menus.DataMenuBar;
import _VisualDVM.GlobalData.EnvironmentValue.EnvironmentValue;
import _VisualDVM.Passes.PassCode;
import javax.swing.*;
public class EnvironmentsValuesForm extends DataSetControlForm<EnvironmentValue> {
public EnvironmentsValuesForm(DataSet<?, EnvironmentValue> dataSource_in, JPanel mountPanel_in) {
super(dataSource_in, mountPanel_in);
}
@Override
public String[] getUIColumnNames() {
return new String[]{
"имя",
"значение"};
}
@Override
protected void AdditionalInitColumns() {
columns.get(0).setVisible(false);
}
@Override
public DataMenuBar createMenuBar() {
return new DataMenuBar(dataSource.getPluralDescription(),
PassCode.AddEnvironmentValue,
PassCode.EditEnvironmentValue,
PassCode.DeleteEnvironmentValue,
PassCode.PickCompilerEnvironments);
}
}

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

@@ -2,6 +2,7 @@ package _VisualDVM.GlobalData.FileObject;
import Common.Database.Tables.DataSet;
import Common.Visual.DataSetControlForm;
import Common.Visual.Tables.RendererDate;
import _VisualDVM.GlobalData.FileObject.UI.DirInfosForm;
import javax.swing.*;
public class DirInfosDataSet extends DataSet<String, DirInfo> {
@@ -10,16 +11,6 @@ public class DirInfosDataSet extends DataSet<String, DirInfo> {
}
@Override
protected DataSetControlForm createUI(JPanel mountPanel) {
return new DataSetControlForm(this, mountPanel) {
@Override
public String[] getUIColumnNames() {
return new String[]{
"дата изменения"};
}
@Override
protected void AdditionalInitColumns() {
columns.get(1).setRendererClass(RendererDate.class);
}
};
return new DirInfosForm(this, mountPanel);
}
}

2
src/_VisualDVM/GlobalData/FileObject/DirInfosFields.form → src/_VisualDVM/GlobalData/FileObject/UI/DirInfosFields.form
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="_VisualDVM.GlobalData.FileObject.DirInfosFields">
<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="_VisualDVM.GlobalData.FileObject.UI.DirInfosFields">
<grid id="27dc6" binding="content" layout-manager="BorderLayout" hgap="0" vgap="0">
<constraints>
<xy x="20" y="20" width="500" height="400"/>

2
src/_VisualDVM/GlobalData/FileObject/DirInfosFields.java → src/_VisualDVM/GlobalData/FileObject/UI/DirInfosFields.java
View File

@@ -1,4 +1,4 @@
package _VisualDVM.GlobalData.FileObject;
package _VisualDVM.GlobalData.FileObject.UI;
import Common.Visual.Windows.Dialog.DialogFields;
import javax.swing.*;

21
src/_VisualDVM/GlobalData/FileObject/UI/DirInfosForm.java Normal file
View File

@@ -0,0 +1,21 @@
package _VisualDVM.GlobalData.FileObject.UI;
import Common.Database.Tables.DataSet;
import Common.Visual.DataSetControlForm;
import Common.Visual.Tables.RendererDate;
import _VisualDVM.GlobalData.FileObject.DirInfo;
import javax.swing.*;
public class DirInfosForm extends DataSetControlForm<DirInfo> {
public DirInfosForm(DataSet<?, DirInfo> dataSource_in, JPanel mountPanel_in) {
super(dataSource_in, mountPanel_in);
}
@Override
public String[] getUIColumnNames() {
return new String[]{
"дата изменения"};
}
@Override
protected void AdditionalInitColumns() {
columns.get(1).setRendererClass(RendererDate.class);
}
}

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

@@ -5,17 +5,15 @@ import Common.Database.Tables.FKCurrentObjectBehaviuor;
import Common.Database.Tables.FKDataBehaviour;
import Common.Database.Tables.iDBTable;
import Common.Passes.PassCode_;
import Common.Visual.Controls.MenuBarButton;
import Common.Visual.DataSetControlForm;
import Common.Visual.Menus.DataMenuBar;
import Common.Visual.UI;
import Common.Visual.Windows.Dialog.DBObjectDialog;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.Compiler.Compiler;
import _VisualDVM.GlobalData.DVMParameter.DVMParameter;
import _VisualDVM.GlobalData.EnvironmentValue.EnvironmentValue;
import _VisualDVM.GlobalData.Machine.UI.MachineFields;
import _VisualDVM.GlobalData.Machine.UI.MachinesForm;
import _VisualDVM.GlobalData.Makefile.Makefile;
import _VisualDVM.GlobalData.Module.Module;
import _VisualDVM.GlobalData.RunConfiguration.RunConfiguration;
@@ -25,8 +23,6 @@ import _VisualDVM.GlobalData.User.User;
import _VisualDVM.Passes.PassCode;
import javax.swing.*;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.util.LinkedHashMap;
public class MachinesDBTable extends iDBTable<Machine> {
public MachinesDBTable() {
@@ -90,54 +86,7 @@ public class MachinesDBTable extends iDBTable<Machine> {
}
@Override
protected DataSetControlForm createUI(JPanel mountPanel) {
return new DataSetControlForm(this, mountPanel) {
@Override
public boolean hasCheckBox() {
return true;
}
@Override
public String[] getUIColumnNames() {
return new String[]{"URL"};
}
@Override
public void ShowCurrentObject() throws Exception {
super.ShowCurrentObject();
Global.mainModule.getUI().getMainWindow().getTestingWindow().ShowCurrentCompiler();
Global.mainModule.getUI().getCredentialsMenuBar().ShowMachine();
}
@Override
public void ShowNoCurrentObject() throws Exception {
super.ShowNoCurrentObject();
Global.mainModule.getUI().getMainWindow().getTestingWindow().ShowCurrentCompiler();
Global.mainModule.getUI().getCredentialsMenuBar().ShowNoMachine();
}
@Override
protected void AdditionalInitColumns() {
columns.get(0).setVisible(false);
}
@Override
public DataMenuBar createMenuBar() {
return new DataMenuBar(getPluralDescription(),
PassCode.AddMachine,
PassCode.EditMachine,
PassCode.DeleteMachine) {
{
add(new MenuBarButton() {
{
setIcon("/Common/icons/SilverArrowUp.png");
setToolTipText("Свернуть");
addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
Global.mainModule.getPass(PassCode.UpdateProperty).Do("collapseCredentials", true);
}
});
}
}, 0);
}
};
}
};
return new MachinesForm(this, mountPanel);
}
@Override
public Current CurrentName() {

63
src/_VisualDVM/GlobalData/Machine/UI/MachinesForm.java Normal file
View File

@@ -0,0 +1,63 @@
package _VisualDVM.GlobalData.Machine.UI;
import Common.Database.Tables.DataSet;
import Common.Visual.Controls.MenuBarButton;
import Common.Visual.DataSetControlForm;
import Common.Visual.Menus.DataMenuBar;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.Machine.Machine;
import _VisualDVM.Passes.PassCode;
import javax.swing.*;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
public class MachinesForm extends DataSetControlForm<Machine> {
public MachinesForm(DataSet<?, Machine> dataSource_in, JPanel mountPanel_in) {
super(dataSource_in, mountPanel_in);
}
@Override
public boolean hasCheckBox() {
return true;
}
@Override
public String[] getUIColumnNames() {
return new String[]{"URL"};
}
@Override
public void ShowCurrentObject() throws Exception {
super.ShowCurrentObject();
Global.mainModule.getUI().getMainWindow().getTestingWindow().ShowCurrentCompiler();
Global.mainModule.getUI().getCredentialsMenuBar().ShowMachine();
}
@Override
public void ShowNoCurrentObject() throws Exception {
super.ShowNoCurrentObject();
Global.mainModule.getUI().getMainWindow().getTestingWindow().ShowCurrentCompiler();
Global.mainModule.getUI().getCredentialsMenuBar().ShowNoMachine();
}
@Override
protected void AdditionalInitColumns() {
columns.get(0).setVisible(false);
}
@Override
public DataMenuBar createMenuBar() {
return new DataMenuBar(dataSource.getPluralDescription(),
PassCode.AddMachine,
PassCode.EditMachine,
PassCode.DeleteMachine) {
{
add(new MenuBarButton() {
{
setIcon("/Common/icons/SilverArrowUp.png");
setToolTipText("Свернуть");
addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
Global.mainModule.getPass(PassCode.UpdateProperty).Do("collapseCredentials", true);
}
});
}
}, 0);
}
};
}
}

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

@@ -9,6 +9,7 @@ import Common.Visual.DataSetControlForm;
import Common.Visual.Menus.DataMenuBar;
import Common.Visual.Windows.Dialog.DBObjectDialog;
import _VisualDVM.Current;
import _VisualDVM.GlobalData.Makefile.UI.MakefilesForm;
import _VisualDVM.GlobalData.Module.Module;
import _VisualDVM.GlobalData.Module.UI.ModuleAnchestorFields;
import _VisualDVM.GlobalData.Module.UI.ModuleAnchestorForm;
@@ -42,37 +43,7 @@ public class MakefilesDBTable extends iDBTable<Makefile> {
}
@Override
protected DataSetControlForm createUI(JPanel mountPanel) {
return new DataSetControlForm(this, mountPanel) {
@Override
public boolean hasCheckBox() {
return true;
}
@Override
public String[] getUIColumnNames() {
return new String[]{
"Линковщик",
"Команда",
"Флаги"
};
}
@Override
protected void AdditionalInitColumns() {
columns.get(0).setVisible(false);
}
@Override
public DataMenuBar createMenuBar() {
return new DataMenuBar(getPluralDescription(),
PassCode.Compile,
PassCode.AddMakefile,
PassCode.EditMakefile,
PassCode.DeleteMakefile) {
{
addSeparator();
addPasses(PassCode.ShowMakefilePreview, PassCode.EditProjectCompilationMaxtime);
}
};
}
};
return new MakefilesForm(this, mountPanel);
}
@Override
public Current CurrentName() {

42
src/_VisualDVM/GlobalData/Makefile/UI/MakefilesForm.java Normal file
View File

@@ -0,0 +1,42 @@
package _VisualDVM.GlobalData.Makefile.UI;
import Common.Database.Tables.DataSet;
import Common.Visual.DataSetControlForm;
import Common.Visual.Menus.DataMenuBar;
import _VisualDVM.GlobalData.Makefile.Makefile;
import _VisualDVM.Passes.PassCode;
import javax.swing.*;
public class MakefilesForm extends DataSetControlForm<Makefile> {
public MakefilesForm(DataSet<?, Makefile> dataSource_in, JPanel mountPanel_in) {
super(dataSource_in, mountPanel_in);
}
@Override
public boolean hasCheckBox() {
return true;
}
@Override
public String[] getUIColumnNames() {
return new String[]{
"Линковщик",
"Команда",
"Флаги"
};
}
@Override
protected void AdditionalInitColumns() {
columns.get(0).setVisible(false);
}
@Override
public DataMenuBar createMenuBar() {
return new DataMenuBar(dataSource.getPluralDescription(),
PassCode.Compile,
PassCode.AddMakefile,
PassCode.EditMakefile,
PassCode.DeleteMakefile) {
{
addSeparator();
addPasses(PassCode.ShowMakefilePreview, PassCode.EditProjectCompilationMaxtime);
}
};
}
}

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

@@ -6,6 +6,7 @@ import Common.Visual.Windows.Dialog.DBObjectDialog;
import Common.Visual.Windows.Dialog.DialogFields;
import _VisualDVM.Current;
import _VisualDVM.GlobalData.Module.UI.ModuleAnchestorForm;
import _VisualDVM.GlobalData.Module.UI.ModulesForm;
import _VisualDVM.Passes.PassCode;
import javax.swing.*;
@@ -27,29 +28,7 @@ public class ModulesDBTable extends iDBTable<Module> {
}
@Override
protected DataSetControlForm createUI(JPanel mountPanel) {
return new DataSetControlForm(this, mountPanel) {
@Override
public boolean hasCheckBox() {
return true;
}
@Override
public String[] getUIColumnNames() {
return new String[]{
"Язык",
"Компилятор",
"Команда",
"Флаги"
};
}
@Override
protected void AdditionalInitColumns() {
columns.get(0).setVisible(false);
}
@Override
public DataMenuBar createMenuBar() {
return new DataMenuBar(getPluralDescription(), PassCode.EditModule);
}
};
return new ModulesForm(this, mountPanel);
}
@Override
public Current CurrentName() {

34
src/_VisualDVM/GlobalData/Module/UI/ModulesForm.java Normal file
View File

@@ -0,0 +1,34 @@
package _VisualDVM.GlobalData.Module.UI;
import Common.Database.Tables.DataSet;
import Common.Visual.DataSetControlForm;
import Common.Visual.Menus.DataMenuBar;
import _VisualDVM.GlobalData.Module.Module;
import _VisualDVM.Passes.PassCode;
import javax.swing.*;
public class ModulesForm extends DataSetControlForm<Module> {
public ModulesForm(DataSet<?, Module> dataSource_in, JPanel mountPanel_in) {
super(dataSource_in, mountPanel_in);
}
@Override
public boolean hasCheckBox() {
return true;
}
@Override
public String[] getUIColumnNames() {
return new String[]{
"Язык",
"Компилятор",
"Команда",
"Флаги"
};
}
@Override
protected void AdditionalInitColumns() {
columns.get(0).setVisible(false);
}
@Override
public DataMenuBar createMenuBar() {
return new DataMenuBar(dataSource.getPluralDescription(), PassCode.EditModule);
}
}

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

@@ -18,6 +18,7 @@ import _VisualDVM.GlobalData.DVMParameter.DVMParameter;
import _VisualDVM.GlobalData.EnvironmentValue.EnvironmentValue;
import _VisualDVM.GlobalData.RunConfiguration.UI.MatrixBar;
import _VisualDVM.GlobalData.RunConfiguration.UI.RunConfigurationFields;
import _VisualDVM.GlobalData.RunConfiguration.UI.RunConfigurationsForm;
import _VisualDVM.GlobalData.Tasks.RunTask.RunTask;
import _VisualDVM.Passes.PassCode;
@@ -119,37 +120,7 @@ public class RunConfigurationsDBTable extends iDBTable<RunConfiguration> {
}
@Override
protected DataSetControlForm createUI(JPanel mountPanel) {
return new DataSetControlForm(this, mountPanel) {
@Override
public String[] getUIColumnNames() {
return new String[]{
"Команда",
"Опции",
"Разм.",
"Куб",
"Min",
"Max",
"Аргументы"
};
}
@Override
protected void AdditionalInitColumns() {
columns.get(0).setVisible(false);
}
@Override
public DataMenuBar createMenuBar() {
return new DataMenuBar(getPluralDescription(),
PassCode.Run,
PassCode.AddRunConfiguration,
PassCode.EditRunConfiguration,
PassCode.DeleteRunConfiguration) {
{
add(new JSeparator());
addPasses(PassCode.EditProjectRunMaxtime);
}
};
}
};
return new RunConfigurationsForm(this, mountPanel);
}
@Override
public Current CurrentName() {

42
src/_VisualDVM/GlobalData/RunConfiguration/UI/RunConfigurationsForm.java Normal file
View File

@@ -0,0 +1,42 @@
package _VisualDVM.GlobalData.RunConfiguration.UI;
import Common.Database.Tables.DataSet;
import Common.Visual.DataSetControlForm;
import Common.Visual.Menus.DataMenuBar;
import _VisualDVM.GlobalData.RunConfiguration.RunConfiguration;
import _VisualDVM.Passes.PassCode;
import javax.swing.*;
public class RunConfigurationsForm extends DataSetControlForm<RunConfiguration> {
public RunConfigurationsForm(DataSet<?, RunConfiguration> dataSource_in, JPanel mountPanel_in) {
super(dataSource_in, mountPanel_in);
}
@Override
public String[] getUIColumnNames() {
return new String[]{
"Команда",
"Опции",
"Разм.",
"Куб",
"Min",
"Max",
"Аргументы"
};
}
@Override
protected void AdditionalInitColumns() {
columns.get(0).setVisible(false);
}
@Override
public DataMenuBar createMenuBar() {
return new DataMenuBar(dataSource.getPluralDescription(),
PassCode.Run,
PassCode.AddRunConfiguration,
PassCode.EditRunConfiguration,
PassCode.DeleteRunConfiguration) {
{
add(new JSeparator());
addPasses(PassCode.EditProjectRunMaxtime);
}
};
}
}

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

@@ -2,6 +2,7 @@ package _VisualDVM.GlobalData.SapforProfileSetting;
import Common.Database.Tables.iDBTable;
import Common.Visual.DataSetControlForm;
import _VisualDVM.Current;
import _VisualDVM.GlobalData.SapforProfileSetting.UI.SapforProfileSettingsForm;
import javax.swing.*;
public class SapforProfileSettingsDBTable extends iDBTable<SapforProfileSetting> {
@@ -10,23 +11,7 @@ public class SapforProfileSettingsDBTable extends iDBTable<SapforProfileSetting>
}
@Override
protected DataSetControlForm createUI(JPanel mountPanel) {
return new DataSetControlForm(this, mountPanel) {
@Override
public String[] getUIColumnNames() {
return new String[]{
"имя",
"значение"
};
}
@Override
protected void AdditionalInitColumns() {
columns.get(0).setVisible(false);
}
@Override
public boolean hasMenuBar() {
return false;
}
};
return new SapforProfileSettingsForm(this, mountPanel);
}
@Override
public Current CurrentName() {

26
src/_VisualDVM/GlobalData/SapforProfileSetting/UI/SapforProfileSettingsForm.java Normal file
View File

@@ -0,0 +1,26 @@
package _VisualDVM.GlobalData.SapforProfileSetting.UI;
import Common.Database.Tables.DataSet;
import Common.Visual.DataSetControlForm;
import _VisualDVM.GlobalData.SapforProfileSetting.SapforProfileSetting;
import javax.swing.*;
public class SapforProfileSettingsForm extends DataSetControlForm<SapforProfileSetting> {
public SapforProfileSettingsForm(DataSet<?, SapforProfileSetting> dataSource_in, JPanel mountPanel_in) {
super(dataSource_in, mountPanel_in);
}
@Override
public String[] getUIColumnNames() {
return new String[]{
"имя",
"значение"
};
}
@Override
protected void AdditionalInitColumns() {
columns.get(0).setVisible(false);
}
@Override
public boolean hasMenuBar() {
return false;
}
}

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

@@ -6,11 +6,8 @@ import Common.Database.Tables.FKDataBehaviour;
import Common.Database.Tables.iDBTable;
import Common.Passes.PassCode_;
import Common.Visual.DataSetControlForm;
import Common.Visual.Menus.DataMenuBar;
import Common.Visual.Tables.RendererDate;
import Common.Visual.Tables.RendererStatusEnum;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.Tasks.CompilationTask.UI.CompilationTasksForm;
import _VisualDVM.GlobalData.Tasks.RunTask.RunTask;
import _VisualDVM.Passes.PassCode;
@@ -36,48 +33,7 @@ public class CompilationTasksDBTable extends iDBTable<CompilationTask> {
}
@Override
protected DataSetControlForm createUI(JPanel mountPanel) {
return new DataSetControlForm(this, mountPanel) {
@Override
public boolean hasCheckBox() {
return true;
}
@Override
public String[] getUIColumnNames() {
return new String[]{
"сборка",
"",
"Fortran",
"",
"С",
"",
"С++",
"",
"Лимит(c)",
"Время(c)",
"Дата",
"Статус"
};
}
@Override
protected void AdditionalInitColumns() {
columns.get(12).setRendererClass(RendererDate.class);
columns.get(13).setRendererClass(RendererStatusEnum.class);
}
@Override
public void ShowCurrentObject() throws Exception {
super.ShowCurrentObject();
Global.mainModule.getUI().getDebugWindow().DropRunTasksComparison();
}
@Override
public void ShowNoCurrentObject() throws Exception {
super.ShowNoCurrentObject();
Global.mainModule.getUI().getDebugWindow().DropRunTasksComparison();
}
@Override
public DataMenuBar createMenuBar() {
return new DataMenuBar(getPluralDescription(), PassCode.DeleteCompilationTasks);
}
};
return new CompilationTasksForm(this, mountPanel);
}
@Override
public Current CurrentName() {

56
src/_VisualDVM/GlobalData/Tasks/CompilationTask/UI/CompilationTasksForm.java Normal file
View File

@@ -0,0 +1,56 @@
package _VisualDVM.GlobalData.Tasks.CompilationTask.UI;
import Common.Database.Tables.DataSet;
import Common.Visual.DataSetControlForm;
import Common.Visual.Menus.DataMenuBar;
import Common.Visual.Tables.RendererDate;
import Common.Visual.Tables.RendererStatusEnum;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.Tasks.CompilationTask.CompilationTask;
import _VisualDVM.Passes.PassCode;
import javax.swing.*;
public class CompilationTasksForm extends DataSetControlForm<CompilationTask> {
public CompilationTasksForm(DataSet<?, CompilationTask> dataSource_in, JPanel mountPanel_in) {
super(dataSource_in, mountPanel_in);
}
@Override
public boolean hasCheckBox() {
return true;
}
@Override
public String[] getUIColumnNames() {
return new String[]{
"сборка",
"",
"Fortran",
"",
"С",
"",
"С++",
"",
"Лимит(c)",
"Время(c)",
"Дата",
"Статус"
};
}
@Override
protected void AdditionalInitColumns() {
columns.get(12).setRendererClass(RendererDate.class);
columns.get(13).setRendererClass(RendererStatusEnum.class);
}
@Override
public void ShowCurrentObject() throws Exception {
super.ShowCurrentObject();
Global.mainModule.getUI().getDebugWindow().DropRunTasksComparison();
}
@Override
public void ShowNoCurrentObject() throws Exception {
super.ShowNoCurrentObject();
Global.mainModule.getUI().getDebugWindow().DropRunTasksComparison();
}
@Override
public DataMenuBar createMenuBar() {
return new DataMenuBar(dataSource.getPluralDescription(), PassCode.DeleteCompilationTasks);
}
}

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

@@ -7,6 +7,7 @@ import Common.Visual.Tables.RendererDate;
import Common.Visual.Tables.RendererStatusEnum;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.Tasks.RunTask.UI.RunTasksForm;
import _VisualDVM.Passes.PassCode;
import javax.swing.*;
@@ -24,41 +25,7 @@ public class RunTasksDBTable extends iDBTable<RunTask> {
}
@Override
protected DataSetControlForm createUI(JPanel mountPanel) {
return new DataSetControlForm(this, mountPanel) {
@Override
public boolean hasCheckBox() {
return true;
}
@Override
public String[] getUIColumnNames() {
return new String[]{
"Матрица",
"Лимит(с)",
"Время(с)",
"Чистое время",
"Дата",
"Статус"};
}
@Override
protected void AdditionalInitColumns() {
columns.get(6).setRendererClass(RendererDate.class);
columns.get(7).setRendererClass(RendererStatusEnum.class);
}
@Override
public void ShowCurrentObject() throws Exception {
super.ShowCurrentObject();
Global.mainModule.getUI().getDebugWindow().ShowCurrentRunTask();
}
@Override
public void ShowNoCurrentObject() throws Exception {
super.ShowNoCurrentObject();
Global.mainModule.getUI().getDebugWindow().ShowNoCurrentRunTask();
}
@Override
public DataMenuBar createMenuBar() {
return new DataMenuBar(getPluralDescription(), PassCode.DeleteRunTasks);
}
};
return new RunTasksForm(this, mountPanel);
}
@Override
public Current CurrentName() {

49
src/_VisualDVM/GlobalData/Tasks/RunTask/UI/RunTasksForm.java Normal file
View File

@@ -0,0 +1,49 @@
package _VisualDVM.GlobalData.Tasks.RunTask.UI;
import Common.Database.Tables.DataSet;
import Common.Visual.DataSetControlForm;
import Common.Visual.Menus.DataMenuBar;
import Common.Visual.Tables.RendererDate;
import Common.Visual.Tables.RendererStatusEnum;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.Tasks.RunTask.RunTask;
import _VisualDVM.Passes.PassCode;
import javax.swing.*;
public class RunTasksForm extends DataSetControlForm<RunTask> {
public RunTasksForm(DataSet<?, RunTask> dataSource_in, JPanel mountPanel_in) {
super(dataSource_in, mountPanel_in);
}
@Override
public boolean hasCheckBox() {
return true;
}
@Override
public String[] getUIColumnNames() {
return new String[]{
"Матрица",
"Лимит(с)",
"Время(с)",
"Чистое время",
"Дата",
"Статус"};
}
@Override
protected void AdditionalInitColumns() {
columns.get(6).setRendererClass(RendererDate.class);
columns.get(7).setRendererClass(RendererStatusEnum.class);
}
@Override
public void ShowCurrentObject() throws Exception {
super.ShowCurrentObject();
Global.mainModule.getUI().getDebugWindow().ShowCurrentRunTask();
}
@Override
public void ShowNoCurrentObject() throws Exception {
super.ShowNoCurrentObject();
Global.mainModule.getUI().getDebugWindow().ShowNoCurrentRunTask();
}
@Override
public DataMenuBar createMenuBar() {
return new DataMenuBar(dataSource.getPluralDescription(), PassCode.DeleteRunTasks);
}
}

48
src/_VisualDVM/GlobalData/User/UI/UsersForm.java Normal file
View File

@@ -0,0 +1,48 @@
package _VisualDVM.GlobalData.User.UI;
import Common.Database.Tables.DataSet;
import Common.Visual.DataSetControlForm;
import Common.Visual.Menus.DataMenuBar;
import Common.Visual.Tables.RendererStatusEnum;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.User.User;
import _VisualDVM.Passes.PassCode;
import javax.swing.*;
public class UsersForm extends DataSetControlForm<User> {
public UsersForm(DataSet<?, User> dataSource_in, JPanel mountPanel_in) {
super(dataSource_in, mountPanel_in);
}
@Override
public boolean hasCheckBox() {
return true;
}
@Override
public String[] getUIColumnNames() {
return new String[]{
"Логин",
"Статус"};
}
@Override
protected void AdditionalInitColumns() {
columns.get(0).setVisible(false);
columns.get(3).setRendererClass(RendererStatusEnum.class);
}
@Override
public void ShowCurrentObject() throws Exception {
super.ShowCurrentObject();
Global.mainModule.getUI().getCredentialsMenuBar().ShowUser();
}
@Override
public void ShowNoCurrentObject() throws Exception {
super.ShowNoCurrentObject();
Global.mainModule.getUI().getCredentialsMenuBar().ShowNoUser();
}
@Override
public DataMenuBar createMenuBar() {
return new DataMenuBar(dataSource.getPluralDescription(),
PassCode.AddUser,
PassCode.EditUser,
PassCode.InitialiseUser,
PassCode.DeleteUser);
}
}

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

@@ -15,6 +15,7 @@ import _VisualDVM.GlobalData.Machine.MachineType;
import _VisualDVM.GlobalData.Tasks.CompilationTask.CompilationTask;
import _VisualDVM.GlobalData.Tasks.RunTask.RunTask;
import _VisualDVM.GlobalData.User.UI.UserFields;
import _VisualDVM.GlobalData.User.UI.UsersForm;
import _VisualDVM.Passes.PassCode;
import javax.swing.*;
@@ -75,43 +76,7 @@ public class UsersDBTable extends iDBTable<User> {
}
@Override
protected DataSetControlForm createUI(JPanel mountPanel) {
return new DataSetControlForm(this, mountPanel) {
@Override
public boolean hasCheckBox() {
return true;
}
@Override
public String[] getUIColumnNames() {
return new String[]{
"Логин",
"Статус"};
}
@Override
protected void AdditionalInitColumns() {
columns.get(0).setVisible(false);
columns.get(3).setRendererClass(RendererStatusEnum.class);
}
@Override
public void ShowCurrentObject() throws Exception {
super.ShowCurrentObject();
// UI.getMainWindow().ShowCurrentCompiler();
Global.mainModule.getUI().getCredentialsMenuBar().ShowUser();
}
@Override
public void ShowNoCurrentObject() throws Exception {
super.ShowNoCurrentObject();
// UI.getMainWindow().ShowCurrentCompiler();
Global.mainModule.getUI().getCredentialsMenuBar().ShowNoUser();
}
@Override
public DataMenuBar createMenuBar() {
return new DataMenuBar(getPluralDescription(),
PassCode.AddUser,
PassCode.EditUser,
PassCode.InitialiseUser,
PassCode.DeleteUser);
}
};
return new UsersForm(this, mountPanel);
}
@Override
public Current CurrentName() {

2
src/_VisualDVM/Passes/All/AddBugReport.java
View File

@@ -7,7 +7,7 @@ import _VisualDVM.Global;
import _VisualDVM.GlobalData.Account.AccountRole;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Repository.BugReport.BugReport;
import _VisualDVM.Repository.BugReport.BugReportInterface;
import _VisualDVM.Repository.BugReport.UI.BugReportInterface;
import _VisualDVM.Repository.BugReport.BugReportState;
import _VisualDVM.Repository.Component.ComponentType;

2
src/_VisualDVM/Passes/All/AppendBugReportField.java
View File

@@ -5,7 +5,7 @@ import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Passes.Server.ComponentsRepositoryPass;
import _VisualDVM.Repository.BugReport.BugReport;
import _VisualDVM.Repository.BugReport.BugReportInterface;
import _VisualDVM.Repository.BugReport.UI.BugReportInterface;
import _VisualDVM.Repository.EmailMessage;
import _VisualDVM.Repository.Server.ServerCode;
import _VisualDVM.Repository.Server.ServerExchangeUnit_2021;

2
src/_VisualDVM/Passes/All/DeleteDownloadedBugReports.java
View File

@@ -5,7 +5,7 @@ import Common.Visual.Windows.Dialog.Dialog;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.FileObject.DirInfo;
import _VisualDVM.GlobalData.FileObject.DirInfosDataSet;
import _VisualDVM.GlobalData.FileObject.DirInfosFields;
import _VisualDVM.GlobalData.FileObject.UI.DirInfosFields;
import _VisualDVM.GlobalData.Settings.SettingName;
import _VisualDVM.Passes.PassCode;

2
src/_VisualDVM/Passes/All/DownloadBugReport.java
View File

@@ -3,7 +3,7 @@ import Common.Utils.Utils_;
import _VisualDVM.Global;
import _VisualDVM.Passes.Server.ComponentsRepositoryPass;
import _VisualDVM.Repository.BugReport.BugReport;
import _VisualDVM.Repository.BugReport.BugReportInterface;
import _VisualDVM.Repository.BugReport.UI.BugReportInterface;
import _VisualDVM.Repository.Server.ServerCode;
import _VisualDVM.Repository.Server.ServerExchangeUnit_2021;
public class DownloadBugReport extends ComponentsRepositoryPass<BugReport> {

2
src/_VisualDVM/Passes/All/OpenBugReportTestProject.java
View File

@@ -5,7 +5,7 @@ import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Repository.BugReport.BugReport;
import _VisualDVM.Repository.BugReport.BugReportInterface;
import _VisualDVM.Repository.BugReport.UI.BugReportInterface;
import java.io.File;
import java.nio.file.Paths;

2
src/_VisualDVM/Passes/All/PublishBugReport.java
View File

@@ -6,7 +6,7 @@ import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Repository.BugReport.BugReport;
import _VisualDVM.Repository.BugReport.BugReportInterface;
import _VisualDVM.Repository.BugReport.UI.BugReportInterface;
import _VisualDVM.Repository.BugReport.BugReportState;
import _VisualDVM.Repository.EmailMessage;

2
src/_VisualDVM/Passes/All/SaveBugReportRecipients.java
View File

@@ -1,5 +1,5 @@
package _VisualDVM.Passes.All;
import _VisualDVM.Repository.BugReport.BugReportInterface;
import _VisualDVM.Repository.BugReport.UI.BugReportInterface;
public class SaveBugReportRecipients extends UpdateBugReportField {
@Override
public String getIconPath() {

2
src/_VisualDVM/Passes/All/SendBugReport.java
View File

@@ -2,7 +2,7 @@ package _VisualDVM.Passes.All;
import Common.Utils.Utils_;
import _VisualDVM.Global;
import _VisualDVM.Passes.Server.ComponentsRepositoryPass;
import _VisualDVM.Repository.BugReport.BugReportInterface;
import _VisualDVM.Repository.BugReport.UI.BugReportInterface;
import _VisualDVM.Repository.BugReport.BugReportState;
import _VisualDVM.Repository.Server.ServerCode;
import _VisualDVM.Repository.Server.ServerExchangeUnit_2021;

2
src/_VisualDVM/Passes/All/UpdateBugReportField.java
View File

@@ -5,7 +5,7 @@ import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Passes.Server.ComponentsRepositoryPass;
import _VisualDVM.Repository.BugReport.BugReport;
import _VisualDVM.Repository.BugReport.BugReportInterface;
import _VisualDVM.Repository.BugReport.UI.BugReportInterface;
import _VisualDVM.Repository.BugReport.BugReportState;
import _VisualDVM.Repository.EmailMessage;
import _VisualDVM.Repository.Server.ServerCode;

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

@@ -4,6 +4,7 @@ import Common.Database.Tables.DataSet;
import Common.Visual.DataSetControlForm;
import Common.Visual.Menus.DataMenuBar;
import _VisualDVM.Current;
import _VisualDVM.ProjectData.DBArray.UI.DBArraysForm;
import javax.swing.*;
public class ArraysDBTable extends DBTable<String, DBArray> {
@@ -20,29 +21,7 @@ public class ArraysDBTable extends DBTable<String, DBArray> {
}
@Override
protected DataSetControlForm createUI(JPanel mountPanel) {
return new DataSetControlForm(this, mountPanel) {
@Override
public String[] getUIColumnNames() {
return new String[]{"Имя"};
}
@Override
public boolean hasCheckBox() {
return true;
}
@Override
protected void AdditionalInitColumns() {
columns.get(1).setEditable(false);
}
@Override
public DataMenuBar createMenuBar() {
return new DataMenuBar(getPluralDescription()) {
@Override
public void createSelectionButtons(DataSet dataSet) {
//не нужны.
}
};
}
};
return new DBArraysForm(this, mountPanel);
}
@Override
public Current CurrentName() {

33
src/_VisualDVM/ProjectData/DBArray/UI/DBArraysForm.java Normal file
View File

@@ -0,0 +1,33 @@
package _VisualDVM.ProjectData.DBArray.UI;
import Common.Database.Tables.DataSet;
import Common.Visual.DataSetControlForm;
import Common.Visual.Menus.DataMenuBar;
import _VisualDVM.ProjectData.DBArray.DBArray;
import javax.swing.*;
public class DBArraysForm extends DataSetControlForm<DBArray> {
public DBArraysForm(DataSet<?, DBArray> dataSource_in, JPanel mountPanel_in) {
super(dataSource_in, mountPanel_in);
}
@Override
public String[] getUIColumnNames() {
return new String[]{"Имя"};
}
@Override
public boolean hasCheckBox() {
return true;
}
@Override
protected void AdditionalInitColumns() {
columns.get(1).setEditable(false);
}
@Override
public DataMenuBar createMenuBar() {
return new DataMenuBar(dataSource.getPluralDescription()) {
@Override
public void createSelectionButtons(DataSet dataSet) {
//не нужны.
}
};
}
}

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

@@ -8,7 +8,7 @@ import _VisualDVM.Global;
import javax.swing.*;
import javax.swing.table.TableModel;
import javax.swing.table.TableRowSorter;
public class MessagesControlForm extends DataSetControlForm {
public class MessagesControlForm extends DataSetControlForm<Message> {
public MessagesControlForm(DataSet dataSource_in, JPanel mountPanel_in) {
super(dataSource_in, mountPanel_in);
}

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

@@ -5,6 +5,7 @@ import Common.Visual.Tables.RendererWrapText;
import _VisualDVM.Current;
import _VisualDVM.GlobalData.Settings.SettingName;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.ProjectData.Messages.Recommendations.UI.RecommendationsForm;
import javax.swing.*;
public class RecommendationsDBTable extends iDBTable<MessageRecommendation> {
@@ -16,22 +17,7 @@ public class RecommendationsDBTable extends iDBTable<MessageRecommendation> {
}
@Override
protected DataSetControlForm createUI(JPanel mountPanel) {
return new DataSetControlForm(this, mountPanel) {
@Override
public String[] getUIColumnNames() {
return new String[]{"текст"};
}
@Override
protected void AdditionalInitColumns() {
columns.get(0).setVisible(false);
columns.get(1).setMinWidth(700);
columns.get(1).setRendererClass(RendererWrapText.class);
}
@Override
public boolean hasMenuBar() {
return false;
}
};
return new RecommendationsForm(this, mountPanel);
}
@Override
public String getSingleDescription() {

26
src/_VisualDVM/ProjectData/Messages/Recommendations/UI/RecommendationsForm.java Normal file
View File

@@ -0,0 +1,26 @@
package _VisualDVM.ProjectData.Messages.Recommendations.UI;
import Common.Database.Tables.DataSet;
import Common.Visual.DataSetControlForm;
import Common.Visual.Tables.RendererWrapText;
import _VisualDVM.ProjectData.Messages.Recommendations.MessageRecommendation;
import javax.swing.*;
public class RecommendationsForm extends DataSetControlForm<MessageRecommendation> {
public RecommendationsForm(DataSet<?, MessageRecommendation> dataSource_in, JPanel mountPanel_in) {
super(dataSource_in, mountPanel_in);
}
@Override
public String[] getUIColumnNames() {
return new String[]{"текст"};
}
@Override
protected void AdditionalInitColumns() {
columns.get(0).setVisible(false);
columns.get(1).setMinWidth(700);
columns.get(1).setRendererClass(RendererWrapText.class);
}
@Override
public boolean hasMenuBar() {
return false;
}
}

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

@@ -23,7 +23,7 @@ import _VisualDVM.ProjectData.Messages.Notes.MessageNote;
import _VisualDVM.ProjectData.Messages.Recommendations.MessageRecommendation;
import _VisualDVM.ProjectData.Messages.Warnings.MessageWarning;
import _VisualDVM.ProjectData.ProjectDatabase;
import _VisualDVM.ProjectData.SapforData.Arrays.ArraysSet;
import _VisualDVM.ProjectData.SapforData.Arrays.ProjectArraysSet;
import _VisualDVM.ProjectData.SapforData.Arrays.ProjectArray;
import _VisualDVM.ProjectData.SapforData.Functions.FuncCall;
import _VisualDVM.ProjectData.SapforData.Functions.FuncCallH;
@@ -31,9 +31,9 @@ import _VisualDVM.ProjectData.SapforData.Functions.FuncInfo;
import _VisualDVM.ProjectData.SapforData.Functions.UI.Graph.GraphInfo;
import _VisualDVM.ProjectData.SapforData.Includes.FileInfo;
import _VisualDVM.ProjectData.SapforData.Regions.ParallelRegion;
import _VisualDVM.ProjectData.SapforData.Regions.RegionsSet;
import _VisualDVM.ProjectData.SapforData.Regions.ParallelRegionsSet;
import _VisualDVM.ProjectData.SapforData.Variants.ParallelVariant;
import _VisualDVM.ProjectData.SapforData.Variants.VariantsSet;
import _VisualDVM.ProjectData.SapforData.Variants.ParallelVariantsSet;
import _VisualDVM.TestingSystem.Common.Test.ProjectFiles_json;
import _VisualDVM.Utils;
import com.mxgraph.swing.mxGraphComponent;
@@ -118,7 +118,7 @@ public class db_project_info extends DBObject {
public boolean isNew = false; //для выделения только что построенных версий.
//------------------------------------
//тут ключ - идентификатор. не меняем.
public ArraysSet declaratedArrays = new ArraysSet();
public ProjectArraysSet declaratedArrays = new ProjectArraysSet();
//new - все объявленные в проекте функции.
public FuncInfo main_function = null;
public FuncCallH main_functionH = null;
@@ -128,8 +128,8 @@ public class db_project_info extends DBObject {
public LinkedHashMap<String, FileInfo> addictedFiles = new LinkedHashMap<>();
//тут ключ -адрес. меняем
public Vector<ProjectArray> templates = new Vector<>();
public RegionsSet parallelRegions = new RegionsSet();
public VariantsSet parallelVariants = new VariantsSet();
public ParallelRegionsSet parallelRegions = new ParallelRegionsSet();
public ParallelVariantsSet parallelVariants = new ParallelVariantsSet();
public GraphInfo functionsGraph = new GraphInfo();
public Vector<String> files_order = new Vector<>();
public db_project_info last_modification = null;

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

@@ -1,65 +0,0 @@
package _VisualDVM.ProjectData.SapforData.Arrays;
import Common.Database.Tables.DataSet;
import Common.Visual.DataSetControlForm;
import Common.Visual.Tables.RendererHiddenList;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.Settings.SettingName;
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() {
super(Long.class, ProjectArray.class);
}
@Override
public String getSingleDescription() {
return "массив";
}
@Override
public String getPluralDescription() {
return "объявленные массивы";
}
@Override
public Current CurrentName() {
return Current.ProjectArray;
}
@Override
protected DataSetControlForm createUI(JPanel mountPanel) {
return new DataSetControlForm(this, mountPanel) {
@Override
public String[] getUIColumnNames() {
return new String[]{
"Имя",
"Область описания",
"Файлы объявления",
"Размерность",
"Размер элемента(байт)",
"Область распараллеливания"
};
}
@Override
public boolean hasCheckBox() {
return true;
}
@Override
protected void AdditionalInitColumns() {
columns.get(0).setVisible(false);
if ((Global.mainModule.getDb()).settings.get(SettingName.ShowFullArraysDeclarations).toBoolean()) {
columns.get(4).setRendererClass(RendererHyperlinks.class);
columns.get(4).setEditorClass(EditorFilesHyperlinks.class);
} else {
columns.get(4).setRendererClass(RendererHiddenList.class);
columns.get(4).setMaxWidth(200);
}
}
};
}
@Override
public void SelectAll(boolean flag) {
Global.mainModule.getPass(PassCode.MassSelectArrays).Do(flag, new Vector(Global.mainModule.getProject().declaratedArrays.Data.values()));
}
}

35
src/_VisualDVM/ProjectData/SapforData/Arrays/ProjectArraysSet.java Normal file
View File

@@ -0,0 +1,35 @@
package _VisualDVM.ProjectData.SapforData.Arrays;
import Common.Database.Tables.DataSet;
import Common.Visual.DataSetControlForm;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.ProjectData.SapforData.Arrays.UI.ProjectArraysForm;
import javax.swing.*;
import java.util.Vector;
public class ProjectArraysSet extends DataSet<Long, ProjectArray> {
public ProjectArraysSet() {
super(Long.class, ProjectArray.class);
}
@Override
public String getSingleDescription() {
return "массив";
}
@Override
public String getPluralDescription() {
return "объявленные массивы";
}
@Override
public Current CurrentName() {
return Current.ProjectArray;
}
@Override
protected DataSetControlForm createUI(JPanel mountPanel) {
return new ProjectArraysForm(this, mountPanel);
}
@Override
public void SelectAll(boolean flag) {
Global.mainModule.getPass(PassCode.MassSelectArrays).Do(flag, new Vector(Global.mainModule.getProject().declaratedArrays.Data.values()));
}
}

42
src/_VisualDVM/ProjectData/SapforData/Arrays/UI/ProjectArraysForm.java Normal file
View File

@@ -0,0 +1,42 @@
package _VisualDVM.ProjectData.SapforData.Arrays.UI;
import Common.Database.Tables.DataSet;
import Common.Visual.DataSetControlForm;
import Common.Visual.Tables.RendererHiddenList;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.Settings.SettingName;
import _VisualDVM.ProjectData.SapforData.Arrays.ProjectArray;
import _VisualDVM.Visual.Tables.EditorFilesHyperlinks;
import _VisualDVM.Visual.Tables.RendererHyperlinks;
import javax.swing.*;
public class ProjectArraysForm extends DataSetControlForm<ProjectArray> {
public ProjectArraysForm(DataSet<?, ProjectArray> dataSource_in, JPanel mountPanel_in) {
super(dataSource_in, mountPanel_in);
}
@Override
public String[] getUIColumnNames() {
return new String[]{
"Имя",
"Область описания",
"Файлы объявления",
"Размерность",
"Размер элемента(байт)",
"Область распараллеливания"
};
}
@Override
public boolean hasCheckBox() {
return true;
}
@Override
protected void AdditionalInitColumns() {
columns.get(0).setVisible(false);
if ((Global.mainModule.getDb()).settings.get(SettingName.ShowFullArraysDeclarations).toBoolean()) {
columns.get(4).setRendererClass(RendererHyperlinks.class);
columns.get(4).setEditorClass(EditorFilesHyperlinks.class);
} else {
columns.get(4).setRendererClass(RendererHiddenList.class);
columns.get(4).setMaxWidth(200);
}
}
}

32
src/_VisualDVM/ProjectData/SapforData/Regions/ParallelRegionsSet.java Normal file
View File

@@ -0,0 +1,32 @@
package _VisualDVM.ProjectData.SapforData.Regions;
import Common.Database.Tables.DataSet;
import Common.Visual.DataSetControlForm;
import Common.Visual.Tables.RendererMultiline;
import Common.Visual.Tables.RendererTopLeft;
import _VisualDVM.Current;
import _VisualDVM.ProjectData.SapforData.Regions.UI.ParallelRegionsForm;
import javax.swing.*;
import java.math.BigInteger;
public class ParallelRegionsSet extends DataSet<BigInteger, ParallelRegion> {
//суррогат. нужен только для сохры столбцов. во всяком случае пока.
public ParallelRegionsSet() {
super(BigInteger.class, ParallelRegion.class);
}
@Override
public Current CurrentName() {
return Current.ParallelRegionInfo;
}
@Override
public String getSingleDescription() {
return "область распараллеливания";
}
@Override
public String getPluralDescription() {
return "области распараллеливания";
}
@Override
protected DataSetControlForm createUI(JPanel mountPanel) {
return new ParallelRegionsForm(this, mountPanel) ;
}
}

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

@@ -1,50 +0,0 @@
package _VisualDVM.ProjectData.SapforData.Regions;
import Common.Database.Tables.DataSet;
import Common.Visual.DataSetControlForm;
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> {
//суррогат. нужен только для сохры столбцов. во всяком случае пока.
public RegionsSet() {
super(BigInteger.class, ParallelRegion.class);
}
@Override
public Current CurrentName() {
return Current.ParallelRegionInfo;
}
@Override
public String getSingleDescription() {
return "область распараллеливания";
}
@Override
public String getPluralDescription() {
return "области распараллеливания";
}
@Override
protected DataSetControlForm createUI(JPanel mountPanel) {
return new DataSetControlForm(this, mountPanel) {
@Override
public String[] getUIColumnNames() {
return new String[]{
"Имя",
"Строк кода",
"Массивов",
"Циклов",
"Объявлений процедур",
"Вызовов процедур",
"Фрагменты"};
}
@Override
protected void AdditionalInitColumns() {
columns.get(0).setVisible(false);
for (int i = 1; i < 7; ++i)
columns.get(i).setRendererClass(RendererTopLeft.class);
columns.get(7).setRendererClass(RendererMultiline.class);
}
};
}
}

31
src/_VisualDVM/ProjectData/SapforData/Regions/UI/ParallelRegionsForm.java Normal file
View File

@@ -0,0 +1,31 @@
package _VisualDVM.ProjectData.SapforData.Regions.UI;
import Common.Database.Tables.DataSet;
import Common.Visual.DataSetControlForm;
import Common.Visual.Tables.RendererMultiline;
import Common.Visual.Tables.RendererTopLeft;
import _VisualDVM.ProjectData.SapforData.Regions.ParallelRegion;
import javax.swing.*;
public class ParallelRegionsForm extends DataSetControlForm<ParallelRegion> {
public ParallelRegionsForm(DataSet<?, ParallelRegion> dataSource_in, JPanel mountPanel_in) {
super(dataSource_in, mountPanel_in);
}
@Override
public String[] getUIColumnNames() {
return new String[]{
"Имя",
"Строк кода",
"Массивов",
"Циклов",
"Объявлений процедур",
"Вызовов процедур",
"Фрагменты"};
}
@Override
protected void AdditionalInitColumns() {
columns.get(0).setVisible(false);
for (int i = 1; i < 7; ++i)
columns.get(i).setRendererClass(RendererTopLeft.class);
columns.get(7).setRendererClass(RendererMultiline.class);
}
}

24
src/_VisualDVM/ProjectData/SapforData/Variants/ParallelVariantsSet.java Normal file
View File

@@ -0,0 +1,24 @@
package _VisualDVM.ProjectData.SapforData.Variants;
import Common.Database.Tables.DataSet;
import Common.Visual.DataSetControlForm;
import _VisualDVM.Current;
import _VisualDVM.ProjectData.SapforData.Variants.UI.ParallelVariantsForm;
import javax.swing.*;
public class ParallelVariantsSet extends DataSet<String, ParallelVariant> {
public ParallelVariantsSet() {
super(String.class, ParallelVariant.class);
}
@Override
public String getPluralDescription() {
return "варианты";
}
@Override
protected DataSetControlForm createUI(JPanel mountPanel) {
return new ParallelVariantsForm(this, mountPanel);
}
@Override
public Current CurrentName() {
return Current.ParallelVariant;
}
}

53
src/_VisualDVM/ProjectData/SapforData/Variants/UI/ParallelVariantsForm.java Normal file
View File

@@ -0,0 +1,53 @@
package _VisualDVM.ProjectData.SapforData.Variants.UI;
import Common.Database.Tables.DataSet;
import Common.Visual.DataSetControlForm;
import Common.Visual.Menus.DataMenuBar;
import Common.Visual.Tables.RendererDate;
import Common.Visual.Tables.RendererMaskedNanInteger;
import Common.Visual.Tables.RendererMultiline;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.ProjectData.SapforData.Variants.ParallelVariant;
import javax.swing.*;
public class ParallelVariantsForm extends DataSetControlForm<ParallelVariant> {
public ParallelVariantsForm(DataSet<?, ParallelVariant> dataSource_in, JPanel mountPanel_in) {
super(dataSource_in, mountPanel_in);
}
@Override
public boolean hasCheckBox() {
return true;
}
@Override
public String[] getUIColumnNames() {
return new String[]{
"Распределение",
"PARALLEL",
"REMOTE",
"REDISTRIBUTE",
"INTERVALS",
"PS.REMOTE",
"PS.SHADOW",
"PS.REDUCTION",
"PS.ACROSS",
"Оценка",
"Дата оценки",
"Версия"};
}
@Override
protected void AdditionalInitColumns() {
columns.get(0).setVisible(false);
columns.get(2).setRendererClass(RendererMultiline.class);
for (int i = 3; i < columns.size() - 3; ++i)
columns.get(i).setRendererClass(RendererMaskedNanInteger.class);
columns.get(columns.size() - 3).setRendererClass(RendererVariantRank.class);
columns.get(columns.size() - 2).setRendererClass(RendererDate.class);
}
@Override
public DataMenuBar createMenuBar() {
return new DataMenuBar(dataSource.getPluralDescription(),
PassCode.ShowAllParallelVariants,
PassCode.ShowParallelVariantsCoverage,
PassCode.PredictParallelVariants,
PassCode.CreateParallelVariants);
}
}

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

@@ -1,67 +0,0 @@
package _VisualDVM.ProjectData.SapforData.Variants;
import Common.Database.Tables.DataSet;
import Common.Visual.DataSetControlForm;
import Common.Visual.Menus.DataMenuBar;
import Common.Visual.Tables.RendererDate;
import Common.Visual.Tables.RendererMaskedNanInteger;
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);
}
@Override
public String getPluralDescription() {
return "варианты";
}
@Override
protected DataSetControlForm createUI(JPanel mountPanel) {
return new DataSetControlForm(this, mountPanel) {
@Override
public boolean hasCheckBox() {
return true;
}
@Override
public String[] getUIColumnNames() {
return new String[]{
"Распределение",
"PARALLEL",
"REMOTE",
"REDISTRIBUTE",
"INTERVALS",
"PS.REMOTE",
"PS.SHADOW",
"PS.REDUCTION",
"PS.ACROSS",
"Оценка",
"Дата оценки",
"Версия"};
}
@Override
protected void AdditionalInitColumns() {
columns.get(0).setVisible(false);
columns.get(2).setRendererClass(RendererMultiline.class);
for (int i = 3; i < columns.size() - 3; ++i)
columns.get(i).setRendererClass(RendererMaskedNanInteger.class);
columns.get(columns.size() - 3).setRendererClass(RendererVariantRank.class);
columns.get(columns.size() - 2).setRendererClass(RendererDate.class);
}
@Override
public DataMenuBar createMenuBar() {
return new DataMenuBar(getPluralDescription(),
PassCode.ShowAllParallelVariants,
PassCode.ShowParallelVariantsCoverage,
PassCode.PredictParallelVariants,
PassCode.CreateParallelVariants);
}
};
}
@Override
public Current CurrentName() {
return Current.ParallelVariant;
}
}

1
src/_VisualDVM/Repository/BugReport/BugReport.java
View File

@@ -2,6 +2,7 @@ package _VisualDVM.Repository.BugReport;
import Common.Database.Objects.DBObject;
import Common.Database.Objects.rDBObject;
import _VisualDVM.Global;
import _VisualDVM.Repository.BugReport.UI.BugReportInterface;
import _VisualDVM.Repository.Component.ComponentType;
import com.sun.org.glassfish.gmbal.Description;

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

@@ -2,17 +2,11 @@ package _VisualDVM.Repository.BugReport;
import Common.Database.Tables.DBTable;
import Common.Passes.PassCode_;
import Common.Visual.DataSetControlForm;
import Common.Visual.Menus.DataMenuBar;
import Common.Visual.Tables.RendererDate;
import Common.Visual.Tables.RendererProgressBar;
import Common.Visual.Tables.RendererStatusEnum;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Repository.BugReport.UI.BugReportsForm;
import javax.swing.*;
import java.awt.event.ActionEvent;
import java.awt.event.KeyEvent;
import java.util.Comparator;
import java.util.Vector;
import java.util.stream.Collectors;
@@ -30,69 +24,7 @@ public class BugReportsDBTable extends DBTable<String, BugReport> {
}
@Override
protected DataSetControlForm createUI(JPanel mountPanel) {
return new DataSetControlForm(this, mountPanel) {
@Override
public String[] getUIColumnNames() {
return new String[]{
"Описание",
"Отправитель",
"Исполнитель",
"Проект",
"Завершенность",
"Дата создания",
"Дата изменения",
"Статус"};
}
@Override
public void ShowCurrentObject() throws Exception {
super.ShowCurrentObject();
Global.mainModule.getUI().getMainWindow().getCallbackWindow().ShowCurrentBugReport();
}
@Override
public void ShowNoCurrentObject() throws Exception {
super.ShowNoCurrentObject();
Global.mainModule.getUI().getMainWindow().getCallbackWindow().ShowNoCurrentBugReport();
}
@Override
protected void AdditionalInitColumns() {
columns.get(1).setMaxWidth(600);
columns.get(5).setRendererClass(RendererProgressBar.class);
columns.get(6).setRendererClass(RendererDate.class);
columns.get(7).setRendererClass(RendererDate.class);
columns.get(8).setRendererClass(RendererStatusEnum.class);
}
@Override
public void MouseAction2() throws Exception {
Global.mainModule.getPass(PassCode.OpenBugReportTestProject).Do();
}
@Override
protected void createControl() {
//https://stackoverflow.com/questions/9091208/jtable-enter-key
super.createControl();
final String solve = "Solve";
KeyStroke enter = KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, 0);
control.getInputMap(JTable.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT).put(enter, solve);
control.getActionMap().put(solve, new AbstractAction() {
@Override
public void actionPerformed(ActionEvent e) {
Global.mainModule.getPass(PassCode.OpenBugReportTestProject).Do();
}
});
}
@Override
public DataMenuBar createMenuBar() {
return new DataMenuBar(getPluralDescription(),
PassCode.SynchronizeBugReports,
PassCode.DownloadAllBugReportsArchives,
PassCode.AddBugReport,
PassCode.PublishBugReport,
PassCode.OpenBugReportTestProject,
PassCode.OpenBugReport,
PassCode.UpdateBugReportProgress,
PassCode.CloseBugReport,
PassCode.DeleteBugReport);
}
};
return new BugReportsForm(this, mountPanel);
}
@Override
public Comparator<BugReport> getComparator() {

5
src/_VisualDVM/Repository/BugReport/BugReportInterface.java → src/_VisualDVM/Repository/BugReport/UI/BugReportInterface.java
View File

@@ -1,13 +1,16 @@
package _VisualDVM.Repository.BugReport;
package _VisualDVM.Repository.BugReport.UI;
import Common.Utils.TextLog;
import Common.Utils.Utils_;
import _VisualDVM.Global;
import _VisualDVM.Repository.BugReport.BugReport;
import _VisualDVM.Repository.BugReport.BugReportState;
import _VisualDVM.Repository.RepositoryServer;
import _VisualDVM.Repository.Subscribes.Subscriber;
import java.io.File;
import java.nio.file.Paths;
import java.util.Vector;
//todo слить с формой.
public class BugReportInterface {
public static String filterKey = "";
public static String filterSenderName = "";

80
src/_VisualDVM/Repository/BugReport/UI/BugReportsForm.java Normal file
View File

@@ -0,0 +1,80 @@
package _VisualDVM.Repository.BugReport.UI;
import Common.Database.Tables.DataSet;
import Common.Visual.DataSetControlForm;
import Common.Visual.Menus.DataMenuBar;
import Common.Visual.Tables.RendererDate;
import Common.Visual.Tables.RendererProgressBar;
import Common.Visual.Tables.RendererStatusEnum;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Repository.BugReport.BugReport;
import javax.swing.*;
import java.awt.event.ActionEvent;
import java.awt.event.KeyEvent;
public class BugReportsForm extends DataSetControlForm<BugReport> {
public BugReportsForm(DataSet<?, BugReport> dataSource_in, JPanel mountPanel_in) {
super(dataSource_in, mountPanel_in);
}
@Override
public String[] getUIColumnNames() {
return new String[]{
"Описание",
"Отправитель",
"Исполнитель",
"Проект",
"Завершенность",
"Дата создания",
"Дата изменения",
"Статус"};
}
@Override
public void ShowCurrentObject() throws Exception {
super.ShowCurrentObject();
Global.mainModule.getUI().getMainWindow().getCallbackWindow().ShowCurrentBugReport();
}
@Override
public void ShowNoCurrentObject() throws Exception {
super.ShowNoCurrentObject();
Global.mainModule.getUI().getMainWindow().getCallbackWindow().ShowNoCurrentBugReport();
}
@Override
protected void AdditionalInitColumns() {
columns.get(1).setMaxWidth(600);
columns.get(5).setRendererClass(RendererProgressBar.class);
columns.get(6).setRendererClass(RendererDate.class);
columns.get(7).setRendererClass(RendererDate.class);
columns.get(8).setRendererClass(RendererStatusEnum.class);
}
@Override
public void MouseAction2() throws Exception {
Global.mainModule.getPass(PassCode.OpenBugReportTestProject).Do();
}
@Override
protected void createControl() {
//https://stackoverflow.com/questions/9091208/jtable-enter-key
super.createControl();
final String solve = "Solve";
KeyStroke enter = KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, 0);
control.getInputMap(JTable.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT).put(enter, solve);
control.getActionMap().put(solve, new AbstractAction() {
@Override
public void actionPerformed(ActionEvent e) {
Global.mainModule.getPass(PassCode.OpenBugReportTestProject).Do();
}
});
}
@Override
public DataMenuBar createMenuBar() {
return new DataMenuBar(dataSource.getPluralDescription(),
PassCode.SynchronizeBugReports,
PassCode.DownloadAllBugReportsArchives,
PassCode.AddBugReport,
PassCode.PublishBugReport,
PassCode.OpenBugReportTestProject,
PassCode.OpenBugReport,
PassCode.UpdateBugReportProgress,
PassCode.CloseBugReport,
PassCode.DeleteBugReport);
}
}

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

@@ -10,6 +10,7 @@ import Common.Visual.Tables.RendererStatusEnum;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Repository.Component.UI.ComponentsForm;
import javax.swing.*;
import java.util.Vector;
@@ -27,49 +28,7 @@ public class ComponentsSet extends DataSet<ComponentType, Component> {
}
@Override
protected DataSetControlForm createUI(JPanel mountPanel) {
return new DataSetControlForm(this, mountPanel) {
@Override
public boolean hasCheckBox() {
return true;
}
@Override
public String[] getUIColumnNames() {
return new String[]{
"Компонент",
"Текущая версия",
"Актуальная версия",
"Дата сборки",
"Статус"};
}
@Override
protected void AdditionalInitColumns() {
columns.get(0).setVisible(false);
columns.get(3).setRendererClass(RendererMaskedNanInteger.class);
columns.get(4).setRendererClass(RendererMaskedNanInteger.class);
columns.get(6).setRendererClass(RendererStatusEnum.class);
}
@Override
public DataMenuBar createMenuBar() {
return new DataMenuBar(getPluralDescription(), PassCode.InstallComponentFromFolder,
PassCode.UpdateSelectedComponents,
PassCode.PublishComponent,
PassCode.ShowComponentChangesLog) {
{
addMenus(
new VisualiserMenu(
"Восстановление предыдущей версии компонента", "/icons/Resurrect.png") {
{
setFont(MainModule_.instance.getUI().getTheme().Fonts.get(VisualiserFonts.Menu));
add(Global.mainModule.getPass(PassCode.ResurrectComponent).createMenuItem());
add(Global.mainModule.getPass(PassCode.ResurrectComponentFromServer).createMenuItem());
}
}
);
Global.mainModule.getPass(PassCode.PublishComponent).setControlsVisible(false);
}
};
}
};
return new ComponentsForm(this, mountPanel);
}
@Override
public Current CurrentName() {

77
src/_VisualDVM/Repository/Component/UI/ComponentsForm.java
View File

@@ -1,43 +1,60 @@
package _VisualDVM.Repository.Component.UI;
import Common.Visual.Windows.Dialog.Dialog;
import Common.Database.Tables.DataSet;
import Common.MainModule_;
import Common.Visual.DataSetControlForm;
import Common.Visual.Fonts.VisualiserFonts;
import Common.Visual.Menus.DataMenuBar;
import Common.Visual.Menus.VisualiserMenu;
import Common.Visual.Tables.RendererMaskedNanInteger;
import Common.Visual.Tables.RendererStatusEnum;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Repository.Component.Component;
import java.awt.*;
public class ComponentsForm extends Dialog<Object, ComponentsFields> {
public ComponentsForm() {
super(ComponentsFields.class);
import javax.swing.*;
public class ComponentsForm extends DataSetControlForm<Component> {
public ComponentsForm(DataSet<?, Component> dataSource_in, JPanel mountPanel_in) {
super(dataSource_in, mountPanel_in);
}
@Override
public boolean NeedsScroll() {
return false;
public boolean hasCheckBox() {
return true;
}
@Override
public int getDefaultWidth() {
return Global.properties.ComponentsWindowWidth;
public String[] getUIColumnNames() {
return new String[]{
"Компонент",
"Текущая версия",
"Актуальная версия",
"Дата сборки",
"Статус"};
}
@Override
public int getDefaultHeight() {
return Global.properties.ComponentsWindowHeight;
protected void AdditionalInitColumns() {
columns.get(0).setVisible(false);
columns.get(3).setRendererClass(RendererMaskedNanInteger.class);
columns.get(4).setRendererClass(RendererMaskedNanInteger.class);
columns.get(6).setRendererClass(RendererStatusEnum.class);
}
@Override
public void CreateButtons() {
}
@Override
public void Init(Object... params) {
Global.Components.ShowUI();
}
@Override
public void LoadSize() {
setMinimumSize(new Dimension(650, 250));
Dimension dimension = new Dimension(getDefaultWidth(), getDefaultHeight());
setPreferredSize(dimension);
setSize(dimension);
}
@Override
public void onClose() {
super.onClose();
Global.properties.ComponentsWindowWidth = getWidth();
Global.properties.ComponentsWindowHeight = getHeight();
Global.properties.Update();
public DataMenuBar createMenuBar() {
return new DataMenuBar(dataSource.getPluralDescription(), PassCode.InstallComponentFromFolder,
PassCode.UpdateSelectedComponents,
PassCode.PublishComponent,
PassCode.ShowComponentChangesLog) {
{
addMenus(
new VisualiserMenu(
"Восстановление предыдущей версии компонента", "/icons/Resurrect.png") {
{
setFont(MainModule_.instance.getUI().getTheme().Fonts.get(VisualiserFonts.Menu));
add(Global.mainModule.getPass(PassCode.ResurrectComponent).createMenuItem());
add(Global.mainModule.getPass(PassCode.ResurrectComponentFromServer).createMenuItem());
}
}
);
Global.mainModule.getPass(PassCode.PublishComponent).setControlsVisible(false);
}
};
}
}

43
src/_VisualDVM/Repository/Component/UI/ComponentsWindow.java Normal file
View File

@@ -0,0 +1,43 @@
package _VisualDVM.Repository.Component.UI;
import Common.Visual.Windows.Dialog.Dialog;
import _VisualDVM.Global;
import java.awt.*;
public class ComponentsWindow extends Dialog<Object, ComponentsFields> {
public ComponentsWindow() {
super(ComponentsFields.class);
}
@Override
public boolean NeedsScroll() {
return false;
}
@Override
public int getDefaultWidth() {
return Global.properties.ComponentsWindowWidth;
}
@Override
public int getDefaultHeight() {
return Global.properties.ComponentsWindowHeight;
}
@Override
public void CreateButtons() {
}
@Override
public void Init(Object... params) {
Global.Components.ShowUI();
}
@Override
public void LoadSize() {
setMinimumSize(new Dimension(650, 250));
Dimension dimension = new Dimension(getDefaultWidth(), getDefaultHeight());
setPreferredSize(dimension);
setSize(dimension);
}
@Override
public void onClose() {
super.onClose();
Global.properties.ComponentsWindowWidth = getWidth();
Global.properties.ComponentsWindowHeight = getHeight();
Global.properties.Update();
}
}

2
src/_VisualDVM/Repository/Server/ComponentsServer.java
View File

@@ -13,7 +13,7 @@ import _VisualDVM.Passes.All.UnzipFolderPass;
import _VisualDVM.Passes.All.ZipFolderPass;
import _VisualDVM.ProjectData.LanguageName;
import _VisualDVM.Repository.BugReport.BugReport;
import _VisualDVM.Repository.BugReport.BugReportInterface;
import _VisualDVM.Repository.BugReport.UI.BugReportInterface;
import _VisualDVM.Repository.BugReportsDatabase;
import _VisualDVM.Repository.Component.ComponentType;
import _VisualDVM.Repository.EmailMessage;

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

@@ -15,6 +15,7 @@ import _VisualDVM.Passes.PassCode;
import _VisualDVM.Repository.SubscriberWorkspace.SubscriberWorkspace;
import _VisualDVM.Repository.Subscribes.UI.SubscriberFields;
import _VisualDVM.Repository.Subscribes.UI.SubscriberForm;
import _VisualDVM.Repository.Subscribes.UI.SubsribersForm;
import javax.swing.*;
import java.util.LinkedHashMap;
@@ -32,36 +33,7 @@ public class SubsribersDBTable extends DBTable<String, Subscriber> {
}
@Override
protected DataSetControlForm createUI(JPanel mountPanel) {
return new DataSetControlForm(this, mountPanel) {
@Override
public boolean hasCheckBox() {
return true;
}
@Override
public String[] getUIColumnNames() {
return new String[]{
"Имя",
"Роль",
"Рассылка"};
}
@Override
protected void AdditionalInitColumns() {
boolean admin = Global.mainModule.getAccount().role.equals(AccountRole.Admin);
columns.get(0).setVisible(admin);
columns.get(1).setVisible(Global.mainModule.getBugReport() != null);
columns.get(3).setVisible(admin);
columns.get(4).setVisible(admin);
}
@Override
public DataMenuBar createMenuBar() {
return new DataMenuBar(getPluralDescription(),
PassCode.SaveBugReportExecutor,
PassCode.SaveBugReportRecipients,
PassCode.AddSubscriber,
PassCode.EditSubscriber,
PassCode.DeleteSubscriber);
}
};
return new SubsribersForm(this, mountPanel);
}
@Override
public Current CurrentName() {

43
src/_VisualDVM/Repository/Subscribes/UI/SubsribersForm.java Normal file
View File

@@ -0,0 +1,43 @@
package _VisualDVM.Repository.Subscribes.UI;
import Common.Database.Tables.DataSet;
import Common.Visual.DataSetControlForm;
import Common.Visual.Menus.DataMenuBar;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.Account.AccountRole;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Repository.Subscribes.Subscriber;
import javax.swing.*;
public class SubsribersForm extends DataSetControlForm<Subscriber> {
public SubsribersForm(DataSet<?, Subscriber> dataSource_in, JPanel mountPanel_in) {
super(dataSource_in, mountPanel_in);
}
@Override
public boolean hasCheckBox() {
return true;
}
@Override
public String[] getUIColumnNames() {
return new String[]{
"Имя",
"Роль",
"Рассылка"};
}
@Override
protected void AdditionalInitColumns() {
boolean admin = Global.mainModule.getAccount().role.equals(AccountRole.Admin);
columns.get(0).setVisible(admin);
columns.get(1).setVisible(Global.mainModule.getBugReport() != null);
columns.get(3).setVisible(admin);
columns.get(4).setVisible(admin);
}
@Override
public DataMenuBar createMenuBar() {
return new DataMenuBar(dataSource.getPluralDescription(),
PassCode.SaveBugReportExecutor,
PassCode.SaveBugReportRecipients,
PassCode.AddSubscriber,
PassCode.EditSubscriber,
PassCode.DeleteSubscriber);
}
}

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

@@ -12,6 +12,7 @@ import _VisualDVM.Passes.PassCode;
import _VisualDVM.ServerObjectsCache.ConfigurationCache;
import _VisualDVM.ServerObjectsCache.VisualCaches;
import _VisualDVM.TestingSystem.DVM.DVMConfiguration.UI.ConfigurationFields;
import _VisualDVM.TestingSystem.DVM.DVMConfiguration.UI.DVMConfigurationsForm;
import javax.swing.*;
public class DVMConfigurationDBTable extends iDBTable<DVMConfiguration> {
@@ -32,42 +33,8 @@ public class DVMConfigurationDBTable extends iDBTable<DVMConfiguration> {
}
@Override
protected DataSetControlForm createUI(JPanel mountPanel) {
return new DataSetControlForm(this, mountPanel) {
@Override
public boolean hasCheckBox() {
return true;
}
@Override
public String[] getUIColumnNames() {
return new String[]{
"имя",
"автор",
"ядра",
"параметры",
"группы",
"тестов",
"компиляция(с)",
"запуск(с)"
};
}
@Override
protected void AdditionalInitColumns() {
columns.get(6).setRendererClass(RendererMultiline.class);
columns.get(6).setMaxWidth(500);
}
@Override
public DataMenuBar createMenuBar() {
return new DataMenuBar(getPluralDescription(),
PassCode.PublishConfiguration,
PassCode.EditConfiguration,
PassCode.ShowCurrentDVMConfigurationTests,
PassCode.SaveCurrentDVMConfiguration,
PassCode.DeleteConfiguration,
PassCode.StartSelectedDVMConfigurations);
}
};
return new DVMConfigurationsForm(this, mountPanel);
}
@Override
public DBObjectDialog<DVMConfiguration, ConfigurationFields> getDialog() {
return new DBObjectDialog<DVMConfiguration, ConfigurationFields>(ConfigurationFields.class) {

46
src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/UI/DVMConfigurationsForm.java Normal file
View File

@@ -0,0 +1,46 @@
package _VisualDVM.TestingSystem.DVM.DVMConfiguration.UI;
import Common.Database.Tables.DataSet;
import Common.Visual.DataSetControlForm;
import Common.Visual.Menus.DataMenuBar;
import Common.Visual.Tables.RendererMultiline;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.TestingSystem.DVM.DVMConfiguration.DVMConfiguration;
import javax.swing.*;
public class DVMConfigurationsForm extends DataSetControlForm<DVMConfiguration> {
public DVMConfigurationsForm(DataSet<?, DVMConfiguration> dataSource_in, JPanel mountPanel_in) {
super(dataSource_in, mountPanel_in);
}
@Override
public boolean hasCheckBox() {
return true;
}
@Override
public String[] getUIColumnNames() {
return new String[]{
"имя",
"автор",
"ядра",
"параметры",
"группы",
"тестов",
"компиляция(с)",
"запуск(с)"
};
}
@Override
protected void AdditionalInitColumns() {
columns.get(6).setRendererClass(RendererMultiline.class);
columns.get(6).setMaxWidth(500);
}
@Override
public DataMenuBar createMenuBar() {
return new DataMenuBar(dataSource.getPluralDescription(),
PassCode.PublishConfiguration,
PassCode.EditConfiguration,
PassCode.ShowCurrentDVMConfigurationTests,
PassCode.SaveCurrentDVMConfiguration,
PassCode.DeleteConfiguration,
PassCode.StartSelectedDVMConfigurations);
}
}

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

@@ -14,6 +14,7 @@ import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.ServerObjectsCache.PackageCache;
import _VisualDVM.ServerObjectsCache.VisualCaches;
import _VisualDVM.TestingSystem.DVM.DVMPackage.UI.DVMPackagesForm;
import javax.swing.*;
import java.util.Comparator;
@@ -38,99 +39,7 @@ public class DVMPackageDBTable extends iDBTable<DVMPackage> {
}
@Override
protected DataSetControlForm createUI(JPanel mountPanel) {
return new DataSetControlForm(this, mountPanel) {
@Override
public boolean hasCheckBox() {
return true;
}
@Override
public String[] getUIColumnNames() {
return new String[]{
"Автор",
"Машина",
"Пользователь",
"DVM",
"Конфигурации",
"Задач",
"Ядер",
"Прогресс",
"Начало",
"Изменено",
"Статус"
};
}
@Override
protected void AdditionalInitColumns() {
columns.get(6).setRendererClass(RendererMultiline.class);
columns.get(9).setRendererClass(RendererProgressBar.class);
columns.get(10).setRendererClass(RendererDate.class);
columns.get(11).setRendererClass(RendererDate.class);
columns.get(12).setRendererClass(RendererStatusEnum.class);
}
@Override
public void ShowCurrentObject() throws Exception {
super.ShowCurrentObject();
//--
Global.testingServer.db.dvmRunTasks.ShowDVMPackage(getCurrent());
Global.mainModule.getUI().getMainWindow().getTestingWindow().DropTestRunTasksComparison();
//--
}
@Override
public void ShowNoCurrentObject() throws Exception {
super.ShowNoCurrentObject();
Global.testingServer.db.dvmRunTasks.ShowNoPackage();
Global.mainModule.getUI().getMainWindow().getTestingWindow().DropTestRunTasksComparison();
}
@Override
public void MouseAction2() throws Exception {
Global.mainModule.getPass(PassCode.DownloadDVMPackage).Do();
}
@Override
public DataMenuBar createMenuBar() {
return new DataMenuBar(getPluralDescription()) {
{
addPasses(PassCode.SynchronizeTests);
addSeparator();
addPasses(PassCode.AbortDVMPackage);
addSeparator();
addPasses(PassCode.DownloadDVMPackage,
PassCode.ExportDVMPackageToExcel,
PassCode.DeleteDVMPackage);
add(new JSeparator());
add(new MenuBarButton() {
{
setText("Свои");
setToolTipText("Отображать только пакеты тестов авторства пользователя");
Mark();
addActionListener(e -> {
DVMPackageDBTable.filterMyOnly = !DVMPackageDBTable.filterMyOnly;
Mark();
Global.testingServer.db.dvmPackages.ShowUI();
});
}
public void Mark() {
setIcon(Utils_.getIcon(DVMPackageDBTable.filterMyOnly ? "/Common/icons/Pick.png" : "/Common/icons/NotPick.png"));
}
});
add(new MenuBarButton() {
{
setText("Активные");
setToolTipText("Отображать только активные пакеты тестов");
Mark();
addActionListener(e -> {
DVMPackageDBTable.filterActive = !DVMPackageDBTable.filterActive;
Mark();
Global.testingServer.db.dvmPackages.ShowUI();
});
}
public void Mark() {
setIcon(Utils_.getIcon(DVMPackageDBTable.filterActive ? "/Common/icons/Pick.png" : "/Common/icons/NotPick.png"));
}
});
}
};
}
};
return new DVMPackagesForm(this, mountPanel);
}
@Override
public Comparator<DVMPackage> getComparator() {

112
src/_VisualDVM/TestingSystem/DVM/DVMPackage/UI/DVMPackagesForm.java Normal file
View File

@@ -0,0 +1,112 @@
package _VisualDVM.TestingSystem.DVM.DVMPackage.UI;
import Common.Database.Tables.DataSet;
import Common.Utils.Utils_;
import Common.Visual.Controls.MenuBarButton;
import Common.Visual.DataSetControlForm;
import Common.Visual.Menus.DataMenuBar;
import Common.Visual.Tables.RendererDate;
import Common.Visual.Tables.RendererMultiline;
import Common.Visual.Tables.RendererProgressBar;
import Common.Visual.Tables.RendererStatusEnum;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.TestingSystem.DVM.DVMPackage.DVMPackage;
import _VisualDVM.TestingSystem.DVM.DVMPackage.DVMPackageDBTable;
import javax.swing.*;
public class DVMPackagesForm extends DataSetControlForm<DVMPackage> {
public DVMPackagesForm(DataSet<?, DVMPackage> dataSource_in, JPanel mountPanel_in) {
super(dataSource_in, mountPanel_in);
}
@Override
public boolean hasCheckBox() {
return true;
}
@Override
public String[] getUIColumnNames() {
return new String[]{
"Автор",
"Машина",
"Пользователь",
"DVM",
"Конфигурации",
"Задач",
"Ядер",
"Прогресс",
"Начало",
"Изменено",
"Статус"
};
}
@Override
protected void AdditionalInitColumns() {
columns.get(6).setRendererClass(RendererMultiline.class);
columns.get(9).setRendererClass(RendererProgressBar.class);
columns.get(10).setRendererClass(RendererDate.class);
columns.get(11).setRendererClass(RendererDate.class);
columns.get(12).setRendererClass(RendererStatusEnum.class);
}
@Override
public void ShowCurrentObject() throws Exception {
super.ShowCurrentObject();
//--
Global.testingServer.db.dvmRunTasks.ShowDVMPackage((DVMPackage) dataSource.getCurrent());
Global.mainModule.getUI().getMainWindow().getTestingWindow().DropTestRunTasksComparison();
//--
}
@Override
public void ShowNoCurrentObject() throws Exception {
super.ShowNoCurrentObject();
Global.testingServer.db.dvmRunTasks.ShowNoPackage();
Global.mainModule.getUI().getMainWindow().getTestingWindow().DropTestRunTasksComparison();
}
@Override
public void MouseAction2() throws Exception {
Global.mainModule.getPass(PassCode.DownloadDVMPackage).Do();
}
@Override
public DataMenuBar createMenuBar() {
return new DataMenuBar(dataSource.getPluralDescription()) {
{
addPasses(PassCode.SynchronizeTests);
addSeparator();
addPasses(PassCode.AbortDVMPackage);
addSeparator();
addPasses(PassCode.DownloadDVMPackage,
PassCode.ExportDVMPackageToExcel,
PassCode.DeleteDVMPackage);
add(new JSeparator());
add(new MenuBarButton() {
{
setText("Свои");
setToolTipText("Отображать только пакеты тестов авторства пользователя");
Mark();
addActionListener(e -> {
DVMPackageDBTable.filterMyOnly = !DVMPackageDBTable.filterMyOnly;
Mark();
Global.testingServer.db.dvmPackages.ShowUI();
});
}
public void Mark() {
setIcon(Utils_.getIcon(DVMPackageDBTable.filterMyOnly ? "/Common/icons/Pick.png" : "/Common/icons/NotPick.png"));
}
});
add(new MenuBarButton() {
{
setText("Активные");
setToolTipText("Отображать только активные пакеты тестов");
Mark();
addActionListener(e -> {
DVMPackageDBTable.filterActive = !DVMPackageDBTable.filterActive;
Mark();
Global.testingServer.db.dvmPackages.ShowUI();
});
}
public void Mark() {
setIcon(Utils_.getIcon(DVMPackageDBTable.filterActive ? "/Common/icons/Pick.png" : "/Common/icons/NotPick.png"));
}
});
}
};
}
}

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

@@ -10,6 +10,7 @@ import _VisualDVM.Current;
import _VisualDVM.GlobalData.Tasks.TaskState;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.TestingSystem.DVM.DVMPackage.DVMPackage;
import _VisualDVM.TestingSystem.DVM.DVMTasks.UI.DVMRunTasksForm;
import javax.swing.*;
import java.util.Comparator;
@@ -29,74 +30,8 @@ public class DVMRunTasksSet extends DataSet<Integer, DVMRunTask> {
}
@Override
protected DataSetControlForm createUI(JPanel mountPanel) {
return new DataSetControlForm(this, mountPanel) {
@Override
public boolean hasCheckBox() {
return true;
}
@Override
public String[] getUIColumnNames() {
return new String[]{
"Тест",
"Язык",
"Флаги",
"Компиляция",
"Запуск",
"Матрица",
"Окружение",
"usr.par",
"Время компиляции (с)",
"Время запуска (с)",
"Чистое время (с)",
"Прогресс",
};
}
@Override
protected void AdditionalInitColumns() {
columns.get(5).setRendererClass(RendererStatusEnum.class);
columns.get(6).setRendererClass(RendererStatusEnum.class);
columns.get(13).setRendererClass(RendererProgressBar.class);
}
@Override
public DataMenuBar createMenuBar() {
return new DataMenuBar(getPluralDescription(), PassCode.CompareDVMRunTasks, PassCode.DownloadTaskTest);
}
@Override
protected void createFilters() {
filtersMenus.add(new DataSetFiltersMenu<DVMRunTask>("Компиляция", dataSource) {
@Override
public void fill() {
for (TaskState state : TaskState.values()) {
if (state.isVisible()) {
field_filters.add(new DBObjectFilter<DVMRunTask>(dataSet, state.getDescription()) {
@Override
protected boolean validate(DVMRunTask object) {
return object.compilation_state.equals(state);
}
});
}
}
}
});
filtersMenus.add(new DataSetFiltersMenu<DVMRunTask>("Запуск", dataSource) {
@Override
public void fill() {
for (TaskState state : TaskState.values()) {
if (state.isVisible()) {
field_filters.add(new DBObjectFilter<DVMRunTask>(dataSet, state.getDescription()) {
@Override
protected boolean validate(DVMRunTask object) {
return object.state.equals(state);
}
});
}
}
}
});
}
};
return new DVMRunTasksForm(this, mountPanel);
}
@Override
public Current CurrentName() {
return Current.DVMRunTask;

82
src/_VisualDVM/TestingSystem/DVM/DVMTasks/UI/DVMRunTasksForm.java Normal file
View File

@@ -0,0 +1,82 @@
package _VisualDVM.TestingSystem.DVM.DVMTasks.UI;
import Common.Database.Tables.DataSet;
import Common.Visual.DBObjectFilter;
import Common.Visual.DataSetControlForm;
import Common.Visual.DataSetFiltersMenu;
import Common.Visual.Menus.DataMenuBar;
import Common.Visual.Tables.RendererProgressBar;
import Common.Visual.Tables.RendererStatusEnum;
import _VisualDVM.GlobalData.Tasks.TaskState;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.TestingSystem.DVM.DVMTasks.DVMRunTask;
import javax.swing.*;
public class DVMRunTasksForm extends DataSetControlForm<DVMRunTask> {
public DVMRunTasksForm(DataSet<?, DVMRunTask> dataSource_in, JPanel mountPanel_in) {
super(dataSource_in, mountPanel_in);
}
@Override
public boolean hasCheckBox() {
return true;
}
@Override
public String[] getUIColumnNames() {
return new String[]{
"Тест",
"Язык",
"Флаги",
"Компиляция",
"Запуск",
"Матрица",
"Окружение",
"usr.par",
"Время компиляции (с)",
"Время запуска (с)",
"Чистое время (с)",
"Прогресс",
};
}
@Override
protected void AdditionalInitColumns() {
columns.get(5).setRendererClass(RendererStatusEnum.class);
columns.get(6).setRendererClass(RendererStatusEnum.class);
columns.get(13).setRendererClass(RendererProgressBar.class);
}
@Override
public DataMenuBar createMenuBar() {
return new DataMenuBar(dataSource.getPluralDescription(), PassCode.CompareDVMRunTasks, PassCode.DownloadTaskTest);
}
@Override
protected void createFilters() {
filtersMenus.add(new DataSetFiltersMenu<DVMRunTask>("Компиляция", dataSource) {
@Override
public void fill() {
for (TaskState state : TaskState.values()) {
if (state.isVisible()) {
field_filters.add(new DBObjectFilter<DVMRunTask>(dataSet, state.getDescription()) {
@Override
protected boolean validate(DVMRunTask object) {
return object.compilation_state.equals(state);
}
});
}
}
}
});
filtersMenus.add(new DataSetFiltersMenu<DVMRunTask>("Запуск", dataSource) {
@Override
public void fill() {
for (TaskState state : TaskState.values()) {
if (state.isVisible()) {
field_filters.add(new DBObjectFilter<DVMRunTask>(dataSet, state.getDescription()) {
@Override
protected boolean validate(DVMRunTask object) {
return object.state.equals(state);
}
});
}
}
}
});
}
}

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

@@ -11,6 +11,7 @@ import _VisualDVM.Passes.PassCode;
import _VisualDVM.ServerObjectsCache.ConfigurationCache;
import _VisualDVM.ServerObjectsCache.VisualCaches;
import _VisualDVM.TestingSystem.SAPFOR.SapforConfiguration.UI.SapforConfigurationFields;
import _VisualDVM.TestingSystem.SAPFOR.SapforConfiguration.UI.SapforConfigurationsForm;
import _VisualDVM.Visual.Tables.RendererConfigurationAuto;
import _VisualDVM.Visual.Tables.SwitcherConfigurationAuto;
@@ -34,46 +35,8 @@ public class SapforConfigurationDBTable extends iDBTable<SapforConfiguration> {
}
@Override
protected DataSetControlForm createUI(JPanel mountPanel) {
return new DataSetControlForm(this, mountPanel) {
@Override
public boolean hasCheckBox() {
return true;
}
@Override
public String[] getUIColumnNames() {
return new String[]{
"имя",
"автор",
"",
"ядра",
"параметры",
"группы",
"тестов"
};
}
@Override
protected void AdditionalInitColumns() {
columns.get(4).setRendererClass(RendererConfigurationAuto.class);
columns.get(4).setEditorClass(SwitcherConfigurationAuto.class);
columns.get(4).setMinWidth(25);
columns.get(4).setMaxWidth(25);
columns.get(6).setMaxWidth(500);
columns.get(7).setRendererClass(RendererMultiline.class);
columns.get(7).setMaxWidth(500);
}
@Override
public DataMenuBar createMenuBar() {
return new DataMenuBar(getPluralDescription(),
PassCode.PublishSapforConfiguration,
PassCode.EditSapforConfiguration,
PassCode.ShowCurrentSAPFORConfigurationTests,
PassCode.SaveCurrentSAPFORConfiguration,
PassCode.DeleteSapforConfiguration,
PassCode.StartSelectedSAPFORConfigurations);
}
};
return new SapforConfigurationsForm(this, mountPanel);
}
//--
@Override
public DBObjectDialog<SapforConfiguration, SapforConfigurationFields> getDialog() {

52
src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/UI/SapforConfigurationsForm.java Normal file
View File

@@ -0,0 +1,52 @@
package _VisualDVM.TestingSystem.SAPFOR.SapforConfiguration.UI;
import Common.Database.Tables.DataSet;
import Common.Visual.DataSetControlForm;
import Common.Visual.Menus.DataMenuBar;
import Common.Visual.Tables.RendererMultiline;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.TestingSystem.SAPFOR.SapforConfiguration.SapforConfiguration;
import _VisualDVM.Visual.Tables.RendererConfigurationAuto;
import _VisualDVM.Visual.Tables.SwitcherConfigurationAuto;
import javax.swing.*;
public class SapforConfigurationsForm extends DataSetControlForm<SapforConfiguration> {
public SapforConfigurationsForm(DataSet<?, SapforConfiguration> dataSource_in, JPanel mountPanel_in) {
super(dataSource_in, mountPanel_in);
}
@Override
public boolean hasCheckBox() {
return true;
}
@Override
public String[] getUIColumnNames() {
return new String[]{
"имя",
"автор",
"",
"ядра",
"параметры",
"группы",
"тестов"
};
}
@Override
protected void AdditionalInitColumns() {
columns.get(4).setRendererClass(RendererConfigurationAuto.class);
columns.get(4).setEditorClass(SwitcherConfigurationAuto.class);
columns.get(4).setMinWidth(25);
columns.get(4).setMaxWidth(25);
columns.get(6).setMaxWidth(500);
columns.get(7).setRendererClass(RendererMultiline.class);
columns.get(7).setMaxWidth(500);
}
@Override
public DataMenuBar createMenuBar() {
return new DataMenuBar(dataSource.getPluralDescription(),
PassCode.PublishSapforConfiguration,
PassCode.EditSapforConfiguration,
PassCode.ShowCurrentSAPFORConfigurationTests,
PassCode.SaveCurrentSAPFORConfiguration,
PassCode.DeleteSapforConfiguration,
PassCode.StartSelectedSAPFORConfigurations);
}
}

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

@@ -14,6 +14,7 @@ import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.ServerObjectsCache.PackageCache;
import _VisualDVM.ServerObjectsCache.VisualCaches;
import _VisualDVM.TestingSystem.SAPFOR.SapforPackage.UI.SapforPackagesForm;
import javax.swing.*;
import java.util.Comparator;
@@ -38,82 +39,7 @@ public class SapforPackageDBTable extends iDBTable<SapforPackage> {
}
@Override
protected DataSetControlForm createUI(JPanel mountPanel) {
return new DataSetControlForm(this, mountPanel) {
@Override
public boolean hasCheckBox() {
return true;
}
@Override
public String[] getUIColumnNames() {
return new String[]{
"Автор",
"SAPFOR",
"Конфигурации",
"Задач",
"Ядер",
"Прогресс",
"Начало",
"Изменено",
"Статус"
};
}
@Override
protected void AdditionalInitColumns() {
columns.get(4).setRendererClass(RendererMultiline.class);
columns.get(7).setRendererClass(RendererProgressBar.class);
columns.get(8).setRendererClass(RendererDate.class);
columns.get(9).setRendererClass(RendererDate.class);
columns.get(10).setRendererClass(RendererStatusEnum.class);
}
@Override
public void MouseAction2() throws Exception {
Global.mainModule.getPass(PassCode.CompareSapforPackages).Do();
}
@Override
public DataMenuBar createMenuBar() {
return new DataMenuBar(getPluralDescription(), PassCode.SynchronizeTests) {
{
addSeparator();
addPasses(PassCode.AbortSapforPackage);
addSeparator();
addPasses(PassCode.CompareSapforPackages);
addSeparator();
addPasses(PassCode.DeleteSapforPackage);
add(new JSeparator());
add(new MenuBarButton() {
{
setText("Свои");
setToolTipText("Отображать только пакеты тестов авторства пользователя");
Mark();
addActionListener(e -> {
SapforPackageDBTable.filterMyOnly = !SapforPackageDBTable.filterMyOnly;
Mark();
Global.testingServer.db.sapforPackages.ShowUI();
});
}
public void Mark() {
setIcon(Utils_.getIcon(SapforPackageDBTable.filterMyOnly ? "/Common/icons/Pick.png" : "/Common/icons/NotPick.png"));
}
});
add(new MenuBarButton() {
{
setText("Активные");
setToolTipText("Отображать только активные пакеты тестов");
Mark();
addActionListener(e -> {
SapforPackageDBTable.filterActive = !SapforPackageDBTable.filterActive;
Mark();
Global.testingServer.db.sapforPackages.ShowUI();
});
}
public void Mark() {
setIcon(Utils_.getIcon(SapforPackageDBTable.filterActive ? "/Common/icons/Pick.png" : "/Common/icons/NotPick.png"));
}
});
}
};
}
};
return new SapforPackagesForm(this, mountPanel);
}
@Override

95
src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/UI/SapforPackagesForm.java Normal file
View File

@@ -0,0 +1,95 @@
package _VisualDVM.TestingSystem.SAPFOR.SapforPackage.UI;
import Common.Database.Tables.DataSet;
import Common.Utils.Utils_;
import Common.Visual.Controls.MenuBarButton;
import Common.Visual.DataSetControlForm;
import Common.Visual.Menus.DataMenuBar;
import Common.Visual.Tables.RendererDate;
import Common.Visual.Tables.RendererMultiline;
import Common.Visual.Tables.RendererProgressBar;
import Common.Visual.Tables.RendererStatusEnum;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.TestingSystem.SAPFOR.SapforPackage.SapforPackage;
import _VisualDVM.TestingSystem.SAPFOR.SapforPackage.SapforPackageDBTable;
import javax.swing.*;
public class SapforPackagesForm extends DataSetControlForm<SapforPackage> {
public SapforPackagesForm(DataSet<?, SapforPackage> dataSource_in, JPanel mountPanel_in) {
super(dataSource_in, mountPanel_in);
}
@Override
public boolean hasCheckBox() {
return true;
}
@Override
public String[] getUIColumnNames() {
return new String[]{
"Автор",
"SAPFOR",
"Конфигурации",
"Задач",
"Ядер",
"Прогресс",
"Начало",
"Изменено",
"Статус"
};
}
@Override
protected void AdditionalInitColumns() {
columns.get(4).setRendererClass(RendererMultiline.class);
columns.get(7).setRendererClass(RendererProgressBar.class);
columns.get(8).setRendererClass(RendererDate.class);
columns.get(9).setRendererClass(RendererDate.class);
columns.get(10).setRendererClass(RendererStatusEnum.class);
}
@Override
public void MouseAction2() throws Exception {
Global.mainModule.getPass(PassCode.CompareSapforPackages).Do();
}
@Override
public DataMenuBar createMenuBar() {
return new DataMenuBar(dataSource.getPluralDescription(), PassCode.SynchronizeTests) {
{
addSeparator();
addPasses(PassCode.AbortSapforPackage);
addSeparator();
addPasses(PassCode.CompareSapforPackages);
addSeparator();
addPasses(PassCode.DeleteSapforPackage);
add(new JSeparator());
add(new MenuBarButton() {
{
setText("Свои");
setToolTipText("Отображать только пакеты тестов авторства пользователя");
Mark();
addActionListener(e -> {
SapforPackageDBTable.filterMyOnly = !SapforPackageDBTable.filterMyOnly;
Mark();
Global.testingServer.db.sapforPackages.ShowUI();
});
}
public void Mark() {
setIcon(Utils_.getIcon(SapforPackageDBTable.filterMyOnly ? "/Common/icons/Pick.png" : "/Common/icons/NotPick.png"));
}
});
add(new MenuBarButton() {
{
setText("Активные");
setToolTipText("Отображать только активные пакеты тестов");
Mark();
addActionListener(e -> {
SapforPackageDBTable.filterActive = !SapforPackageDBTable.filterActive;
Mark();
Global.testingServer.db.sapforPackages.ShowUI();
});
}
public void Mark() {
setIcon(Utils_.getIcon(SapforPackageDBTable.filterActive ? "/Common/icons/Pick.png" : "/Common/icons/NotPick.png"));
}
});
}
};
}
}

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

@@ -8,6 +8,7 @@ import Common.Visual.Tables.RendererStatusEnum;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.TestingSystem.SAPFOR.ServerSapfor.UI.ServerSapforsForm;
import javax.swing.*;
import java.util.Comparator;
@@ -30,44 +31,7 @@ public class ServerSapforsDBTable extends iDBTable<ServerSapfor> {
@Override
protected DataSetControlForm createUI(JPanel mountPanel) {
return new DataSetControlForm(this, mountPanel) {
@Override
public boolean hasCheckBox() {
return true;
}
@Override
public String[] getUIColumnNames() {
return new String[]{
"версия",
"автор",
"дата сборки",
"сборка"
};
}
@Override
protected void AdditionalInitColumns() {
columns.get(4).setRendererClass(RendererDate.class);
columns.get(5).setRendererClass(RendererStatusEnum.class);
}
@Override
public void ShowCurrentObject() throws Exception {
super.ShowCurrentObject();
Global.mainModule.getUI().getMainWindow().getTestingWindow().ShowCurrentServerSapfor();
}
@Override
public void ShowNoCurrentObject() throws Exception {
super.ShowNoCurrentObject();
Global.mainModule.getUI().getMainWindow().getTestingWindow().ShowNoServerSapfor();
}
@Override
public DataMenuBar createMenuBar() {
return new DataMenuBar(getPluralDescription(),
PassCode.CompileServerSapfor,
PassCode.ShowSapforCompilationOut,
PassCode.ShowSapforCompilationErr,
PassCode.DeleteServerSapfor);
}
};
return new ServerSapforsForm(this, mountPanel);
}
@Override
public Comparator<ServerSapfor> getComparator() {
@@ -77,7 +41,6 @@ public class ServerSapforsDBTable extends iDBTable<ServerSapfor> {
return o2.id - o1.id;
}
};
// return Comparator.comparingInt(o -> o.).reversed();
}
@Override
public PassCode_ getDeletePassCode() {

52
src/_VisualDVM/TestingSystem/SAPFOR/ServerSapfor/UI/ServerSapforsForm.java Normal file
View File

@@ -0,0 +1,52 @@
package _VisualDVM.TestingSystem.SAPFOR.ServerSapfor.UI;
import Common.Database.Tables.DataSet;
import Common.Visual.DataSetControlForm;
import Common.Visual.Menus.DataMenuBar;
import Common.Visual.Tables.RendererDate;
import Common.Visual.Tables.RendererStatusEnum;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.TestingSystem.SAPFOR.ServerSapfor.ServerSapfor;
import javax.swing.*;
public class ServerSapforsForm extends DataSetControlForm<ServerSapfor> {
public ServerSapforsForm(DataSet<?, ServerSapfor> dataSource_in, JPanel mountPanel_in) {
super(dataSource_in, mountPanel_in);
}
@Override
public boolean hasCheckBox() {
return true;
}
@Override
public String[] getUIColumnNames() {
return new String[]{
"версия",
"автор",
"дата сборки",
"сборка"
};
}
@Override
protected void AdditionalInitColumns() {
columns.get(4).setRendererClass(RendererDate.class);
columns.get(5).setRendererClass(RendererStatusEnum.class);
}
@Override
public void ShowCurrentObject() throws Exception {
super.ShowCurrentObject();
Global.mainModule.getUI().getMainWindow().getTestingWindow().ShowCurrentServerSapfor();
}
@Override
public void ShowNoCurrentObject() throws Exception {
super.ShowNoCurrentObject();
Global.mainModule.getUI().getMainWindow().getTestingWindow().ShowNoServerSapfor();
}
@Override
public DataMenuBar createMenuBar() {
return new DataMenuBar(dataSource.getPluralDescription(),
PassCode.CompileServerSapfor,
PassCode.ShowSapforCompilationOut,
PassCode.ShowSapforCompilationErr,
PassCode.DeleteServerSapfor);
}
}

8
src/_VisualDVM/Visual/MainUI.java
View File

@@ -2,7 +2,7 @@ package _VisualDVM.Visual;
import Common.Visual.UIModule_;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.RemoteFile.UI.RemoteFileChooser;
import _VisualDVM.Repository.Component.UI.ComponentsForm;
import _VisualDVM.Repository.Component.UI.ComponentsWindow;
import _VisualDVM.TestingSystem.Common.TestingMenuBar;
import _VisualDVM.Visual.Interface.DebugWindow;
import _VisualDVM.Visual.Interface.VersionsWindow;
@@ -18,7 +18,7 @@ public class MainUI extends UIModule_ {
public VersionsWindow versionsWindow = null;
public DebugWindow debugWindow = null;
public RemoteFileChooser remoteFileChooser = null;
ComponentsForm componentsWindow = null;
ComponentsWindow componentsWindow = null;
//-
TestingMenuBar testingMenuBar = null;
CredentialsMenuBar credentialsMenuBar = null;
@@ -52,9 +52,9 @@ public class MainUI extends UIModule_ {
public boolean hasMainWindow() {
return mainWindow != null;
}
public ComponentsForm getComponentsWindow() {
public ComponentsWindow getComponentsWindow() {
if (componentsWindow == null)
componentsWindow = new ComponentsForm();
componentsWindow = new ComponentsWindow();
return componentsWindow;
}
//--

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

@@ -8,7 +8,7 @@ import _VisualDVM.Global;
import _VisualDVM.GlobalData.Settings.SettingName;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Repository.BugReport.BugReport;
import _VisualDVM.Repository.BugReport.BugReportInterface;
import _VisualDVM.Repository.BugReport.UI.BugReportInterface;
import _VisualDVM.Repository.BugReport.BugReportState;
import _VisualDVM.Visual.Editor.BaseEditor;
import _VisualDVM.Visual.Editor.Viewer;

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

@@ -1,6 +1,7 @@
package _VisualDVM.Visual.Windows;
import Common.CommonConstants;
import Common.Visual.FormWithSplitters;
import Common.Visual.Tables.DataTable;
import Common.Visual.Trees.TreeForm;
import Common.Visual.UI;
import _VisualDVM.Global;
@@ -338,7 +339,7 @@ public class FileForm implements FileWindow, FormWithSplitters {
@Override
public void ShowFirstError() {
if (file.father.db.errors.getUI().getRowCount() > 0)
file.father.db.errors.getUI().getControl().SelectRow(0);
((DataTable)file.father.db.errors.getUI().getControl()).SelectRow(0);
}
@Override
public void ShowCompilationOutput() {