изменение умолчаний для контролов таблиц

This commit is contained in:
2024-10-25 02:08:23 +03:00
parent f2de9054d0
commit f6ab578ce2
83 changed files with 172 additions and 428 deletions

View File

@@ -15,7 +15,6 @@ public enum Current implements Current_ {
File,
Root,
Version,
RunTask,
ProjectNode, //узел в дереве проекта. нужен для отображения добавленных файлов
SelectedDirectory,
SelectedFile,
@@ -29,8 +28,6 @@ public enum Current implements Current_ {
Function,
SelectedFunction,
//-
PackageVersion,
//--
ProjectView, Credentials;
@Override
public String getDescription() {
@@ -43,8 +40,6 @@ public enum Current implements Current_ {
return "Версия компонента для восстановления с сервера";
case SelectedFunction:
return "Выбранный узел графа процедур";
case PackageVersion:
return "Версия пакетного режима";
case Function:
return "Функция";
case ProjectNode:
@@ -55,8 +50,6 @@ public enum Current implements Current_ {
return "Папка проекта";
case SelectedFile:
return "Файл проекта";
case RunTask:
return "Задача на запуск";
case RemoteFile:
return "Удалённый файл";
case Project:

View File

@@ -8,8 +8,10 @@ import _VisualDVM.GlobalData.Settings.DBSetting;
import _VisualDVM.GlobalData.Settings.SettingName;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.ProjectData.ProjectView;
import _VisualDVM.Repository.Component.*;
import _VisualDVM.Repository.Component.ComponentType;
import _VisualDVM.Repository.Component.ComponentsSet;
import _VisualDVM.Repository.Component.Sapfor.MessagesServer;
import _VisualDVM.Repository.Component.Visualizer_2;
import _VisualDVM.Repository.Server.ComponentsServer;
import _VisualDVM.TestingSystem.Common.TestingServer;
import _VisualDVM.TestingSystem.DVM.RemoteDVMTestingPlanner;
@@ -153,7 +155,6 @@ public class Global {
}
System.exit(0);
}
public static void changeSetting(SettingName settingName, Object new_value) throws Exception {
Global.mainModule.getPass(PassCode.UpdateSetting).Do(settingName, new_value);
}
@@ -191,7 +192,6 @@ public class Global {
}
messagesServer = new MessagesServer();
messagesServer.Start();
components = new ComponentsSet();
components.initialVersionsCheck();
//-------->>

View File

@@ -1,10 +1,8 @@
package _VisualDVM.GlobalData.Compiler.UI;
import Common.Database.Tables.DataSet;
import Common.MainModule_;
import Common.Visual.DataSetControlForm;
import Common.Visual.Menus.DataMenuBar;
import Common.Visual.Windows.Dialog.DBObjectDialog;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.Compiler.Compiler;
import _VisualDVM.GlobalData.Machine.Machine;
@@ -16,14 +14,6 @@ public class CompilersForm extends DataSetControlForm<Compiler> {
super(dataSource_in, mountPanel_in);
}
@Override
protected boolean needsCurrent() {
return true;
}
@Override
protected boolean hasCheckBox() {
return true;
}
@Override
public String[] getUIColumnNames() {
return new String[]{
"описание",

View File

@@ -10,10 +10,6 @@ public class CompilerEnvironmentsForm extends DataSetControlForm<CompilerEnviron
super(dataSource_in, mountPanel_in);
}
@Override
protected boolean hasCheckBox() {
return true;
}
@Override
public String[] getUIColumnNames() {
return new String[]{
"Значение", "Описание"

View File

@@ -10,10 +10,6 @@ public class CompilerOptionsForm extends DataSetControlForm<CompilerOption> {
super(dataSource_in, mountPanel_in);
}
@Override
protected boolean hasCheckBox() {
return true;
}
@Override
public String[] getUIColumnNames() {
return new String[]{
"Параметр",

View File

@@ -2,6 +2,7 @@ package _VisualDVM.GlobalData.Credentials;
import Common.CommonConstants;
import Common.Database.Objects.iDBObject;
import com.sun.org.glassfish.gmbal.Description;
//todo вывести. оформить механизм сохр текущих объектов в бд визуализатора.
public class Credentials extends iDBObject {
@Description("DEFAULT -1")
public int machine_id = CommonConstants.Nan;

View File

@@ -4,7 +4,6 @@ import Common.Visual.DataSetControlForm;
import Common.Visual.Menus.DataMenuBar;
import Common.Visual.Windows.Dialog.DBObjectDialog;
import Common.Visual.Windows.Dialog.DialogFields;
import _VisualDVM.Current;
import _VisualDVM.GlobalData.DVMParameter.DVMParameter;
import _VisualDVM.Passes.PassCode;
@@ -14,8 +13,8 @@ public class DVMParametersForm extends DataSetControlForm<DVMParameter> {
super(dataSource_in, mountPanel_in);
}
@Override
protected boolean needsCurrent() {
return true;
protected boolean hasCheckBox() {
return false;
}
@Override
public String[] getUIColumnNames() {

View File

@@ -5,10 +5,8 @@ import Common.Visual.DataSetControlForm;
import Common.Visual.Menus.DataMenuBar;
import Common.Visual.Windows.Dialog.DBObjectDialog;
import Common.Visual.Windows.Dialog.DialogFields;
import _VisualDVM.Current;
import _VisualDVM.GlobalData.EnvironmentValue.EnvironmentValue;
import _VisualDVM.GlobalData.RunConfiguration.RunConfiguration;
import _VisualDVM.Passes.All.Run;
import _VisualDVM.Passes.PassCode;
import javax.swing.*;
@@ -17,8 +15,8 @@ public class EnvironmentsValuesForm extends DataSetControlForm<EnvironmentValue>
super(dataSource_in, mountPanel_in);
}
@Override
protected boolean needsCurrent() {
return true;
protected boolean hasCheckBox() {
return false;
}
@Override
public String[] getUIColumnNames() {
@@ -51,7 +49,7 @@ public class EnvironmentsValuesForm extends DataSetControlForm<EnvironmentValue>
@Override
public boolean isObjectVisible(EnvironmentValue object) {
return super.isObjectVisible(object) &&
MainModule_.instance.getDb().getTable(RunConfiguration.class).getUI().matchCurrentID(object.run_configuration_id );
MainModule_.instance.getDb().getTable(RunConfiguration.class).getUI().matchCurrentID(object.run_configuration_id);
}
@Override
protected DBObjectDialog<EnvironmentValue, ? extends DialogFields> getDialog() {

View File

@@ -10,6 +10,14 @@ public class DirInfosForm extends DataSetControlForm<DirInfo> {
super(dataSource_in, mountPanel_in);
}
@Override
protected boolean hasCheckBox() {
return false;
}
@Override
protected boolean needsCurrent() {
return false;
}
@Override
public String[] getUIColumnNames() {
return new String[]{
"дата изменения"};

View File

@@ -1,24 +1,19 @@
package _VisualDVM.GlobalData;
import Common.Database.VisualiserDatabase;
import Common.MainModule_;
import Common.Utils.Utils_;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.Account.Account;
import _VisualDVM.GlobalData.Account.AccountsDBTable;
import _VisualDVM.GlobalData.Compiler.Compiler;
import _VisualDVM.GlobalData.Compiler.CompilersDBTable;
import _VisualDVM.GlobalData.Credentials.Credentials;
import _VisualDVM.GlobalData.Credentials.CredentialsDBTable;
import _VisualDVM.GlobalData.DBLastProject.LastProjectsDBTable;
import _VisualDVM.GlobalData.DVMParameter.DVMParameterDBTable;
import _VisualDVM.GlobalData.EnvironmentValue.EnvironmentValuesDBTable;
import _VisualDVM.GlobalData.Machine.Machine;
import _VisualDVM.GlobalData.Machine.MachinesDBTable;
import _VisualDVM.GlobalData.Makefile.Makefile;
import _VisualDVM.GlobalData.Makefile.MakefilesDBTable;
import _VisualDVM.GlobalData.Module.ModulesDBTable;
import _VisualDVM.GlobalData.RunConfiguration.RunConfiguration;
import _VisualDVM.GlobalData.RunConfiguration.RunConfigurationsDBTable;
import _VisualDVM.GlobalData.SapforProfile.SapforProfile;
import _VisualDVM.GlobalData.SapforProfile.SapforProfilesDBTable;
@@ -29,7 +24,6 @@ import _VisualDVM.GlobalData.Settings.SettingName;
import _VisualDVM.GlobalData.Settings.SettingsDBTable;
import _VisualDVM.GlobalData.Tasks.CompilationTask.CompilationTasksDBTable;
import _VisualDVM.GlobalData.Tasks.RunTask.RunTasksDBTable;
import _VisualDVM.GlobalData.User.User;
import _VisualDVM.GlobalData.User.UsersDBTable;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Repository.Component.ComponentType;
@@ -102,9 +96,7 @@ public class GlobalDatabase extends VisualiserDatabase {
public PassCode getSynchronizePassCode() {
return null;
}
//todo централизованное сохранение текущих объектов в базах
public void SaveCredentials() {
/*
try {
@@ -130,9 +122,7 @@ public class GlobalDatabase extends VisualiserDatabase {
ex.printStackTrace();
}
*/
}
public void UpdateCredentials() {
/*
}

View File

@@ -5,7 +5,6 @@ import Common.Visual.DataSetControlForm;
import Common.Visual.Menus.DataMenuBar;
import Common.Visual.Windows.Dialog.DBObjectDialog;
import Common.Visual.Windows.Dialog.DialogFields;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.Machine.Machine;
import _VisualDVM.Passes.PassCode;
@@ -18,14 +17,6 @@ public class MachinesForm extends DataSetControlForm<Machine> {
super(dataSource_in, mountPanel_in);
}
@Override
protected boolean needsCurrent() {
return true;
}
@Override
protected boolean hasCheckBox() {
return true;
}
@Override
public String[] getUIColumnNames() {
return new String[]{"URL"};
}

View File

@@ -4,7 +4,6 @@ import Common.MainModule_;
import Common.Visual.DataSetControlForm;
import Common.Visual.Menus.DataMenuBar;
import Common.Visual.Windows.Dialog.DBObjectDialog;
import _VisualDVM.Current;
import _VisualDVM.GlobalData.Machine.Machine;
import _VisualDVM.GlobalData.Makefile.Makefile;
import _VisualDVM.GlobalData.Module.UI.ModuleAnchestorFields;
@@ -17,14 +16,6 @@ public class MakefilesForm extends DataSetControlForm<Makefile> {
super(dataSource_in, mountPanel_in);
}
@Override
protected boolean needsCurrent() {
return true;
}
@Override
protected boolean hasCheckBox() {
return true;
}
@Override
public String[] getUIColumnNames() {
return new String[]{
"Линковщик",

View File

@@ -3,7 +3,6 @@ import Common.CommonConstants;
import Common.MainModule_;
import Common.Visual.UI;
import Common.Visual.Windows.Dialog.DBObjectDialog;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.Compiler.Compiler;
import _VisualDVM.GlobalData.Compiler.CompilerType;
import _VisualDVM.GlobalData.Machine.Machine;

View File

@@ -5,7 +5,6 @@ import Common.Visual.DataSetControlForm;
import Common.Visual.Menus.DataMenuBar;
import Common.Visual.Windows.Dialog.DBObjectDialog;
import Common.Visual.Windows.Dialog.DialogFields;
import _VisualDVM.Current;
import _VisualDVM.GlobalData.Makefile.Makefile;
import _VisualDVM.GlobalData.Module.Module;
import _VisualDVM.Passes.PassCode;
@@ -16,14 +15,6 @@ public class ModulesForm extends DataSetControlForm<Module> {
super(dataSource_in, mountPanel_in);
}
@Override
protected boolean needsCurrent() {
return true;
}
@Override
protected boolean hasCheckBox() {
return true;
}
@Override
public String[] getUIColumnNames() {
return new String[]{
"Язык",

View File

@@ -4,7 +4,6 @@ import Common.MainModule_;
import Common.Visual.DataSetControlForm;
import Common.Visual.Menus.DataMenuBar;
import Common.Visual.Windows.Dialog.DBObjectDialog;
import _VisualDVM.Current;
import _VisualDVM.GlobalData.Machine.Machine;
import _VisualDVM.GlobalData.RunConfiguration.RunConfiguration;
import _VisualDVM.Passes.PassCode;
@@ -15,8 +14,8 @@ public class RunConfigurationsForm extends DataSetControlForm<RunConfiguration>
super(dataSource_in, mountPanel_in);
}
@Override
protected boolean needsCurrent() {
return true;
protected boolean hasCheckBox() {
return false;
}
@Override
public String[] getUIColumnNames() {

View File

@@ -4,7 +4,6 @@ import Common.Visual.DataSetControlForm;
import Common.Visual.Menus.DataMenuBar;
import Common.Visual.Windows.Dialog.DBObjectDialog;
import Common.Visual.Windows.Dialog.DialogFields;
import _VisualDVM.Current;
import _VisualDVM.GlobalData.SapforProfile.SapforProfile;
import _VisualDVM.Passes.PassCode;
@@ -15,10 +14,6 @@ public class SapforProfilesForm extends DataSetControlForm<SapforProfile> {
super(dataSource_in, mountPanel_in);
}
@Override
protected boolean hasCheckBox() {
return true;
}
@Override
public String[] getUIColumnNames() {
return new String[]{
"Описание",

View File

@@ -2,8 +2,6 @@ package _VisualDVM.GlobalData.SapforProfileSetting.UI;
import Common.Database.Tables.DataSet;
import Common.MainModule_;
import Common.Visual.DataSetControlForm;
import _VisualDVM.Current;
import _VisualDVM.GlobalData.Machine.Machine;
import _VisualDVM.GlobalData.SapforProfile.SapforProfile;
import _VisualDVM.GlobalData.SapforProfileSetting.SapforProfileSetting;
@@ -13,8 +11,8 @@ public class SapforProfileSettingsForm extends DataSetControlForm<SapforProfileS
super(dataSource_in, mountPanel_in);
}
@Override
protected boolean needsCurrent() {
return true;
protected boolean hasCheckBox() {
return false;
}
@Override
public String[] getUIColumnNames() {

View File

@@ -17,14 +17,6 @@ public class CompilationTasksForm extends DataSetControlForm<CompilationTask> {
super(dataSource_in, mountPanel_in);
}
@Override
protected boolean needsCurrent() {
return true;
}
@Override
protected boolean hasCheckBox() {
return true;
}
@Override
public String[] getUIColumnNames() {
return new String[]{
"сборка",
@@ -42,34 +34,6 @@ public class CompilationTasksForm extends DataSetControlForm<CompilationTask> {
};
}
@Override
protected void AdditionalInitColumns() {
columns.get(12).setRendererClass(RendererDate.class);
columns.get(13).setRendererClass(RendererStatusEnum.class);
}
@Override
protected void ShowCurrentObject() throws Exception {
super.ShowCurrentObject();
Global.mainModule.getUI().getDebugWindow().DropRunTasksComparison();
}
@Override
protected void ShowNoCurrentObject() throws Exception {
super.ShowNoCurrentObject();
Global.mainModule.getUI().getDebugWindow().DropRunTasksComparison();
}
@Override
public DataMenuBar createMenuBar() {
return new DataMenuBar(dataSource.getPluralDescription(), PassCode.DeleteCompilationTasks);
}
@Override
public boolean isObjectVisible(CompilationTask object) {
return super.isObjectVisible(object) &&
MainModule_.instance.getDb().getTable(Machine.class).getUI().matchCurrentID(object.machine_id) &&
MainModule_.instance.getDb().getTable(User.class).getUI().matchCurrentID(object.user_id) &&
Global.mainModule.HasProject() &&
object.belongsToProject(Global.mainModule.getProject());
}
@Override
public Object getFieldAt(CompilationTask object, int columnIndex) {
switch (columnIndex) {
case 2:
@@ -100,4 +64,32 @@ public class CompilationTasksForm extends DataSetControlForm<CompilationTask> {
return null;
}
}
@Override
protected void AdditionalInitColumns() {
columns.get(12).setRendererClass(RendererDate.class);
columns.get(13).setRendererClass(RendererStatusEnum.class);
}
@Override
protected void ShowCurrentObject() throws Exception {
super.ShowCurrentObject();
Global.mainModule.getUI().getDebugWindow().DropRunTasksComparison();
}
@Override
protected void ShowNoCurrentObject() throws Exception {
super.ShowNoCurrentObject();
Global.mainModule.getUI().getDebugWindow().DropRunTasksComparison();
}
@Override
public DataMenuBar createMenuBar() {
return new DataMenuBar(dataSource.getPluralDescription(), PassCode.DeleteCompilationTasks);
}
@Override
public boolean isObjectVisible(CompilationTask object) {
return super.isObjectVisible(object) &&
MainModule_.instance.getDb().getTable(Machine.class).getUI().matchCurrentID(object.machine_id) &&
MainModule_.instance.getDb().getTable(User.class).getUI().matchCurrentID(object.user_id) &&
Global.mainModule.HasProject() &&
object.belongsToProject(Global.mainModule.getProject());
}
}

View File

@@ -5,7 +5,6 @@ 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.Machine.Machine;
import _VisualDVM.GlobalData.RunConfiguration.RunConfiguration;
@@ -20,14 +19,6 @@ public class RunTasksForm extends DataSetControlForm<RunTask> {
super(dataSource_in, mountPanel_in);
}
@Override
protected boolean needsCurrent() {
return true;
}
@Override
protected boolean hasCheckBox() {
return true;
}
@Override
public String[] getUIColumnNames() {
return new String[]{
"Матрица",

View File

@@ -1,7 +1,5 @@
package _VisualDVM.GlobalData.Tasks.Supervisor.Local.Linux;
import Common.MainModule_;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.Machine.Machine;
import _VisualDVM.GlobalData.RunConfiguration.RunConfiguration;
import _VisualDVM.GlobalData.Tasks.RunTask.RunTask;

View File

@@ -1,7 +1,5 @@
package _VisualDVM.GlobalData.Tasks.Supervisor.Local.Windows;
import Common.MainModule_;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.Machine.Machine;
import _VisualDVM.GlobalData.RunConfiguration.RunConfiguration;
import _VisualDVM.GlobalData.Tasks.RunTask.RunTask;

View File

@@ -1,8 +1,6 @@
package _VisualDVM.GlobalData.Tasks.Supervisor.Remote;
import Common.MainModule_;
import Common.Utils.Utils_;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.Machine.Machine;
import _VisualDVM.GlobalData.RemoteFile.RemoteFile;
import _VisualDVM.GlobalData.RunConfiguration.RunConfiguration;
import _VisualDVM.GlobalData.Tasks.QueueSystem.MVS;

View File

@@ -1,7 +1,5 @@
package _VisualDVM.GlobalData.Tasks.Supervisor.Remote;
import Common.MainModule_;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.Machine.Machine;
import _VisualDVM.GlobalData.RemoteFile.RemoteFile;
import _VisualDVM.GlobalData.RunConfiguration.RunConfiguration;
import _VisualDVM.GlobalData.Tasks.RunTask.RunTask;

View File

@@ -1,7 +1,6 @@
package _VisualDVM.GlobalData.User.UI;
import Common.MainModule_;
import Common.Visual.Windows.Dialog.DBObjectDialog;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.Machine.Machine;
import _VisualDVM.GlobalData.Machine.MachineType;
import _VisualDVM.GlobalData.User.User;

View File

@@ -5,7 +5,6 @@ import Common.Visual.DataSetControlForm;
import Common.Visual.Menus.DataMenuBar;
import Common.Visual.Tables.RendererStatusEnum;
import Common.Visual.Windows.Dialog.DBObjectDialog;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.Machine.Machine;
import _VisualDVM.GlobalData.User.User;
@@ -17,14 +16,6 @@ public class UsersForm extends DataSetControlForm<User> {
super(dataSource_in, mountPanel_in);
}
@Override
protected boolean needsCurrent() {
return true;
}
@Override
protected boolean hasCheckBox() {
return true;
}
@Override
public String[] getUIColumnNames() {
return new String[]{
"Логин",

View File

@@ -49,8 +49,12 @@ public class MainModule extends MainModule_<GlobalDatabase, MainUI> {
return "_VisualDVM.Passes.All.";
}
//--
public boolean HasAccount(){return get(Current.Account)!=null; } //Бессмысленно. аккаунт всегда подразумевается. вывести.
public Account getAccount(){return (Account) get(Current.Account);} //временно
public boolean HasAccount() {
return get(Current.Account) != null;
} //Бессмысленно. аккаунт всегда подразумевается. вывести.
public Account getAccount() {
return (Account) get(Current.Account);
} //временно
public boolean HasProject() {
return get(Current.Project) != null;
}
@@ -122,12 +126,6 @@ public class MainModule extends MainModule_<GlobalDatabase, MainUI> {
public FuncInfo getSelectionFunction() {
return (FuncInfo) get(Current.SelectedFunction);
}
public db_project_info getPackageVersion() {
return (db_project_info) get(Current.PackageVersion);
}
public boolean HasPackageVersion() {
return get(Current.PackageVersion) != null;
}
public ProjectView getProjectView() {
return (ProjectView) get(Current.ProjectView);
}

View File

@@ -56,7 +56,7 @@ public class CheckAccount extends Pass<Boolean> {
protected void showDone() throws Exception {
if (Global.mainModule.getUI().getMainWindow() != null) {
Global.mainModule.getUI().getMainWindow().getCallbackWindow().ShowAccount();
if (Global.componentsServer.db.bugReports.getUI().getCurrent()!=null)
if (Global.componentsServer.db.bugReports.getUI().getCurrent() != null)
Global.mainModule.getUI().getMainWindow().getCallbackWindow().ShowCurrentBugReport();
}
if (Global.mainModule.getAccount().isAdmin())

View File

@@ -1,5 +1,4 @@
package _VisualDVM.Passes.All;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.Passes.Server.CloneServerObject;
import _VisualDVM.TestingSystem.Common.TestingServer;

View File

@@ -1,6 +1,5 @@
package _VisualDVM.Passes.All;
import Common.Database.Objects.DBObject;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Passes.Server.CloneServerObject;

View File

@@ -37,7 +37,7 @@ public class CompareDVMRunTasks extends Pass<Vector<DVMRunTask>> {
master = target.get(0);
slave = null;
return UI.Question("Отобразить задачу " + Utils_.Brackets(master.getPK()));
} else if ((target.size() == 0) && (Global.testingServer.db.dvmRunTasks.getUI().getCurrent()!=null)) {
} else if ((target.size() == 0) && (Global.testingServer.db.dvmRunTasks.getUI().getCurrent() != null)) {
master = Global.testingServer.db.dvmRunTasks.getUI().getCurrent();
slave = null;
return UI.Question("Отобразить задачу " + Utils_.Brackets(master.getPK()));

View File

@@ -37,7 +37,7 @@ public class CompareSapforPackages extends Pass<Vector<SapforPackage>> {
master = target.get(0);
slave = null;
return UI.Question("Отобразить пакет " + Utils_.Brackets(master.getPK()));
} else if ((target.size() == 0) && ( (Global.testingServer.db.sapforPackages.getUI().getCurrent()!=null))) {
} else if ((target.size() == 0) && ((Global.testingServer.db.sapforPackages.getUI().getCurrent() != null))) {
master = Global.testingServer.db.sapforPackages.getUI().getCurrent();
slave = null;
return UI.Question("Отобразить пакет " + Utils_.Brackets(master.getPK()));

View File

@@ -37,8 +37,8 @@ public class Compile extends Pass<db_project_info> {
target = Global.mainModule.getProject();
//--
machine = Global.mainModule.getDb().getTable(Machine.class).getUI().getCurrent();
user= Global.mainModule.getDb().getTable(User.class).getUI().getCurrent();
makefile= Global.mainModule.getDb().getTable(Makefile.class).getUI().getCurrent();
user = Global.mainModule.getDb().getTable(User.class).getUI().getCurrent();
makefile = Global.mainModule.getDb().getTable(Makefile.class).getUI().getCurrent();
//--
subpass = null;
compilationTask = null;

View File

@@ -27,7 +27,7 @@ public class ConvertCorrectnessTests extends TestingSystemPass<File> {
Log.Writeln_("Вы не являетесь администратором");
return false;
}
if (! Global.testingServer.db.serverSapfors.getUI().CheckCurrent(Log)) {
if (!Global.testingServer.db.serverSapfors.getUI().CheckCurrent(Log)) {
return false;
}
return UI.Warning("Загрузить полный пакет DVM тестов на корректность и производительность.");

View File

@@ -2,7 +2,6 @@ package _VisualDVM.Passes.All;
import Common.MainModule_;
import Common.Utils.Utils_;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.Machine.Machine;
import _VisualDVM.GlobalData.User.User;
import _VisualDVM.GlobalData.User.UserState;
import _VisualDVM.Passes.ProcessPass;

View File

@@ -21,8 +21,8 @@ public class PublishBugReport extends Pass<BugReport> {
}
@Override
protected boolean canStart(Object... args) {
if ( Global.componentsServer.db.bugReports.getUI().CheckCurrent(Log)) {
target = Global.componentsServer.db.bugReports.getUI().getCurrent();
if (Global.componentsServer.db.bugReports.getUI().CheckCurrent(Log)) {
target = Global.componentsServer.db.bugReports.getUI().getCurrent();
if (!target.state.equals(BugReportState.draft)) {
Log.Writeln_("Отчёт об ошибке " + target.id + " уже опубликован!");
return false;

View File

@@ -45,8 +45,8 @@ public class Run extends Pass<db_project_info> {
@Override
protected boolean canStart(Object... args) {
subpass = null;
if ((Global.mainModule.Check(Log, Current.Project))&&
MainModule_.instance.getDb().CheckCurrent(Log,Machine.class, User.class, Makefile.class, RunConfiguration.class,CompilationTask.class)) {
if ((Global.mainModule.Check(Log, Current.Project)) &&
MainModule_.instance.getDb().CheckCurrent(Log, Machine.class, User.class, Makefile.class, RunConfiguration.class, CompilationTask.class)) {
//-
target = Global.mainModule.getProject();
//-

View File

@@ -24,7 +24,7 @@ public class SPF_ModifyArrayDistribution extends SapforModification {
if (
Global.mainModule.getProject().parallelRegions.getUI().CheckCurrent(Log)
&& super.canStart(args) && Global.mainModule.getPass(PassCode.SPF_GetArrayLinks).Do()) {
region = Global.mainModule.getProject().parallelRegions.getUI().getCurrent();
region = Global.mainModule.getProject().parallelRegions.getUI().getCurrent();
DBObjectDialog dialog = new DBObjectDialog<ParallelRegion, ParallelRegionFields>(ParallelRegionFields.class) {
@Override
public int getDefaultHeight() {

View File

@@ -11,8 +11,8 @@ public class SaveBugReportExecutor extends UpdateBugReportField {
}
@Override
protected boolean canStart(Object... args) throws Exception {
return Global.componentsServer.db.subscribers.getUI().CheckCurrent(Log) &&
super.canStart("executor",Global.componentsServer.db.subscribers.getUI().getCurrent().name,
return Global.componentsServer.db.subscribers.getUI().CheckCurrent(Log) &&
super.canStart("executor", Global.componentsServer.db.subscribers.getUI().getCurrent().name,
"executor_address", Global.componentsServer.db.subscribers.getUI().getCurrent().address
);
}

View File

@@ -1,5 +1,4 @@
package _VisualDVM.Passes.All;
import _VisualDVM.Current;
import _VisualDVM.Passes.Testing.SaveCurrentConfiguration;
import _VisualDVM.TestingSystem.DVM.DVMConfiguration.DVMConfiguration;
import _VisualDVM.TestingSystem.DVM.DVMSettings.DVMSettings;

View File

@@ -1,5 +1,4 @@
package _VisualDVM.Passes.All;
import _VisualDVM.Current;
import _VisualDVM.Passes.Testing.SaveCurrentConfiguration;
import _VisualDVM.TestingSystem.SAPFOR.SapforConfiguration.SapforConfiguration;
import _VisualDVM.TestingSystem.SAPFOR.SapforSettings.SapforSettings;

View File

@@ -1,5 +1,4 @@
package _VisualDVM.Passes.All;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.Passes.Testing.ShowCurrentConfigurationTests;
import _VisualDVM.ServerObjectsCache.DVMConfigurationCache;

View File

@@ -1,5 +1,4 @@
package _VisualDVM.Passes.All;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.Passes.Testing.ShowCurrentConfigurationTests;
import _VisualDVM.ServerObjectsCache.SapforConfigurationCache;

View File

@@ -22,7 +22,7 @@ public class ShowMakefilePreview extends Pass<db_project_info> {
}
@Override
protected boolean canStart(Object... args) {
if (Global.mainModule.Check(Log, Current.Project) &&MainModule_.instance.getDb().getTable(Makefile.class).getUI().CheckCurrent(Log) ) {
if (Global.mainModule.Check(Log, Current.Project) && MainModule_.instance.getDb().getTable(Makefile.class).getUI().CheckCurrent(Log)) {
target = Global.mainModule.getProject();
return true;
}

View File

@@ -24,7 +24,7 @@ public class UpdateBugReportField extends ComponentsRepositoryPass<BugReport> {
}
@Override
protected boolean canStart(Object... args) throws Exception {
if (!Global.componentsServer.db.bugReports.getUI().CheckCurrent(Log))
if (!Global.componentsServer.db.bugReports.getUI().CheckCurrent(Log))
return false;
old_description = "";
old_comment = "";

View File

@@ -2,7 +2,6 @@ package _VisualDVM.ProjectData.DBArray.UI;
import Common.Database.Tables.DataSet;
import Common.Visual.DataSetControlForm;
import Common.Visual.Menus.DataMenuBar;
import _VisualDVM.Current;
import _VisualDVM.ProjectData.DBArray.DBArray;
import javax.swing.*;
@@ -11,10 +10,6 @@ public class DBArraysForm extends DataSetControlForm<DBArray> {
super(dataSource_in, mountPanel_in);
}
@Override
protected boolean needsCurrent() {
return true;
}
@Override
public String[] getUIColumnNames() {
return new String[]{"Имя"};
}
@@ -30,10 +25,6 @@ public class DBArraysForm extends DataSetControlForm<DBArray> {
}
}
@Override
protected boolean hasCheckBox() {
return true;
}
@Override
protected void AdditionalInitColumns() {
columns.get(1).setEditable(false);
}

View File

@@ -1,10 +1,5 @@
package _VisualDVM.ProjectData.Messages.Errors;
import Common.Visual.DataSetControlForm;
import _VisualDVM.Current;
import _VisualDVM.ProjectData.Messages.MessagesControlForm;
import _VisualDVM.ProjectData.Messages.MessagesDBTable;
import javax.swing.*;
public class ErrorsDBTable extends MessagesDBTable<MessageError> {
public ErrorsDBTable() {
super(MessageError.class);

View File

@@ -14,8 +14,8 @@ public class MessagesControlForm extends DataSetControlForm<Message> {
super(dataSource_in, mountPanel_in);
}
@Override
protected boolean needsCurrent() {
return true;
protected boolean hasCheckBox() {
return false;
}
@Override
public String[] getUIColumnNames() {

View File

@@ -14,5 +14,4 @@ public class MessagesDBTable<M extends Message> extends iDBTable<M> {
protected DataSetControlForm createUI(JPanel mountPanel) {
return new MessagesControlForm(this, mountPanel);
}
}

View File

@@ -1,10 +1,5 @@
package _VisualDVM.ProjectData.Messages.Notes;
import Common.Visual.DataSetControlForm;
import _VisualDVM.Current;
import _VisualDVM.ProjectData.Messages.MessagesControlForm;
import _VisualDVM.ProjectData.Messages.MessagesDBTable;
import javax.swing.*;
public class NotesDBTable extends MessagesDBTable<MessageNote> {
public NotesDBTable() {
super(MessageNote.class);

View File

@@ -3,7 +3,6 @@ import Common.Database.Tables.DataSet;
import Common.Visual.DataSetControlForm;
import Common.Visual.Tables.HeaderTextFilter;
import Common.Visual.Tables.RendererWrapText;
import _VisualDVM.Current;
import _VisualDVM.ProjectData.Messages.Recommendations.MessageRecommendation;
import javax.swing.*;
@@ -12,8 +11,8 @@ public class RecommendationsForm extends DataSetControlForm<MessageRecommendatio
super(dataSource_in, mountPanel_in);
}
@Override
protected boolean needsCurrent() {
return true;
protected boolean hasCheckBox() {
return false;
}
@Override
public String[] getUIColumnNames() {

View File

@@ -1,10 +1,5 @@
package _VisualDVM.ProjectData.Messages.Warnings;
import Common.Visual.DataSetControlForm;
import _VisualDVM.Current;
import _VisualDVM.ProjectData.Messages.MessagesControlForm;
import _VisualDVM.ProjectData.Messages.MessagesDBTable;
import javax.swing.*;
public class WarningsDBTable extends MessagesDBTable<MessageWarning> {
//https://stackoverflow.com/questions/13079777/editable-jtableheader
public WarningsDBTable() {

View File

@@ -2,7 +2,6 @@ package _VisualDVM.ProjectData.SapforData.Arrays.UI;
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;
@@ -24,11 +23,6 @@ public class ProjectArraysForm extends DataSetControlForm<ProjectArray> {
super(dataSource_in, mountPanel_in);
}
//--
@Override
protected boolean needsCurrent() {
return true;
}
@Override
public String[] getUIColumnNames() {
return new String[]{
@@ -41,10 +35,6 @@ public class ProjectArraysForm extends DataSetControlForm<ProjectArray> {
};
}
@Override
protected boolean hasCheckBox() {
return true;
}
@Override
protected void AdditionalInitColumns() {
columns.get(0).setVisible(false);
if ((Global.mainModule.getDb()).settings.get(SettingName.ShowFullArraysDeclarations).toBoolean()) {

View File

@@ -1,7 +1,6 @@
package _VisualDVM.ProjectData.SapforData.Arrays.UI;
import Common.Visual.Menus.GraphMenu;
import Common.Visual.Trees.StyledTree;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.ProjectData.SapforData.Regions.ParallelRegion;

View File

@@ -3,7 +3,6 @@ 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.ParallelRegion;
import javax.swing.*;
@@ -12,8 +11,8 @@ public class ParallelRegionsForm extends DataSetControlForm<ParallelRegion> {
super(dataSource_in, mountPanel_in);
}
@Override
protected boolean needsCurrent() {
return true;
protected boolean hasCheckBox() {
return false;
}
@Override
public String[] getUIColumnNames() {

View File

@@ -5,7 +5,6 @@ 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.ParallelVariant;
@@ -14,15 +13,6 @@ public class ParallelVariantsForm extends DataSetControlForm<ParallelVariant> {
public ParallelVariantsForm(DataSet<?, ParallelVariant> dataSource_in, JPanel mountPanel_in) {
super(dataSource_in, mountPanel_in);
}
@Override
protected boolean needsCurrent() {
return true;
}
@Override
protected boolean hasCheckBox() {
return true;
}
@Override
public String[] getUIColumnNames() {
return new String[]{

View File

@@ -5,7 +5,6 @@ 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.BugReport;
@@ -29,11 +28,11 @@ public class BugReportsForm extends DataSetControlForm<BugReport> {
public BugReportsForm(DataSet<?, BugReport> dataSource_in, JPanel mountPanel_in) {
super(dataSource_in, mountPanel_in);
}
//--
@Override
protected boolean needsCurrent() {
return true;
protected boolean hasCheckBox() {
return false;
}
//--
@Override
public String[] getUIColumnNames() {
return new String[]{

View File

@@ -17,6 +17,14 @@ public class ComponentsSet extends DataSet<ComponentType, Component> {
public boolean bad_state = false;
public boolean need_update = false;
public boolean need_publish = false;
public ComponentsSet() {
super(ComponentType.class, Component.class);
put(ComponentType.Visualiser, visualiser = new Visualiser());
put(ComponentType.Sapfor_F, (Component) MainModule_.instance.set(Current.Sapfor, new Sapfor_F()));
put(ComponentType.Visualizer_2, visualizer_2);
put(ComponentType.PerformanceAnalyzer, performanceAnalyzer = new PerformanceAnalyzer());
put(ComponentType.Instruction, new Instruction());
}
public boolean needChanges() {
return bad_state || need_update;
}
@@ -24,14 +32,6 @@ public class ComponentsSet extends DataSet<ComponentType, Component> {
return needChanges() ? "/icons/ComponentsNeedUpdate.gif"
: (need_publish ? "/icons/ComponentsNeedPublish_2023.gif" : "/icons/ComponentsActual.png");
}
public ComponentsSet() {
super(ComponentType.class, Component.class);
put(ComponentType.Visualiser, visualiser = new Visualiser());
put(ComponentType.Sapfor_F, (Component)MainModule_.instance.set(Current.Sapfor, new Sapfor_F()));
put(ComponentType.Visualizer_2, visualizer_2);
put(ComponentType.PerformanceAnalyzer, performanceAnalyzer = new PerformanceAnalyzer());
put(ComponentType.Instruction, new Instruction());
}
@Override
public String getSingleDescription() {
return "компонент";
@@ -78,7 +78,7 @@ public class ComponentsSet extends DataSet<ComponentType, Component> {
}
return !bad_state;
}
public void initialVersionsCheck(){
public void initialVersionsCheck() {
for (Component component : Data.values())
component.InitialVersionCheck();
}

View File

@@ -7,7 +7,6 @@ import Common.Visual.Menus.DataMenuBar;
import Common.Visual.Menus.VisualiserMenu;
import Common.Visual.Tables.RendererMaskedNanInteger;
import Common.Visual.Tables.RendererStatusEnum;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Repository.Component.Component;
@@ -19,14 +18,6 @@ public class ComponentsForm extends DataSetControlForm<Component> {
super(dataSource_in, mountPanel_in);
}
@Override
protected boolean needsCurrent() {
return true;
}
@Override
protected boolean hasCheckBox() {
return true;
}
@Override
public String[] getUIColumnNames() {
return new String[]{
"Компонент",

View File

@@ -13,8 +13,8 @@ public class SubscriberWorkspacesForm extends DataSetControlForm<SubscriberWorks
super(dataSource_in, mountPanel_in);
}
@Override
protected boolean needsCurrent() {
return true;
protected boolean hasCheckBox() {
return false;
}
@Override
public String[] getUIColumnNames() {

View File

@@ -4,7 +4,6 @@ import Common.Visual.DataSetControlForm;
import Common.Visual.Menus.DataMenuBar;
import Common.Visual.Windows.Dialog.DBObjectDialog;
import Common.Visual.Windows.Dialog.DialogFields;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.Account.AccountRole;
import _VisualDVM.Passes.PassCode;
@@ -16,14 +15,6 @@ public class SubsribersForm extends DataSetControlForm<Subscriber> {
super(dataSource_in, mountPanel_in);
}
@Override
protected boolean needsCurrent() {
return true;
}
@Override
protected boolean hasCheckBox() {
return true;
}
@Override
public String[] getUIColumnNames() {
return new String[]{
"Имя",

View File

@@ -8,7 +8,6 @@ import Common.Visual.FilterFlag;
import Common.Visual.FilterMenuFlag;
import Common.Visual.Menus.DataMenuBar;
import Common.Visual.Windows.Dialog.DBObjectDialog;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.ProjectData.LanguageName;
@@ -21,15 +20,6 @@ public class GroupsForm extends DataSetControlForm<Group> {
public GroupsForm(DataSet<?, Group> dataSource_in, JPanel mountPanel_in) {
super(dataSource_in, mountPanel_in);
}
@Override
protected boolean needsCurrent() {
return true;
}
@Override
protected boolean hasCheckBox() {
return true;
}
@Override
public String[] getUIColumnNames() {
return new String[]{

View File

@@ -18,7 +18,7 @@ public class TestDialog extends DBObjectDialog<Test, TestFields> {
@Override
public void validateFields() {
if (!edit) {
if (! Global.testingServer.db.getTable(Group.class).getUI().getCurrent().language.equals(Global.mainModule.getProject().languageName))
if (!Global.testingServer.db.getTable(Group.class).getUI().getCurrent().language.equals(Global.mainModule.getProject().languageName))
Log.Writeln_("В текущую группу могут войти только тесты на языке "
+
Global.testingServer.db.getTable(Group.class).getUI().getCurrent().language);

View File

@@ -3,7 +3,6 @@ import Common.Database.Tables.DataSet;
import Common.Visual.DataSetControlForm;
import Common.Visual.Menus.DataMenuBar;
import Common.Visual.Windows.Dialog.DBObjectDialog;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.TestingSystem.Common.Group.Group;
@@ -14,15 +13,6 @@ public class TestsForm extends DataSetControlForm<Test> {
public TestsForm(DataSet<?, Test> dataSource_in, JPanel mountPanel_in) {
super(dataSource_in, mountPanel_in);
}
@Override
protected boolean needsCurrent() {
return true;
}
@Override
protected boolean hasCheckBox() {
return true;
}
@Override
public String[] getUIColumnNames() {
return new String[]{

View File

@@ -4,7 +4,6 @@ import Common.Visual.DataSetControlForm;
import Common.Visual.Menus.DataMenuBar;
import Common.Visual.Tables.RendererMultiline;
import Common.Visual.Windows.Dialog.DBObjectDialog;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.ServerObjectsCache.ConfigurationCache;
@@ -17,14 +16,6 @@ public class DVMConfigurationsForm extends DataSetControlForm<DVMConfiguration>
super(dataSource_in, mountPanel_in);
}
@Override
protected boolean needsCurrent() {
return true;
}
@Override
protected boolean hasCheckBox() {
return true;
}
@Override
public String[] getUIColumnNames() {
return new String[]{
"имя",

View File

@@ -8,7 +8,6 @@ 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;
import _VisualDVM.ServerObjectsCache.PackageCache;
@@ -23,14 +22,6 @@ public class DVMPackagesForm extends DataSetControlForm<DVMPackage> {
super(dataSource_in, mountPanel_in);
}
@Override
protected boolean needsCurrent() {
return true;
}
@Override
protected boolean hasCheckBox() {
return true;
}
@Override
public String[] getUIColumnNames() {
return new String[]{
"Автор",

View File

@@ -3,7 +3,6 @@ import Common.Database.Tables.DataSet;
import Common.Visual.DataSetControlForm;
import Common.Visual.Menus.DataMenuBar;
import Common.Visual.Windows.Dialog.DBObjectDialog;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.TestingSystem.DVM.DVMSettings.DVMSettings;
@@ -13,15 +12,6 @@ public class DVMSettingsForm extends DataSetControlForm<DVMSettings> {
public DVMSettingsForm(DataSet<?, DVMSettings> dataSource_in, JPanel mountPanel_in) {
super(dataSource_in, mountPanel_in);
}
@Override
protected boolean needsCurrent() {
return true;
}
@Override
protected boolean hasCheckBox() {
return true;
}
@Override
public String[] getUIColumnNames() {
return new String[]{

View File

@@ -7,7 +7,6 @@ import Common.Visual.FilterMenuFlag;
import Common.Visual.Menus.DataMenuBar;
import Common.Visual.Tables.RendererProgressBar;
import Common.Visual.Tables.RendererStatusEnum;
import _VisualDVM.Current;
import _VisualDVM.GlobalData.Tasks.TaskState;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.TestingSystem.DVM.DVMTasks.DVMRunTask;
@@ -19,14 +18,6 @@ public class DVMRunTasksForm extends DataSetControlForm<DVMRunTask> {
super(dataSource_in, mountPanel_in);
}
@Override
protected boolean needsCurrent() {
return true;
}
@Override
protected boolean hasCheckBox() {
return true;
}
@Override
public String[] getUIColumnNames() {
return new String[]{
"Тест",

View File

@@ -4,7 +4,6 @@ import Common.Visual.DataSetControlForm;
import Common.Visual.Menus.DataMenuBar;
import Common.Visual.Tables.RendererMultiline;
import Common.Visual.Windows.Dialog.DBObjectDialog;
import _VisualDVM.Current;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.ServerObjectsCache.ConfigurationCache;
import _VisualDVM.ServerObjectsCache.VisualCaches;
@@ -18,14 +17,6 @@ public class SapforConfigurationsForm extends DataSetControlForm<SapforConfigura
super(dataSource_in, mountPanel_in);
}
@Override
protected boolean needsCurrent() {
return true;
}
@Override
protected boolean hasCheckBox() {
return true;
}
@Override
public String[] getUIColumnNames() {
return new String[]{
"имя",

View File

@@ -8,7 +8,6 @@ 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;
import _VisualDVM.ServerObjectsCache.PackageCache;
@@ -23,14 +22,6 @@ public class SapforPackagesForm extends DataSetControlForm<SapforPackage> {
super(dataSource_in, mountPanel_in);
}
@Override
protected boolean needsCurrent() {
return true;
}
@Override
protected boolean hasCheckBox() {
return true;
}
@Override
public String[] getUIColumnNames() {
return new String[]{
"Автор",

View File

@@ -3,7 +3,6 @@ import Common.Database.Tables.DataSet;
import Common.Visual.DataSetControlForm;
import Common.Visual.Menus.DataMenuBar;
import Common.Visual.Windows.Dialog.DBObjectDialog;
import _VisualDVM.Current;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.TestingSystem.SAPFOR.SapforSettings.SapforSettings;
@@ -13,14 +12,6 @@ public class SapforSettingsForm extends DataSetControlForm<SapforSettings> {
super(dataSource_in, mountPanel_in);
}
@Override
protected boolean needsCurrent() {
return true;
}
@Override
protected boolean hasCheckBox() {
return true;
}
@Override
public String[] getUIColumnNames() {
return new String[]{
"имя",

View File

@@ -1,10 +1,8 @@
package _VisualDVM.TestingSystem.SAPFOR.SapforSettingsCommand.UI;
import Common.Database.Tables.DataSet;
import Common.MainModule_;
import Common.Visual.DataSetControlForm;
import Common.Visual.Menus.DataMenuBar;
import Common.Visual.Windows.Dialog.DBObjectDialog;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.TestingSystem.SAPFOR.SapforSettings.SapforSettings;
@@ -16,14 +14,6 @@ public class SapforSettingsCommandsForm extends DataSetControlForm<SapforSetting
super(dataSource_in, mountPanel_in);
}
@Override
protected boolean needsCurrent() {
return true;
}
@Override
protected boolean hasCheckBox() {
return true;
}
@Override
public String[] getUIColumnNames() {
return new String[]{
"Проход"

View File

@@ -4,7 +4,6 @@ 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.Passes.PassCode;
import _VisualDVM.TestingSystem.SAPFOR.ServerSapfor.ServerSapfor;
@@ -16,14 +15,6 @@ public class ServerSapforsForm extends DataSetControlForm<ServerSapfor> {
super(dataSource_in, mountPanel_in);
}
@Override
protected boolean needsCurrent() {
return true;
}
@Override
protected boolean hasCheckBox() {
return true;
}
@Override
public String[] getUIColumnNames() {
return new String[]{
"версия",

View File

@@ -2,7 +2,6 @@ package _VisualDVM.Visual;
import Common.Visual.UIModule_;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.RemoteFile.UI.RemoteFileChooser;
import _VisualDVM.Visual.Windows.ComponentsWindow;
import _VisualDVM.TestingSystem.Common.TestingMenuBar;
import _VisualDVM.Visual.Interface.DebugWindow;
import _VisualDVM.Visual.Interface.VersionsWindow;

View File

@@ -135,7 +135,7 @@ public abstract class ComparisonForm<T> {
}
public abstract Object getDefaultCurrentObject();
public void ApplyObject() {
if (getDefaultCurrentObject()!=null)
if (getDefaultCurrentObject() != null)
ApplyObject(getDefaultCurrentObject());
else UI.Info("Текущий объект для сравнения не назначен!");
}

View File

@@ -1,5 +1,4 @@
package _VisualDVM.Visual.Windows;
import Common.Database.Objects.DBObject;
import Common.Utils.Utils_;
import Common.Visual.Controls.MenuBarButton;
import _VisualDVM.Constants;

View File

@@ -1,5 +1,4 @@
package _VisualDVM.Visual.Windows;
import Common.CommonConstants;
import Common.MainModule_;
import Common.Visual.FormWithSplitters;
import Common.Visual.TextField.StyledTextField;
@@ -8,7 +7,6 @@ import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.Compiler.Compiler;
import _VisualDVM.GlobalData.Compiler.CompilerType;
import _VisualDVM.GlobalData.Credentials.Credentials;
import _VisualDVM.TestingSystem.Common.TestingServer;
import _VisualDVM.TestingSystem.DVM.DVMPackage.DVMPackage;
import _VisualDVM.TestingSystem.DVM.DVMTasks.DVMRunTask;
@@ -224,13 +222,13 @@ public class TestingForm implements FormWithSplitters, TestingWindow {
@Override
public void ShowCurrentCompiler() {
Compiler compiler = (MainModule_.instance.getDb().getTable(Compiler.class).getUI().getCurrent());
String title = (compiler!=null)&& (compiler.type.equals(CompilerType.dvm)) ?
String title = (compiler != null) && (compiler.type.equals(CompilerType.dvm)) ?
"DVM система: " + compiler.description : "DVM система: ?";
testingTabs.setTitleAt(0, title);
}
@Override
public void ShowCurrentServerSapfor() {
testingTabs.setTitleAt(2, "SAPFOR: " + Global.testingServer.db.serverSapfors.getUI().getCurrent().version);
testingTabs.setTitleAt(2, "SAPFOR: " + Global.testingServer.db.serverSapfors.getUI().getCurrent().version);
}
@Override
public void ShowNoServerSapfor() {