M/VisualSapfor
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

no message

Browse Source
This commit is contained in:
02090095
2024-10-22 17:27:41 +03:00
parent a60fd375d0
commit a0ceafff0a
57 changed files with 319 additions and 323 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Common/Database/Database.java
View File

@@ -86,7 +86,7 @@ public abstract class Database {
public DBObject InsertS(DBObject object) throws Exception {
DBTable table = tables.get(object.getClass());
if (!(object instanceof iDBObject) && table.Data.containsKey(object.getPK()))
throw new RepositoryRefuseException("Таблица " + Utils_.Brackets(table.Name) + " уже содержит объект с ключом " + Utils_.Brackets(object.getPK().toString()));
throw new RepositoryRefuseException("Таблица " + Utils_.Brackets(table.getName()) + " уже содержит объект с ключом " + Utils_.Brackets(object.getPK().toString()));
insert(table, object);
table.Data.put(object.getPK(), object);
return object;
@@ -113,7 +113,7 @@ public abstract class Database {
table.Data.remove(o.getPK());
return o;
} else
throw new RepositoryRefuseException("Таблица " + Utils_.Brackets(table.Name) + " не содержит объект с ключом " + Utils_.Brackets(to_delete.getPK().toString()));
throw new RepositoryRefuseException("Таблица " + Utils_.Brackets(table.getName()) + " не содержит объект с ключом " + Utils_.Brackets(to_delete.getPK().toString()));
}
public DBObject DeleteByPK(Class object_class, Object key) throws Exception {
DBTable table = tables.get(object_class);
@@ -123,7 +123,7 @@ public abstract class Database {
table.Data.remove(key);
return o;
} else
throw new RepositoryRefuseException("Таблица " + Utils_.Brackets(table.Name) + " не содержит объект с ключом " + Utils_.Brackets(key.toString()));
throw new RepositoryRefuseException("Таблица " + Utils_.Brackets(table.getName()) + " не содержит объект с ключом " + Utils_.Brackets(key.toString()));
}
// не работает с автоинкрементом.
public DBObject getObjectCopyByPK(Class table_class, Object pk) throws Exception {

2
src/Common/Database/Tables/DBTable.java
View File

@@ -29,7 +29,7 @@ public abstract class DBTable<K, D extends DBObject> extends DataSet<K, D> {
}
@Override
public String toString() {
StringBuilder res = new StringBuilder(Name + "\n");
StringBuilder res = new StringBuilder(getName() + "\n");
for (DBTableColumn c : columns.values())
res.append(c).append("\n");
return res.toString();

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

@@ -9,18 +9,31 @@ import java.util.Comparator;
import java.util.LinkedHashMap;
import java.util.Vector;
public class DataSet<K, D extends DBObject> extends DataSetAnchestor {
public String Name;
public Class<K> k; //класс первичного ключа.
public Class<D> d; //класс объектов.
public LinkedHashMap<K, D> Data = new LinkedHashMap<>(); //наполнение
//-
protected DataSetControlForm ui = null;
DataSetControlForm ui = null;
//--
public DataSet(Class<K> k_in, Class<D> d_in) {
k = k_in;
d = d_in;
Name = d.getSimpleName();
}
//---
protected DataSetControlForm createUI(JPanel mountPanel) {
return null;
}
//БАЗА ДАННЫХ
public String getName() {
return d.getSimpleName();
}
public String QName() {
return "\"" + getName() + "\"";
}
public String getPKName() {
return "";
} //получить имя ключевого поля. нужно для таблиц.
//ИНТЕРФЕЙС
public DataSetControlForm<D> getUI() {
return ui;
}
@@ -34,15 +47,17 @@ public class DataSet<K, D extends DBObject> extends DataSetAnchestor {
ui.Clear();
}
}
public void RefreshUI() {
if (ui != null) ui.Refresh();
public void ShowUI() {
if (ui != null) {
ui.Show();
}
}
public int getRowCountUI() {
return ui.getRowCount();
}
protected DataSetControlForm createUI(JPanel mountPanel) {
return null;
public void ShowUI(Object key) {
if (ui != null) {
ui.Show(key);
}
}
//СОДЕРЖИМОЕ
public D getFirstRecord() {
return Data.values().stream().findFirst().orElse(null);
}
@@ -51,13 +66,6 @@ public class DataSet<K, D extends DBObject> extends DataSetAnchestor {
res.sort(comparator);
return res;
}
public String QName() {
return "\"" + Name + "\"";
}
public String getPKName() {
return "";
} //получить имя ключевого поля. нужно для таблиц.
//-
public void put(Object key, D object) {
Data.put((K) key, object);
}
@@ -73,16 +81,6 @@ public class DataSet<K, D extends DBObject> extends DataSetAnchestor {
public boolean containsKey(Object key) {
return Data.containsKey(key);
}
public void ShowUI() {
if (ui != null) {
ui.Show();
}
}
public void ShowUI(Object key) {
if (ui != null) {
ui.Show(key);
}
}
public PassCode_ getDeletePassCode() {
return null;
}

2
src/Common/Passes/DeleteObjectPass.java
View File

@@ -49,7 +49,7 @@ public abstract class DeleteObjectPass<D extends DBObject> extends ObjectPass<D>
protected void performFinish() throws Exception {
getTable().ShowUI();
for (Class dep : getTable().getFKDependencies().keySet()) {
getDb().getTable(dep).RefreshUI();
getDb().getTable(dep).getUI().Refresh();
}
}
}

2
src/Common/Passes/DeleteObjectsPass.java
View File

@@ -53,7 +53,7 @@ public abstract class DeleteObjectsPass<D extends DBObject> extends ObjectsPass<
protected void performFinish() throws Exception {
getTable().ShowUI();
for (Class dep : getTable().getFKDependencies().keySet()) {
getDb().getTable(dep).RefreshUI();
getDb().getTable(dep).getUI().Refresh();
}
}
}

2
src/Common/Passes/EditObjectPass.java
View File

@@ -21,6 +21,6 @@ public abstract class EditObjectPass<D extends DBObject> extends ObjectPass<D> {
protected void showFinish() throws Exception {
getTable().ShowUI(target.getPK());
for (Class dep : getTable().getFKDependencies().keySet())
getDb().getTable(dep).RefreshUI();
getDb().getTable(dep).getUI().Refresh();
}
}

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

@@ -72,10 +72,10 @@ public class DataSetControlForm<D extends DBObject> extends ControlForm<DataTabl
}
}
}
public String getPluralDescription() {
protected String getPluralDescription() {
return "";
}
public String getSingleDescription() {
protected String getSingleDescription() {
return "";
}
<M> Vector<M> getFilters(Class<M> f) {
@@ -88,7 +88,7 @@ public class DataSetControlForm<D extends DBObject> extends ControlForm<DataTabl
}
return res;
}
public void AddFilter(DBObjectFilter_<D> filter_in) {
protected void AddFilter(DBObjectFilter_<D> filter_in) {
allFilters.add(filter_in);
}
public ColumnInfo getColumnInfo(int i) {
@@ -98,11 +98,11 @@ public class DataSetControlForm<D extends DBObject> extends ControlForm<DataTabl
protected String[] getUIColumnNames() {
return new String[]{};
}
public Object getFieldAt(D object, int coulmnIndex) {
public Object getFieldAt(D object, int columnIndex) {
return null;
}
//-
public void SaveColumns() {
void SaveColumns() {
if (MainModule_.instance.getDb() != null) {
try {
if (CurrentName() != null) {
@@ -124,10 +124,10 @@ public class DataSetControlForm<D extends DBObject> extends ControlForm<DataTabl
}
}
}
private Vector<String> getHeaders() {
Vector<String> getHeaders() {
return columns.stream().map(ColumnInfo::getName).collect(Collectors.toCollection(Vector::new));
}
protected void CreateColumnsInfo() {
void CreateColumnsInfo() {
columns.clear();
columns.add(new ColumnInfo(dataSource.getPKName()));
if (hasCheckBox()) {
@@ -144,9 +144,6 @@ public class DataSetControlForm<D extends DBObject> extends ControlForm<DataTabl
protected Comparator getDefaultComparator() {
return null;
}
public boolean isObjectVisible(D object) {
return ApplyFilters(object);
}
Vector<Object> getVisibleKeys() {
Comparator comparator = getDefaultComparator();
Vector<Object> res_keys = new Vector<>();
@@ -167,7 +164,6 @@ public class DataSetControlForm<D extends DBObject> extends ControlForm<DataTabl
}
return res_keys;
}
@SuppressWarnings("unchecked")
@Override
protected void createControl() {
CreateColumnsInfo();
@@ -350,7 +346,7 @@ public class DataSetControlForm<D extends DBObject> extends ControlForm<DataTabl
}
protected void createFilters() {
}
protected boolean ApplyFilters(D object) {
boolean ApplyFilters(D object) {
for (DBObjectFilter_ filterInterface : allFilters) {
if (!filterInterface.Validate(object))
return false;
@@ -361,40 +357,7 @@ public class DataSetControlForm<D extends DBObject> extends ControlForm<DataTabl
protected void redrawControl() {
control.CorrectSizes();
}
@Override
public void Show() {
for (DBObjectFilter_ filter_ : allFilters) filter_.DropMatchesCount();
super.Show();
if (counter_ui != null) counter_ui.ShowMatchesCount(getRowCount());
for (DBObjectFilter_ filter_ : allFilters) filter_.ShowMatchesCount();
}
public void Show(Object pk) {
Show();
SetCurrentByPK(pk);
}
public void SetCurrentByPK(Object pk) {
if (isShown())
control.SelectRowByPK(pk);
}
public void ClearSelection() {
if (isShown()) control.clearSelection(); //строка сбросится сама. благодаря сбросу события выбора
}
public void SelectAll(boolean flag) {
for (D object : dataSource.Data.values()) {
if (isObjectVisible(object))
object.Select(flag);
}
Refresh();
}
@Override
public void Clear() {
super.Clear();
if (counter_ui != null) counter_ui.ShowNoMatches();
}
public int getRowCount() {
return control.getRowCount();
}
public void ShowCurrentObject() throws Exception {
protected void ShowCurrentObject() throws Exception {
if (dataSource instanceof DBTable) {
DBTable table = (DBTable) dataSource;
for (Class dep : table.getFKDependencies().keySet()) {
@@ -409,7 +372,7 @@ public class DataSetControlForm<D extends DBObject> extends ControlForm<DataTabl
}
}
}
public void ShowNoCurrentObject() throws Exception {
protected void ShowNoCurrentObject() throws Exception {
if (dataSource instanceof DBTable) {
DBTable table = (DBTable) dataSource;
for (Class dep : table.getFKDependencies().keySet()) {
@@ -424,16 +387,50 @@ public class DataSetControlForm<D extends DBObject> extends ControlForm<DataTabl
}
}
}
public void MouseAction2() throws Exception {
protected void MouseAction2() throws Exception {
}
//-
public boolean hasCheckBox() {
protected boolean hasCheckBox() {
return false;
}
public boolean hasMenuBar() {
protected boolean hasMenuBar() {
return true;
}
//-found
//-
protected Current_ CurrentName() {
return null;
}
void dropCurrent() {
MainModule_.instance.set(CurrentName(), null);
}
@SuppressWarnings("unchecked")
protected DBObjectDialog getDialog() {
return null;
}
protected boolean isObjectEditable(D object) {
return true;
}
//БАЗОВЫЙ ФУНКЦИОНАЛ ФОРМЫ
@Override
public void Show() {
for (DBObjectFilter_ filter_ : allFilters) filter_.DropMatchesCount();
super.Show();
if (counter_ui != null) counter_ui.ShowMatchesCount(getRowCount());
for (DBObjectFilter_ filter_ : allFilters) filter_.ShowMatchesCount();
}
public void Show(Object pk) {
Show();
SetCurrentByPK(pk);
}
@Override
public void Clear() {
super.Clear();
if (counter_ui != null) counter_ui.ShowNoMatches();
}
public int getRowCount() {
return control.getRowCount();
}
//ТЕКУЩИЕ И ВЫБРАННЫЕ ОБЪЕКТЫ
public void SaveLastCurrent() {
savedCurrentKey = null;
savedSelectedKeys.clear();
@@ -451,6 +448,9 @@ public class DataSetControlForm<D extends DBObject> extends ControlForm<DataTabl
SetCurrentByPK(savedCurrentKey);
}
}
public boolean isObjectVisible(D object) {
return ApplyFilters(object);
}
public int getSelectedCount() {
return (int) dataSource.Data.values().stream().filter(d -> isObjectVisible(d) && d.isSelected()).count();
}
@@ -460,10 +460,6 @@ public class DataSetControlForm<D extends DBObject> extends ControlForm<DataTabl
public Vector<Object> getSelectedKeys() {
return dataSource.Data.values().stream().filter(DBObject::isSelected).map(d -> d.getPK()).collect(Collectors.toCollection(Vector::new));
}
//--
public Current_ CurrentName() {
return null;
}
public boolean CheckCurrent(TextLog log) {
return MainModule_.instance.Check(log, CurrentName());
}
@@ -475,9 +471,6 @@ public class DataSetControlForm<D extends DBObject> extends ControlForm<DataTabl
}
return true;
}
public void dropCurrent() {
MainModule_.instance.set(CurrentName(), null);
}
public D getCurrent() {
return (D) MainModule_.instance.get(CurrentName());
}
@@ -503,25 +496,36 @@ public class DataSetControlForm<D extends DBObject> extends ControlForm<DataTabl
}
return res;
}
@SuppressWarnings("unchecked")
public DBObjectDialog getDialog() {
return null;
public void SetCurrentByPK(Object pk) {
if (isShown())
control.SelectRowByPK(pk);
}
public void ClearSelection() {
if (isShown()) control.clearSelection(); //строка сбросится сама. благодаря сбросу события выбора
}
public void SelectAll(boolean flag) {
for (D object : dataSource.Data.values()) {
if (isObjectVisible(object))
object.Select(flag);
}
Refresh();
}
//ДИАЛОГИ
public boolean ShowAddObjectDialog(D object) {
return getDialog().ShowDialog(getSingleDescription() + ": добавление", object);
}
//todo встроить развилку на возможность редактирования объекты boolean isObjectEditable(D object){return true;}
public boolean ShowEditObjectDialog(D object) {
DBObjectDialog dialog = getDialog();
dialog.edit = true;
dialog.SetEditLimits();
return dialog.ShowDialog(getSingleDescription() + ": редактирование", object);
}
public boolean ViewObject(D object) {
DBObjectDialog dialog = getDialog();
dialog.SetReadonly();
dialog.ShowDialog(getSingleDescription() + ": просмотр", object);
return false;
String title = getSingleDescription() + ": ";
if (isObjectEditable(object)) {
title += "редактирование";
} else {
title += "просмотр";
dialog.SetReadonly();
}
return dialog.ShowDialog(title, object);
}
public boolean ShowDeleteObjectDialog(D object) {
return UI.Warning(getSingleDescription() + " " + object.getBDialogName() + " будет удален(а)");

1
src/Common/Visual/Windows/Dialog/DBObjectDialog.java
View File

@@ -12,6 +12,7 @@ public abstract class DBObjectDialog<T extends DBObject, F extends DialogFields>
Result = (T) params[0];
fillFields();
}
//todo перенести в поля(?). тогда достаточно будет подавать класс полей.
public void SetEditLimits() {
//установить ограничения если объект в режиме редактирования( например нельзя менять тип машины, или почту адресата)
}

4
src/_VisualDVM/Global.java
View File

@@ -163,8 +163,10 @@ public class Global {
}
System.exit(0);
}
//todo запихнуть в ComponentsSet
public static void RefreshUpdatesStatus() {
Components.RefreshUI();
if (Components.getUI() != null)
Components.getUI().Refresh();
ValidateComponentsStates();
if (mainModule.getUI().hasMainWindow())
mainModule.getUI().getMainWindow().ShowUpdatesIcon();

14
src/_VisualDVM/GlobalData/Compiler/UI/CompilersForm.java
View File

@@ -15,19 +15,19 @@ public class CompilersForm extends DataSetControlForm<Compiler> {
super(dataSource_in, mountPanel_in);
}
@Override
public Current CurrentName() {
protected Current CurrentName() {
return Current.Compiler;
}
@Override
public String getSingleDescription() {
protected String getSingleDescription() {
return "компилятор";
}
@Override
public String getPluralDescription() {
protected String getPluralDescription() {
return "компиляторы";
}
@Override
public boolean hasCheckBox() {
protected boolean hasCheckBox() {
return true;
}
@Override
@@ -57,12 +57,12 @@ public class CompilersForm extends DataSetControlForm<Compiler> {
columns.get(0).setVisible(false);
}
@Override
public void ShowCurrentObject() throws Exception {
protected void ShowCurrentObject() throws Exception {
super.ShowCurrentObject();
Global.mainModule.getUI().getMainWindow().getTestingWindow().ShowCurrentCompiler();
}
@Override
public void ShowNoCurrentObject() throws Exception {
protected void ShowNoCurrentObject() throws Exception {
super.ShowNoCurrentObject();
Global.mainModule.getUI().getMainWindow().getTestingWindow().ShowCurrentCompiler();
}
@@ -79,7 +79,7 @@ public class CompilersForm extends DataSetControlForm<Compiler> {
return super.isObjectVisible(object) && MainModule_.instance.matchCurrentID(Current.Machine, object.machine_id);
}
@Override
public DBObjectDialog getDialog() {
protected DBObjectDialog getDialog() {
return new CompilerDialog();
}
}

2
src/_VisualDVM/GlobalData/CompilerEnvironment/UI/CompilerEnvironmentsForm.java
View File

@@ -10,7 +10,7 @@ public class CompilerEnvironmentsForm extends DataSetControlForm<CompilerEnviron
super(dataSource_in, mountPanel_in);
}
@Override
public boolean hasCheckBox() {
protected boolean hasCheckBox() {
return true;
}
@Override

2
src/_VisualDVM/GlobalData/CompilerOption/UI/CompilerOptionsForm.java
View File

@@ -10,7 +10,7 @@ public class CompilerOptionsForm extends DataSetControlForm<CompilerOption> {
super(dataSource_in, mountPanel_in);
}
@Override
public boolean hasCheckBox() {
protected boolean hasCheckBox() {
return true;
}
@Override

8
src/_VisualDVM/GlobalData/DVMParameter/UI/DVMParametersForm.java
View File

@@ -14,15 +14,15 @@ public class DVMParametersForm extends DataSetControlForm<DVMParameter> {
super(dataSource_in, mountPanel_in);
}
@Override
public Current CurrentName() {
protected Current CurrentName() {
return Current.DVMParameterValue;
}
@Override
public String getSingleDescription() {
protected String getSingleDescription() {
return "параметр DVM системы";
}
@Override
public String getPluralDescription() {
protected String getPluralDescription() {
return "параметры DVM";
}
@Override
@@ -54,7 +54,7 @@ public class DVMParametersForm extends DataSetControlForm<DVMParameter> {
PassCode.DeleteDVMParameter);
}
@Override
public DBObjectDialog<DVMParameter, ? extends DialogFields> getDialog() {
protected DBObjectDialog<DVMParameter, ? extends DialogFields> getDialog() {
return new DVMParameterDialog();
}
}

8
src/_VisualDVM/GlobalData/EnvironmentValue/UI/EnvironmentsValuesForm.java
View File

@@ -15,15 +15,15 @@ public class EnvironmentsValuesForm extends DataSetControlForm<EnvironmentValue>
super(dataSource_in, mountPanel_in);
}
@Override
public Current CurrentName() {
protected Current CurrentName() {
return Current.EnvironmentValue;
}
@Override
public String getSingleDescription() {
protected String getSingleDescription() {
return "переменная окружения";
}
@Override
public String getPluralDescription() {
protected String getPluralDescription() {
return "переменные окружения";
}
@Override
@@ -59,7 +59,7 @@ public class EnvironmentsValuesForm extends DataSetControlForm<EnvironmentValue>
return super.isObjectVisible(object) && MainModule_.instance.matchCurrentID(Current.RunConfiguration, object.run_configuration_id);
}
@Override
public DBObjectDialog<EnvironmentValue, ? extends DialogFields> getDialog() {
protected DBObjectDialog<EnvironmentValue, ? extends DialogFields> getDialog() {
return new EnvironmentValueDialog();
}
}

14
src/_VisualDVM/GlobalData/Machine/UI/MachinesForm.java
View File

@@ -18,19 +18,19 @@ public class MachinesForm extends DataSetControlForm<Machine> {
super(dataSource_in, mountPanel_in);
}
@Override
public Current CurrentName() {
protected Current CurrentName() {
return Current.Machine;
}
@Override
public String getSingleDescription() {
protected String getSingleDescription() {
return "машина";
}
@Override
public String getPluralDescription() {
protected String getPluralDescription() {
return "машины";
}
@Override
public boolean hasCheckBox() {
protected boolean hasCheckBox() {
return true;
}
@Override
@@ -47,13 +47,13 @@ public class MachinesForm extends DataSetControlForm<Machine> {
}
}
@Override
public void ShowCurrentObject() throws Exception {
protected void ShowCurrentObject() throws Exception {
super.ShowCurrentObject();
Global.mainModule.getUI().getMainWindow().getTestingWindow().ShowCurrentCompiler();
Global.mainModule.getUI().getCredentialsMenuBar().ShowMachine();
}
@Override
public void ShowNoCurrentObject() throws Exception {
protected void ShowNoCurrentObject() throws Exception {
super.ShowNoCurrentObject();
Global.mainModule.getUI().getMainWindow().getTestingWindow().ShowCurrentCompiler();
Global.mainModule.getUI().getCredentialsMenuBar().ShowNoMachine();
@@ -85,7 +85,7 @@ public class MachinesForm extends DataSetControlForm<Machine> {
};
}
@Override
public DBObjectDialog<Machine, ? extends DialogFields> getDialog() {
protected DBObjectDialog<Machine, ? extends DialogFields> getDialog() {
return new MachineDialog();
}
}

10
src/_VisualDVM/GlobalData/Makefile/UI/MakefilesForm.java
View File

@@ -16,19 +16,19 @@ public class MakefilesForm extends DataSetControlForm<Makefile> {
super(dataSource_in, mountPanel_in);
}
@Override
public Current CurrentName() {
protected Current CurrentName() {
return Current.Makefile;
}
@Override
public String getSingleDescription() {
protected String getSingleDescription() {
return "мейкфайл";
}
@Override
public String getPluralDescription() {
protected String getPluralDescription() {
return "мейкфайлы";
}
@Override
public boolean hasCheckBox() {
protected boolean hasCheckBox() {
return true;
}
@Override
@@ -75,7 +75,7 @@ public class MakefilesForm extends DataSetControlForm<Makefile> {
MainModule_.instance.matchCurrentID(Current.Machine, object.machine_id);
}
@Override
public DBObjectDialog<Makefile, ModuleAnchestorFields> getDialog() {
protected DBObjectDialog<Makefile, ModuleAnchestorFields> getDialog() {
return new ModuleAnchestorForm<>();
}
}

10
src/_VisualDVM/GlobalData/Module/UI/ModulesForm.java
View File

@@ -15,19 +15,19 @@ public class ModulesForm extends DataSetControlForm<Module> {
super(dataSource_in, mountPanel_in);
}
@Override
public Current CurrentName() {
protected Current CurrentName() {
return Current.Module;
}
@Override
public String getSingleDescription() {
protected String getSingleDescription() {
return "языковой модуль";
}
@Override
public String getPluralDescription() {
protected String getPluralDescription() {
return "языковые модули";
}
@Override
public boolean hasCheckBox() {
protected boolean hasCheckBox() {
return true;
}
@Override
@@ -67,7 +67,7 @@ public class ModulesForm extends DataSetControlForm<Module> {
return super.isObjectVisible(object) && MainModule_.instance.matchCurrentID(Current.Makefile, object.makefile_id);
}
@Override
public DBObjectDialog<Module, ? extends DialogFields> getDialog() {
protected DBObjectDialog<Module, ? extends DialogFields> getDialog() {
return new ModuleAnchestorForm<>();
}
}

8
src/_VisualDVM/GlobalData/RunConfiguration/UI/RunConfigurationsForm.java
View File

@@ -14,15 +14,15 @@ public class RunConfigurationsForm extends DataSetControlForm<RunConfiguration>
super(dataSource_in, mountPanel_in);
}
@Override
public Current CurrentName() {
protected Current CurrentName() {
return Current.RunConfiguration;
}
@Override
public String getSingleDescription() {
protected String getSingleDescription() {
return "конфигурация запуска";
}
@Override
public String getPluralDescription() {
protected String getPluralDescription() {
return "конфигурации запуска";
}
@Override
@@ -80,7 +80,7 @@ public class RunConfigurationsForm extends DataSetControlForm<RunConfiguration>
return super.isObjectVisible(object) && MainModule_.instance.matchCurrentID(Current.Machine, object.machine_id);
}
@Override
public DBObjectDialog getDialog() {
protected DBObjectDialog getDialog() {
return new RunConfigurationDialog();
}
}

10
src/_VisualDVM/GlobalData/SapforProfile/UI/SapforProfilesForm.java
View File

@@ -15,19 +15,19 @@ public class SapforProfilesForm extends DataSetControlForm<SapforProfile> {
super(dataSource_in, mountPanel_in);
}
@Override
public Current CurrentName() {
protected Current CurrentName() {
return Current.SapforProfile;
}
@Override
public String getPluralDescription() {
protected String getPluralDescription() {
return "профили SAPFOR";
}
@Override
public String getSingleDescription() {
protected String getSingleDescription() {
return "профиль SAPFOR";
}
@Override
public boolean hasCheckBox() {
protected boolean hasCheckBox() {
return true;
}
@Override
@@ -57,7 +57,7 @@ public class SapforProfilesForm extends DataSetControlForm<SapforProfile> {
PassCode.DeleteProfile);
}
@Override
public DBObjectDialog<SapforProfile, ? extends DialogFields> getDialog() {
protected DBObjectDialog<SapforProfile, ? extends DialogFields> getDialog() {
return new SapforProfileDialog();
}
}

4
src/_VisualDVM/GlobalData/SapforProfileSetting/UI/SapforProfileSettingsForm.java
View File

@@ -11,7 +11,7 @@ public class SapforProfileSettingsForm extends DataSetControlForm<SapforProfileS
super(dataSource_in, mountPanel_in);
}
@Override
public Current CurrentName() {
protected Current CurrentName() {
return Current.SapforProfileSetting;
}
@Override
@@ -37,7 +37,7 @@ public class SapforProfileSettingsForm extends DataSetControlForm<SapforProfileS
columns.get(0).setVisible(false);
}
@Override
public boolean hasMenuBar() {
protected boolean hasMenuBar() {
return false;
}
@Override

12
src/_VisualDVM/GlobalData/Tasks/CompilationTask/UI/CompilationTasksForm.java
View File

@@ -16,19 +16,19 @@ public class CompilationTasksForm extends DataSetControlForm<CompilationTask> {
super(dataSource_in, mountPanel_in);
}
@Override
public Current CurrentName() {
protected Current CurrentName() {
return Current.CompilationTask;
}
@Override
public String getSingleDescription() {
protected String getSingleDescription() {
return "задача на компиляцию";
}
@Override
public String getPluralDescription() {
protected String getPluralDescription() {
return "задачи на компиляцию";
}
@Override
public boolean hasCheckBox() {
protected boolean hasCheckBox() {
return true;
}
@Override
@@ -54,12 +54,12 @@ public class CompilationTasksForm extends DataSetControlForm<CompilationTask> {
columns.get(13).setRendererClass(RendererStatusEnum.class);
}
@Override
public void ShowCurrentObject() throws Exception {
protected void ShowCurrentObject() throws Exception {
super.ShowCurrentObject();
Global.mainModule.getUI().getDebugWindow().DropRunTasksComparison();
}
@Override
public void ShowNoCurrentObject() throws Exception {
protected void ShowNoCurrentObject() throws Exception {
super.ShowNoCurrentObject();
Global.mainModule.getUI().getDebugWindow().DropRunTasksComparison();
}

12
src/_VisualDVM/GlobalData/Tasks/RunTask/UI/RunTasksForm.java
View File

@@ -16,19 +16,19 @@ public class RunTasksForm extends DataSetControlForm<RunTask> {
super(dataSource_in, mountPanel_in);
}
@Override
public Current CurrentName() {
protected Current CurrentName() {
return Current.RunTask;
}
@Override
public String getSingleDescription() {
protected String getSingleDescription() {
return "задача на запуск";
}
@Override
public String getPluralDescription() {
protected String getPluralDescription() {
return "задачи на запуск";
}
@Override
public boolean hasCheckBox() {
protected boolean hasCheckBox() {
return true;
}
@Override
@@ -66,12 +66,12 @@ public class RunTasksForm extends DataSetControlForm<RunTask> {
columns.get(7).setRendererClass(RendererStatusEnum.class);
}
@Override
public void ShowCurrentObject() throws Exception {
protected void ShowCurrentObject() throws Exception {
super.ShowCurrentObject();
Global.mainModule.getUI().getDebugWindow().ShowCurrentRunTask();
}
@Override
public void ShowNoCurrentObject() throws Exception {
protected void ShowNoCurrentObject() throws Exception {
super.ShowNoCurrentObject();
Global.mainModule.getUI().getDebugWindow().ShowNoCurrentRunTask();
}

14
src/_VisualDVM/GlobalData/User/UI/UsersForm.java
View File

@@ -16,19 +16,19 @@ public class UsersForm extends DataSetControlForm<User> {
super(dataSource_in, mountPanel_in);
}
@Override
public Current CurrentName() {
protected Current CurrentName() {
return Current.User;
}
@Override
public String getSingleDescription() {
protected String getSingleDescription() {
return "пользователь";
}
@Override
public String getPluralDescription() {
protected String getPluralDescription() {
return "пользователи";
}
@Override
public boolean hasCheckBox() {
protected boolean hasCheckBox() {
return true;
}
@Override
@@ -54,12 +54,12 @@ public class UsersForm extends DataSetControlForm<User> {
columns.get(3).setRendererClass(RendererStatusEnum.class);
}
@Override
public void ShowCurrentObject() throws Exception {
protected void ShowCurrentObject() throws Exception {
super.ShowCurrentObject();
Global.mainModule.getUI().getCredentialsMenuBar().ShowUser();
}
@Override
public void ShowNoCurrentObject() throws Exception {
protected void ShowNoCurrentObject() throws Exception {
super.ShowNoCurrentObject();
Global.mainModule.getUI().getCredentialsMenuBar().ShowNoUser();
}
@@ -76,7 +76,7 @@ public class UsersForm extends DataSetControlForm<User> {
return super.isObjectVisible(object) && super.isObjectVisible(object) && MainModule_.instance.matchCurrentID(Current.Machine, object.machine_id);
}
@Override
public DBObjectDialog getDialog() {
protected DBObjectDialog getDialog() {
return new UserDialog();
}
}

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

@@ -61,7 +61,7 @@ public class AppendBugReportField extends ComponentsRepositoryPass<BugReport> {
}
@Override
protected void showFinish() throws Exception {
server.db.bugReports.RefreshUI();
server.db.bugReports.getUI().Refresh();
Global.mainModule.getUI().getMainWindow().getCallbackWindow().ShowCurrentBugReport();
}
@Override

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

@@ -58,6 +58,6 @@ public class InitialiseUser extends Pass {
}
@Override
protected void showFinish() throws Exception {
Global.mainModule.getDb().users.RefreshUI();
Global.mainModule.getDb().users.getUI().Refresh();
}
}

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

@@ -69,7 +69,7 @@ public class PublishBugReport extends Pass<BugReport> {
}
@Override
protected void showDone() throws Exception {
Global.componentsServer.db.bugReports.RefreshUI();
Global.componentsServer.db.bugReports.getUI().Refresh();
Global.mainModule.getUI().getMainWindow().getCallbackWindow().ShowCurrentBugReport();
}
}

4
src/_VisualDVM/Passes/All/Run.java
View File

@@ -81,7 +81,7 @@ public class Run extends Pass<db_project_info> {
boolean task_completed = false;
task.setProgress(i, runTasks.size());
//-
Global.mainModule.getDb().runTasks.RefreshUI();
Global.mainModule.getDb().runTasks.getUI().Refresh();
Global.mainModule.getDb().runTasks.getUI().SetCurrentByPK(task.id);
//-
subpass.Do(task, target);
@@ -102,7 +102,7 @@ public class Run extends Pass<db_project_info> {
break;
}
//-
Global.mainModule.getDb().runTasks.RefreshUI();
Global.mainModule.getDb().runTasks.getUI().Refresh();
Global.mainModule.getUI().getDebugWindow().ShowCurrentRunTask();
//-
if (!task_completed) break;

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

@@ -59,7 +59,7 @@ public class ShowCompilerVersion extends Pass<String> {
@Override
protected void showDone() throws Exception {
if (needsShow) {
(Global.mainModule.getDb()).compilers.RefreshUI();
(Global.mainModule.getDb()).compilers.getUI().Refresh();
ReadOnlyMultilineTextForm ff = new ReadOnlyMultilineTextForm();
ff.ShowDialog("Версия", target);
}

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

@@ -51,7 +51,7 @@ public class UpdateBugReportField extends ComponentsRepositoryPass<BugReport> {
BugReport.class.getField(fieldNames.get(i)).set(target, fieldValues.get(i));
target.change_date = new Date().getTime();
server.db.Update(target);
server.db.bugReports.RefreshUI();
server.db.bugReports.getUI().Refresh();
Global.mainModule.getUI().getMainWindow().getCallbackWindow().ShowCurrentBugReport();
} else
return canUpdate();
@@ -83,7 +83,7 @@ public class UpdateBugReportField extends ComponentsRepositoryPass<BugReport> {
}
@Override
protected void showFinish() throws Exception {
Global.componentsServer.db.bugReports.RefreshUI();
Global.componentsServer.db.bugReports.getUI().Refresh();
Global.mainModule.getUI().getMainWindow().getCallbackWindow().ShowCurrentBugReport();
}
@Override

2
src/_VisualDVM/Passes/Testing/ActualizeTestingPackages.java
View File

@@ -45,6 +45,6 @@ public abstract class ActualizeTestingPackages<P extends TestingPackage> extends
}
@Override
protected void showDone() throws Exception {
getTable().RefreshUI();
getTable().getUI().Refresh();
}
}

8
src/_VisualDVM/ProjectData/DBArray/UI/DBArraysForm.java
View File

@@ -11,15 +11,15 @@ public class DBArraysForm extends DataSetControlForm<DBArray> {
super(dataSource_in, mountPanel_in);
}
@Override
public Current CurrentName() {
protected Current CurrentName() {
return Current.DBArray;
}
@Override
public String getSingleDescription() {
protected String getSingleDescription() {
return "массив";
}
@Override
public String getPluralDescription() {
protected String getPluralDescription() {
return "сохранённые состояния";
}
@Override
@@ -38,7 +38,7 @@ public class DBArraysForm extends DataSetControlForm<DBArray> {
}
}
@Override
public boolean hasCheckBox() {
protected boolean hasCheckBox() {
return true;
}
@Override

2
src/_VisualDVM/ProjectData/Messages/Errors/ErrorsDBTable.java
View File

@@ -13,7 +13,7 @@ public class ErrorsDBTable extends MessagesDBTable<MessageError> {
protected DataSetControlForm createUI(JPanel mountPanel) {
return new MessagesControlForm(this, mountPanel) {
@Override
public Current CurrentName() {
protected Current CurrentName() {
return Current.Errors;
}
};

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

@@ -34,7 +34,7 @@ public class MessagesControlForm extends DataSetControlForm<Message> {
}
}
@Override
public void ShowCurrentObject() throws Exception {
protected void ShowCurrentObject() throws Exception {
super.ShowCurrentObject();
Global.mainModule.getFile().form.getEditor().gotoLine(getCurrent().line);
}
@@ -45,7 +45,7 @@ public class MessagesControlForm extends DataSetControlForm<Message> {
columns.get(3).setRendererClass(RendererWrapText.class);
}
@Override
public void MouseAction2() throws Exception {
protected void MouseAction2() throws Exception {
ShowCurrentObject();
}
@Override
@@ -57,7 +57,7 @@ public class MessagesControlForm extends DataSetControlForm<Message> {
return Comparator.comparingInt(o -> o.line);
}
@Override
public boolean hasMenuBar() {
protected boolean hasMenuBar() {
return false;
}
@Override

2
src/_VisualDVM/ProjectData/Messages/Notes/NotesDBTable.java
View File

@@ -13,7 +13,7 @@ public class NotesDBTable extends MessagesDBTable<MessageNote> {
protected DataSetControlForm createUI(JPanel mountPanel) {
return new MessagesControlForm(this, mountPanel) {
@Override
public Current CurrentName() {
protected Current CurrentName() {
return Current.Notes;
}
};

4
src/_VisualDVM/ProjectData/Messages/Recommendations/UI/RecommendationsForm.java
View File

@@ -12,7 +12,7 @@ public class RecommendationsForm extends DataSetControlForm<MessageRecommendatio
super(dataSource_in, mountPanel_in);
}
@Override
public Current CurrentName() {
protected Current CurrentName() {
return Current.Recommendations;
}
@Override
@@ -39,7 +39,7 @@ public class RecommendationsForm extends DataSetControlForm<MessageRecommendatio
AddFilter(new HeaderTextFilter(dataSource, 1, 72));
}
@Override
public boolean hasMenuBar() {
protected boolean hasMenuBar() {
return false;
}
}

2
src/_VisualDVM/ProjectData/Messages/Warnings/WarningsDBTable.java
View File

@@ -14,7 +14,7 @@ public class WarningsDBTable extends MessagesDBTable<MessageWarning> {
protected DataSetControlForm createUI(JPanel mountPanel) {
return new MessagesControlForm(this, mountPanel) {
@Override
public Current CurrentName() {
protected Current CurrentName() {
return Current.Warnings;
}
};

8
src/_VisualDVM/ProjectData/SapforData/Arrays/UI/ProjectArraysForm.java
View File

@@ -25,15 +25,15 @@ public class ProjectArraysForm extends DataSetControlForm<ProjectArray> {
}
//--
@Override
public Current CurrentName() {
protected Current CurrentName() {
return Current.ProjectArray;
}
@Override
public String getSingleDescription() {
protected String getSingleDescription() {
return "массив";
}
@Override
public String getPluralDescription() {
protected String getPluralDescription() {
return "объявленные массивы";
}
@Override
@@ -48,7 +48,7 @@ public class ProjectArraysForm extends DataSetControlForm<ProjectArray> {
};
}
@Override
public boolean hasCheckBox() {
protected boolean hasCheckBox() {
return true;
}
@Override

6
src/_VisualDVM/ProjectData/SapforData/Regions/UI/ParallelRegionsForm.java
View File

@@ -12,15 +12,15 @@ public class ParallelRegionsForm extends DataSetControlForm<ParallelRegion> {
super(dataSource_in, mountPanel_in);
}
@Override
public Current CurrentName() {
protected Current CurrentName() {
return Current.ParallelRegionInfo;
}
@Override
public String getSingleDescription() {
protected String getSingleDescription() {
return "область распараллеливания";
}
@Override
public String getPluralDescription() {
protected String getPluralDescription() {
return "области распараллеливания";
}
@Override

6
src/_VisualDVM/ProjectData/SapforData/Variants/UI/ParallelVariantsForm.java
View File

@@ -15,15 +15,15 @@ public class ParallelVariantsForm extends DataSetControlForm<ParallelVariant> {
super(dataSource_in, mountPanel_in);
}
@Override
public Current CurrentName() {
protected Current CurrentName() {
return Current.ParallelVariant;
}
@Override
public String getPluralDescription() {
protected String getPluralDescription() {
return "варианты";
}
@Override
public boolean hasCheckBox() {
protected boolean hasCheckBox() {
return true;
}
@Override

12
src/_VisualDVM/Repository/BugReport/UI/BugReportsForm.java
View File

@@ -31,15 +31,15 @@ public class BugReportsForm extends DataSetControlForm<BugReport> {
}
//--
@Override
public Current CurrentName() {
protected Current CurrentName() {
return Current.BugReport;
}
@Override
public String getSingleDescription() {
protected String getSingleDescription() {
return "отчёт об ошибке";
}
@Override
public String getPluralDescription() {
protected String getPluralDescription() {
return "отчёты об ошибках";
}
@Override
@@ -55,12 +55,12 @@ public class BugReportsForm extends DataSetControlForm<BugReport> {
"Статус"};
}
@Override
public void ShowCurrentObject() throws Exception {
protected void ShowCurrentObject() throws Exception {
super.ShowCurrentObject();
Global.mainModule.getUI().getMainWindow().getCallbackWindow().ShowCurrentBugReport();
}
@Override
public void ShowNoCurrentObject() throws Exception {
protected void ShowNoCurrentObject() throws Exception {
super.ShowNoCurrentObject();
Global.mainModule.getUI().getMainWindow().getCallbackWindow().ShowNoCurrentBugReport();
}
@@ -73,7 +73,7 @@ public class BugReportsForm extends DataSetControlForm<BugReport> {
columns.get(8).setRendererClass(RendererStatusEnum.class);
}
@Override
public void MouseAction2() throws Exception {
protected void MouseAction2() throws Exception {
Global.mainModule.getPass(PassCode.OpenBugReportTestProject).Do();
}
@Override

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

@@ -19,19 +19,19 @@ public class ComponentsForm extends DataSetControlForm<Component> {
super(dataSource_in, mountPanel_in);
}
@Override
public Current CurrentName() {
protected Current CurrentName() {
return Current.Component;
}
@Override
public String getSingleDescription() {
protected String getSingleDescription() {
return "компонент";
}
@Override
public String getPluralDescription() {
protected String getPluralDescription() {
return "компоненты";
}
@Override
public boolean hasCheckBox() {
protected boolean hasCheckBox() {
return true;
}
@Override

6
src/_VisualDVM/Repository/SubscriberWorkspace/UI/SubscriberWorkspacesForm.java
View File

@@ -13,15 +13,15 @@ public class SubscriberWorkspacesForm extends DataSetControlForm<SubscriberWorks
super(dataSource_in, mountPanel_in);
}
@Override
public Current CurrentName() {
protected Current CurrentName() {
return Current.SubscriberWorkspace;
}
@Override
public String getSingleDescription() {
protected String getSingleDescription() {
return "рабочая папка";
}
@Override
public String getPluralDescription() {
protected String getPluralDescription() {
return "рабочие папки";
}
@Override

10
src/_VisualDVM/Repository/Subscribes/UI/SubsribersForm.java
View File

@@ -16,19 +16,19 @@ public class SubsribersForm extends DataSetControlForm<Subscriber> {
super(dataSource_in, mountPanel_in);
}
@Override
public Current CurrentName() {
protected Current CurrentName() {
return Current.Subscriber;
}
@Override
public String getSingleDescription() {
protected String getSingleDescription() {
return "адресат";
}
@Override
public String getPluralDescription() {
protected String getPluralDescription() {
return "адресаты";
}
@Override
public boolean hasCheckBox() {
protected boolean hasCheckBox() {
return true;
}
@Override
@@ -68,7 +68,7 @@ public class SubsribersForm extends DataSetControlForm<Subscriber> {
PassCode.DeleteSubscriber);
}
@Override
public DBObjectDialog<Subscriber, ? extends DialogFields> getDialog() {
protected DBObjectDialog<Subscriber, ? extends DialogFields> getDialog() {
return new SubscriberDialog();
}
}

10
src/_VisualDVM/TestingSystem/Common/Group/UI/GroupsForm.java
View File

@@ -22,19 +22,19 @@ public class GroupsForm extends DataSetControlForm<Group> {
super(dataSource_in, mountPanel_in);
}
@Override
public Current CurrentName() {
protected Current CurrentName() {
return Current.Group;
}
@Override
public String getSingleDescription() {
protected String getSingleDescription() {
return "группа тестов";
}
@Override
public String getPluralDescription() {
protected String getPluralDescription() {
return "группы";
}
@Override
public boolean hasCheckBox() {
protected boolean hasCheckBox() {
return true;
}
@Override
@@ -112,7 +112,7 @@ public class GroupsForm extends DataSetControlForm<Group> {
});
}
@Override
public DBObjectDialog getDialog() {
protected DBObjectDialog getDialog() {
return new GroupDialog();
}
}

10
src/_VisualDVM/TestingSystem/Common/Test/UI/TestsForm.java
View File

@@ -14,19 +14,19 @@ public class TestsForm extends DataSetControlForm<Test> {
super(dataSource_in, mountPanel_in);
}
@Override
public Current CurrentName() {
protected Current CurrentName() {
return Current.Test;
}
@Override
public String getSingleDescription() {
protected String getSingleDescription() {
return "тест";
}
@Override
public String getPluralDescription() {
protected String getPluralDescription() {
return "тесты";
}
@Override
public boolean hasCheckBox() {
protected boolean hasCheckBox() {
return true;
}
@Override
@@ -70,7 +70,7 @@ public class TestsForm extends DataSetControlForm<Test> {
return super.isObjectVisible(object) && MainModule_.instance.matchCurrentID(Current.Group, object.group_id);
}
@Override
public DBObjectDialog getDialog() {
protected DBObjectDialog getDialog() {
return new TestDialog();
}
};

14
src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/UI/DVMConfigurationsForm.java
View File

@@ -17,19 +17,19 @@ public class DVMConfigurationsForm extends DataSetControlForm<DVMConfiguration>
super(dataSource_in, mountPanel_in);
}
@Override
public Current CurrentName() {
protected Current CurrentName() {
return Current.DVMConfiguration;
}
@Override
public String getSingleDescription() {
protected String getSingleDescription() {
return "конфигурация";
}
@Override
public String getPluralDescription() {
protected String getPluralDescription() {
return "конфигурации";
}
@Override
public boolean hasCheckBox() {
protected boolean hasCheckBox() {
return true;
}
@Override
@@ -85,11 +85,11 @@ public class DVMConfigurationsForm extends DataSetControlForm<DVMConfiguration>
PassCode.StartSelectedDVMConfigurations);
}
@Override
public DBObjectDialog getDialog() {
protected DBObjectDialog getDialog() {
return new DVMConfigurationDialog();
}
@Override
public boolean ShowEditObjectDialog(DVMConfiguration object) {
return (Global.mainModule.getAccount().CheckAccessRights(object.sender_address, null)) ? super.ShowEditObjectDialog(object) : ViewObject(object);
protected boolean isObjectEditable(DVMConfiguration object) {
return Global.mainModule.getAccount().CheckAccessRights(object.sender_address, null);
}
}

14
src/_VisualDVM/TestingSystem/DVM/DVMPackage/UI/DVMPackagesForm.java
View File

@@ -23,19 +23,19 @@ public class DVMPackagesForm extends DataSetControlForm<DVMPackage> {
super(dataSource_in, mountPanel_in);
}
@Override
public Current CurrentName() {
protected Current CurrentName() {
return Current.DVMPackage;
}
@Override
public String getSingleDescription() {
protected String getSingleDescription() {
return "пакет";
}
@Override
public String getPluralDescription() {
protected String getPluralDescription() {
return "пакеты";
}
@Override
public boolean hasCheckBox() {
protected boolean hasCheckBox() {
return true;
}
@Override
@@ -93,7 +93,7 @@ public class DVMPackagesForm extends DataSetControlForm<DVMPackage> {
columns.get(12).setRendererClass(RendererStatusEnum.class);
}
@Override
public void ShowCurrentObject() throws Exception {
protected void ShowCurrentObject() throws Exception {
super.ShowCurrentObject();
//--
Global.testingServer.db.dvmRunTasks.ShowDVMPackage(getCurrent());
@@ -101,13 +101,13 @@ public class DVMPackagesForm extends DataSetControlForm<DVMPackage> {
//--
}
@Override
public void ShowNoCurrentObject() throws Exception {
protected void ShowNoCurrentObject() throws Exception {
super.ShowNoCurrentObject();
Global.testingServer.db.dvmRunTasks.ShowNoPackage();
Global.mainModule.getUI().getMainWindow().getTestingWindow().DropTestRunTasksComparison();
}
@Override
public void MouseAction2() throws Exception {
protected void MouseAction2() throws Exception {
Global.mainModule.getPass(PassCode.DownloadDVMPackage).Do();
}
@Override

14
src/_VisualDVM/TestingSystem/DVM/DVMSettings/UI/DVMSettingsForm.java
View File

@@ -14,19 +14,19 @@ public class DVMSettingsForm extends DataSetControlForm<DVMSettings> {
super(dataSource_in, mountPanel_in);
}
@Override
public Current CurrentName() {
protected Current CurrentName() {
return Current.DVMSettings;
}
@Override
public String getSingleDescription() {
protected String getSingleDescription() {
return "параметры тестирования";
}
@Override
public String getPluralDescription() {
protected String getPluralDescription() {
return "параметры тестирования";
}
@Override
public boolean hasCheckBox() {
protected boolean hasCheckBox() {
return true;
}
@Override
@@ -77,11 +77,11 @@ public class DVMSettingsForm extends DataSetControlForm<DVMSettings> {
PassCode.DeleteDVMSettings);
}
@Override
public DBObjectDialog getDialog() {
protected DBObjectDialog getDialog() {
return new DVMSettingsDialog();
}
@Override
public boolean ShowEditObjectDialog(DVMSettings object) {
return (Global.mainModule.getAccount().CheckAccessRights(object.sender_address, null)) ? super.ShowEditObjectDialog(object) : ViewObject(object);
protected boolean isObjectEditable(DVMSettings object) {
return Global.mainModule.getAccount().CheckAccessRights(object.sender_address, null);
}
}

8
src/_VisualDVM/TestingSystem/DVM/DVMTasks/UI/DVMRunTasksForm.java
View File

@@ -19,19 +19,19 @@ public class DVMRunTasksForm extends DataSetControlForm<DVMRunTask> {
super(dataSource_in, mountPanel_in);
}
@Override
public Current CurrentName() {
protected Current CurrentName() {
return Current.DVMRunTask;
}
@Override
public String getSingleDescription() {
protected String getSingleDescription() {
return "задача";
}
@Override
public String getPluralDescription() {
protected String getPluralDescription() {
return "задачи";
}
@Override
public boolean hasCheckBox() {
protected boolean hasCheckBox() {
return true;
}
@Override

10
src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/UI/SapforConfigurationsForm.java
View File

@@ -18,19 +18,19 @@ public class SapforConfigurationsForm extends DataSetControlForm<SapforConfigura
super(dataSource_in, mountPanel_in);
}
@Override
public Current CurrentName() {
protected Current CurrentName() {
return Current.SapforConfiguration;
}
@Override
public String getSingleDescription() {
protected String getSingleDescription() {
return "конфигурация";
}
@Override
public String getPluralDescription() {
protected String getPluralDescription() {
return "конфигурации";
}
@Override
public boolean hasCheckBox() {
protected boolean hasCheckBox() {
return true;
}
@Override
@@ -88,7 +88,7 @@ public class SapforConfigurationsForm extends DataSetControlForm<SapforConfigura
PassCode.StartSelectedSAPFORConfigurations);
}
@Override
public DBObjectDialog getDialog() {
protected DBObjectDialog getDialog() {
return new SapforConfigurationDialog();
}
}

10
src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/UI/SapforPackagesForm.java
View File

@@ -23,19 +23,19 @@ public class SapforPackagesForm extends DataSetControlForm<SapforPackage> {
super(dataSource_in, mountPanel_in);
}
@Override
public Current CurrentName() {
protected Current CurrentName() {
return Current.SapforPackage;
}
@Override
public String getSingleDescription() {
protected String getSingleDescription() {
return "пакет";
}
@Override
public String getPluralDescription() {
protected String getPluralDescription() {
return "пакеты";
}
@Override
public boolean hasCheckBox() {
protected boolean hasCheckBox() {
return true;
}
@Override
@@ -87,7 +87,7 @@ public class SapforPackagesForm extends DataSetControlForm<SapforPackage> {
columns.get(10).setRendererClass(RendererStatusEnum.class);
}
@Override
public void MouseAction2() throws Exception {
protected void MouseAction2() throws Exception {
Global.mainModule.getPass(PassCode.CompareSapforPackages).Do();
}
@Override

10
src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/UI/SapforSettingsForm.java
View File

@@ -13,19 +13,19 @@ public class SapforSettingsForm extends DataSetControlForm<SapforSettings> {
super(dataSource_in, mountPanel_in);
}
@Override
public Current CurrentName() {
protected Current CurrentName() {
return Current.SapforSettings;
}
@Override
public String getSingleDescription() {
protected String getSingleDescription() {
return "параметры тестирования";
}
@Override
public String getPluralDescription() {
protected String getPluralDescription() {
return "параметры тестирования";
}
@Override
public boolean hasCheckBox() {
protected boolean hasCheckBox() {
return true;
}
@Override
@@ -58,7 +58,7 @@ public class SapforSettingsForm extends DataSetControlForm<SapforSettings> {
PassCode.DeleteSapforSettings);
}
@Override
public DBObjectDialog getDialog() {
protected DBObjectDialog getDialog() {
return new SapforSettingsDialog();
}
}

10
src/_VisualDVM/TestingSystem/SAPFOR/SapforSettingsCommand/UI/SapforSettingsCommandsForm.java
View File

@@ -14,19 +14,19 @@ public class SapforSettingsCommandsForm extends DataSetControlForm<SapforSetting
super(dataSource_in, mountPanel_in);
}
@Override
public Current CurrentName() {
protected Current CurrentName() {
return Current.SapforSettingsCommand;
}
@Override
public String getSingleDescription() {
protected String getSingleDescription() {
return "команда";
}
@Override
public String getPluralDescription() {
protected String getPluralDescription() {
return "команды";
}
@Override
public boolean hasCheckBox() {
protected boolean hasCheckBox() {
return true;
}
@Override
@@ -56,7 +56,7 @@ public class SapforSettingsCommandsForm extends DataSetControlForm<SapforSetting
return super.isObjectVisible(object) && MainModule_.instance.matchCurrentID(Current.SapforSettings, object.sapforsettings_id);
}
@Override
public DBObjectDialog getDialog() {
protected DBObjectDialog getDialog() {
return new SapforSettingsCommandDialog();
}
}

12
src/_VisualDVM/TestingSystem/SAPFOR/ServerSapfor/UI/ServerSapforsForm.java
View File

@@ -16,19 +16,19 @@ public class ServerSapforsForm extends DataSetControlForm<ServerSapfor> {
super(dataSource_in, mountPanel_in);
}
@Override
public Current CurrentName() {
protected Current CurrentName() {
return Current.ServerSapfor;
}
@Override
public String getSingleDescription() {
protected String getSingleDescription() {
return "версия SAPFOR";
}
@Override
public String getPluralDescription() {
protected String getPluralDescription() {
return "версии SAPFOR";
}
@Override
public boolean hasCheckBox() {
protected boolean hasCheckBox() {
return true;
}
@Override
@@ -60,12 +60,12 @@ public class ServerSapforsForm extends DataSetControlForm<ServerSapfor> {
columns.get(5).setRendererClass(RendererStatusEnum.class);
}
@Override
public void ShowCurrentObject() throws Exception {
protected void ShowCurrentObject() throws Exception {
super.ShowCurrentObject();
Global.mainModule.getUI().getMainWindow().getTestingWindow().ShowCurrentServerSapfor();
}
@Override
public void ShowNoCurrentObject() throws Exception {
protected void ShowNoCurrentObject() throws Exception {
super.ShowNoCurrentObject();
Global.mainModule.getUI().getMainWindow().getTestingWindow().ShowNoServerSapfor();
}

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

@@ -73,7 +73,7 @@ public class CallbackForm implements FormWithSplitters, CallbackWindow {
if (Global.mainModule.getBugReport().state.equals(BugReportState.draft))
Global.mainModule.getBugReport().description =
BugReportDescription.getText();
Global.componentsServer.db.bugReports.RefreshUI();
Global.componentsServer.db.bugReports.getUI().Refresh();
}
};
DocumentListener commentListener = new DocumentListener() {

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

@@ -90,7 +90,7 @@ public class VariantsForm implements VariantsWindow {
}
@Override
public void RefreshVariants() {
Global.mainModule.getProject().parallelVariants.RefreshUI();
Global.mainModule.getProject().parallelVariants.getUI().Refresh();
}
@Override
public void ShowNoVariants() {