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-15 15:13:57 +03:00
parent b7b82e54c6
commit 5e2a9848da
146 changed files with 565 additions and 615 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2,7 +2,7 @@ package _VisualDVM.TestingSystem.Common.Group;
import Common.Database.Objects.DBObject;
import Common.Database.Objects.riDBObject;
import Common.Utils.Utils_;
import Common.Visual.UI_;
import Common.Visual.UI;
import _VisualDVM.Global;
import _VisualDVM.ProjectData.Files.ProjectFile;
import _VisualDVM.ProjectData.LanguageName;
@@ -88,7 +88,7 @@ public class Group extends riDBObject {
@Override
public void select(boolean flag) {
super.select(flag);
if (UI_.isActive())
if (UI.isActive())
Global.mainModule.getUI().getMainWindow().ShowCheckedTestsCount();
}
public String GenerateMakefile(Test test, String dvm_drv, String flags_in) {

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

@@ -7,7 +7,7 @@ import Common.Database.Tables.iDBTable;
import Common.Visual.DBObjectFilter;
import Common.Visual.DataSetControlForm;
import Common.Visual.DataSetFilter;
import Common.Visual.UI_;
import Common.Visual.UI;
import Common.Visual.Windows.Dialog.DBObjectDialog;
import _VisualDVM.Current;
import _VisualDVM.ProjectData.LanguageName;
@@ -119,8 +119,8 @@ public class GroupsDBTable extends iDBTable<Group> {
@Override
public void fillFields() {
fields.tfName.setText(Result.description);
UI_.TrySelect(fields.cbType, Result.type);
UI_.TrySelect(fields.cbLanguage, Result.language);
UI.TrySelect(fields.cbType, Result.type);
UI.TrySelect(fields.cbLanguage, Result.language);
}
@Override
public void ProcessResult() {

4
src/_VisualDVM/TestingSystem/Common/Test/Test.java
View File

@@ -3,7 +3,7 @@ import Common.CommonConstants;
import Common.Database.Objects.DBObject;
import Common.Database.Objects.riDBObject;
import Common.Utils.Utils_;
import Common.Visual.UI_;
import Common.Visual.UI;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.Passes.All.UnzipFolderPass;
@@ -53,7 +53,7 @@ public class Test extends riDBObject {
@Override
public void select(boolean flag) {
super.select(flag);
if (UI_.isActive())
if (UI.isActive())
Global.mainModule.getUI().getMainWindow().ShowCheckedTestsCount();
}
//---

4
src/_VisualDVM/TestingSystem/Common/TestingMenuBar.java
View File

@@ -4,7 +4,7 @@ import Common.Utils.Utils_;
import Common.Visual.Controls.MenuBarButton;
import Common.Visual.Fonts.VisualiserFonts;
import Common.Visual.Menus.VisualiserMenuBar;
import Common.Visual.UI_;
import Common.Visual.UI;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
@@ -76,7 +76,7 @@ public class TestingMenuBar extends VisualiserMenuBar {
sCheckTime.setMaximumSize(new Dimension(60, 26));
sCheckTime.setModel(new SpinnerNumberModel(Global.properties.CheckTestingIntervalSeconds, 10, 3600, 1));
sCheckTime.setValue(Global.properties.CheckTestingIntervalSeconds);
UI_.MakeSpinnerRapid(sCheckTime, e -> {
UI.MakeSpinnerRapid(sCheckTime, e -> {
Global.properties.updateField("CheckTestingIntervalSeconds", sCheckTime.getValue());
if (Global.properties.AutoCheckTesting) TestingServer.ResetTimer();
});

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

@@ -2,7 +2,7 @@ package _VisualDVM.TestingSystem.DVM.DVMConfiguration;
import Common.Database.Objects.DBObject;
import Common.Database.Tables.iDBTable;
import Common.Visual.DataSetControlForm;
import Common.Visual.Tables.TableRenderers;
import Common.Visual.Tables.RendererMultiline;
import Common.Visual.Windows.Dialog.DBObjectDialog;
import _VisualDVM.Current;
import _VisualDVM.Global;
@@ -34,7 +34,7 @@ public class DVMConfigurationDBTable extends iDBTable<DVMConfiguration> {
}
@Override
protected void AdditionalInitColumns() {
columns.get(6).setRenderer(TableRenderers.RendererMultiline);
columns.get(6).setRendererClass(RendererMultiline.class);
columns.get(6).setMaxWidth(500);
}
};

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

@@ -1,6 +1,10 @@
package _VisualDVM.TestingSystem.DVM.DVMPackage;
import Common.Database.Tables.iDBTable;
import Common.Visual.DataSetControlForm;
import Common.Visual.Tables.RendererDate;
import Common.Visual.Tables.RendererMultiline;
import Common.Visual.Tables.RendererProgressBar;
import Common.Visual.Tables.RendererStatusEnum;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
@@ -10,7 +14,6 @@ import _VisualDVM.ServerObjectsCache.VisualCaches;
import java.util.Comparator;
import java.util.Date;
import static Common.Visual.Tables.TableRenderers.*;
public class DVMPackageDBTable extends iDBTable<DVMPackage> {
public static boolean filterMyOnly = false;
public static boolean filterActive = false;
@@ -38,12 +41,11 @@ public class DVMPackageDBTable extends iDBTable<DVMPackage> {
}
@Override
protected void AdditionalInitColumns() {
columns.get(6).setRenderer(RendererMultiline);
// columns.get(7).setRenderer(RendererMultiline);
columns.get(9).setRenderer(RendererProgress);
columns.get(10).setRenderer(RendererDate);
columns.get(11).setRenderer(RendererDate);
columns.get(12).setRenderer(RendererStatusEnum);
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 {

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

@@ -3,14 +3,14 @@ import Common.Database.Tables.DataSet;
import Common.Visual.DBObjectFilter;
import Common.Visual.DataSetControlForm;
import Common.Visual.DataSetFilter;
import Common.Visual.Tables.RendererProgressBar;
import Common.Visual.Tables.RendererStatusEnum;
import _VisualDVM.Current;
import _VisualDVM.GlobalData.Tasks.TaskState;
import _VisualDVM.TestingSystem.DVM.DVMPackage.DVMPackage;
import java.util.Comparator;
import static Common.Visual.Tables.TableRenderers.RendererProgress;
import static Common.Visual.Tables.TableRenderers.RendererStatusEnum;
public class DVMRunTasksSet extends DataSet<Integer, DVMRunTask> {
//todo обобщить бы наличие фильтров для всех таблиц.
DVMPackage target;
@@ -67,9 +67,9 @@ public class DVMRunTasksSet extends DataSet<Integer, DVMRunTask> {
}
@Override
protected void AdditionalInitColumns() {
columns.get(5).setRenderer(RendererStatusEnum);
columns.get(6).setRenderer(RendererStatusEnum);
columns.get(13).setRenderer(RendererProgress);
columns.get(5).setRendererClass(RendererStatusEnum.class);
columns.get(6).setRendererClass(RendererStatusEnum.class);
columns.get(13).setRendererClass(RendererProgressBar.class);
}
};
}

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

@@ -2,13 +2,14 @@ package _VisualDVM.TestingSystem.SAPFOR.SapforConfiguration;
import Common.Database.Tables.iDBTable;
import Common.Utils.Vector_;
import Common.Visual.DataSetControlForm;
import Common.Visual.Tables.TableEditors;
import Common.Visual.Tables.TableRenderers;
import Common.Visual.Tables.RendererMultiline;
import Common.Visual.Windows.Dialog.DBObjectDialog;
import _VisualDVM.Current;
import _VisualDVM.ServerObjectsCache.ConfigurationCache;
import _VisualDVM.ServerObjectsCache.VisualCaches;
import _VisualDVM.TestingSystem.SAPFOR.SapforConfiguration.UI.SapforConfigurationFields;
import _VisualDVM.Visual.Tables.RendererConfigurationAuto;
import _VisualDVM.Visual.Tables.SwitcherConfigurationAuto;
import java.util.Vector;
public class SapforConfigurationDBTable extends iDBTable<SapforConfiguration> {
@@ -36,12 +37,12 @@ public class SapforConfigurationDBTable extends iDBTable<SapforConfiguration> {
}
@Override
protected void AdditionalInitColumns() {
columns.get(4).setRenderer(TableRenderers.RendererAutoConfiguration);
columns.get(4).setEditor(TableEditors.EditorAutoConfiguration);
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).setRenderer(TableRenderers.RendererMultiline);
columns.get(7).setRendererClass(RendererMultiline.class);
columns.get(7).setMaxWidth(500);
}
};

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

@@ -1,6 +1,10 @@
package _VisualDVM.TestingSystem.SAPFOR.SapforPackage;
import Common.Database.Tables.iDBTable;
import Common.Visual.DataSetControlForm;
import Common.Visual.Tables.RendererDate;
import Common.Visual.Tables.RendererMultiline;
import Common.Visual.Tables.RendererProgressBar;
import Common.Visual.Tables.RendererStatusEnum;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
@@ -10,8 +14,6 @@ import _VisualDVM.TestingSystem.SAPFOR.SapforTasksPackage.UI.SapforPackagesBar;
import java.util.Comparator;
import java.util.Date;
import static Common.Visual.Tables.TableRenderers.*;
public class SapforPackageDBTable extends iDBTable<SapforPackage> {
public static boolean filterMyOnly = false;
public static boolean filterActive = false;
@@ -39,11 +41,11 @@ public class SapforPackageDBTable extends iDBTable<SapforPackage> {
}
@Override
protected void AdditionalInitColumns() {
columns.get(4).setRenderer(RendererMultiline);
columns.get(7).setRenderer(RendererProgress);
columns.get(8).setRenderer(RendererDate);
columns.get(9).setRenderer(RendererDate);
columns.get(10).setRenderer(RendererStatusEnum);
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 {

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

@@ -1,7 +1,7 @@
package _VisualDVM.TestingSystem.SAPFOR.SapforSettingsCommand;
import Common.Database.Tables.iDBTable;
import Common.Visual.DataSetControlForm;
import Common.Visual.UI_;
import Common.Visual.UI;
import Common.Visual.Windows.Dialog.DBObjectDialog;
import _VisualDVM.Current;
import _VisualDVM.Global;
@@ -63,7 +63,7 @@ public class SapforSettingsCommandsDBTable extends iDBTable<SapforSettingsComman
}
@Override
public void fillFields() {
UI_.TrySelect(fields.cbPassCode, Result.passCode);
UI.TrySelect(fields.cbPassCode, Result.passCode);
}
@Override
public void ProcessResult() {

2
src/_VisualDVM/TestingSystem/SAPFOR/SapforTasksPackage/UI/SapforVersionsTreeCellRenderer.java → src/_VisualDVM/TestingSystem/SAPFOR/SapforTasksPackage/UI/RendererTreeSapforVersions.java
View File

@@ -2,7 +2,7 @@ package _VisualDVM.TestingSystem.SAPFOR.SapforTasksPackage.UI;
import Common.Visual.Trees.StyledTreeCellRenderer;
import javax.swing.*;
public class SapforVersionsTreeCellRenderer extends StyledTreeCellRenderer {
public class RendererTreeSapforVersions extends StyledTreeCellRenderer {
public java.awt.Component getTreeCellRendererComponent(
JTree tree, Object value,
boolean selected, boolean expanded,

5
src/_VisualDVM/TestingSystem/SAPFOR/SapforTasksPackage/UI/SapforTasksPackageTree.java
View File

@@ -1,6 +1,5 @@
package _VisualDVM.TestingSystem.SAPFOR.SapforTasksPackage.UI;
import Common.Visual.Trees.DataTree;
import Common.Visual.Trees.TreeRenderers;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.TestingSystem.SAPFOR.Json.SapforVersion_json;
@@ -23,8 +22,8 @@ public class SapforTasksPackageTree extends DataTree {
return 1;
}
@Override
public TreeRenderers getRenderer() {
return TreeRenderers.RendererSapforVersion;
public Class getRendererClass() {
return RendererTreeSapforVersions.class;
}
@Override
public Current getCurrent() {

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

@@ -1,7 +1,8 @@
package _VisualDVM.TestingSystem.SAPFOR.ServerSapfor;
import Common.Database.Tables.iDBTable;
import Common.Visual.DataSetControlForm;
import Common.Visual.Tables.TableRenderers;
import Common.Visual.Tables.RendererDate;
import Common.Visual.Tables.RendererStatusEnum;
import _VisualDVM.Current;
import _VisualDVM.Global;
@@ -46,8 +47,8 @@ public class ServerSapforsDBTable extends iDBTable<ServerSapfor> {
@Override
protected void AdditionalInitColumns() {
// columns.get(0).setVisible(false);
columns.get(3).setRenderer(TableRenderers.RendererDate);
columns.get(4).setRenderer(TableRenderers.RendererStatusEnum);
columns.get(3).setRendererClass(RendererDate.class);
columns.get(4).setRendererClass(RendererStatusEnum.class);
}
@Override
public void ShowCurrentObject() throws Exception {