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

упраздение лишних енумов в оформлении таблиц и деревьев.

Browse Source
This commit is contained in:
02090095
2024-10-15 15:13:57 +03:00
parent b7b82e54c6
commit 5e2a9848da
146 changed files with 565 additions and 615 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6,7 +6,7 @@ import Common.Database.Tables.FKDataBehaviour;
import Common.Database.Tables.iDBTable;
import Common.Utils.Utils_;
import Common.Visual.DataSetControlForm;
import Common.Visual.UI_;
import Common.Visual.UI;
import Common.Visual.Windows.Dialog.DBObjectDialog;
import _VisualDVM.Current;
import _VisualDVM.Global;
@@ -96,7 +96,7 @@ public class CompilersDBTable extends iDBTable<Compiler> {
fields.tfHelpCommand.setText(Result.help_command);
fields.tfVersionCommand.setText(Result.version_command);
fields.tfHome.setText(Result.home_path);
UI_.TrySelect(fields.cbCompilerType, Result.type);
UI.TrySelect(fields.cbCompilerType, Result.type);
fields.events_on = true;
}
@Override

4
src/_VisualDVM/GlobalData/Compiler/UI/CompilerFields.java
View File

@@ -1,6 +1,6 @@
package _VisualDVM.GlobalData.Compiler.UI;
import Common.Visual.TextField.StyledTextField;
import Common.Visual.UI_;
import Common.Visual.UI;
import Common.Visual.Windows.Dialog.DialogFields;
import Common.Visual.Windows.Dialog.VDirectoryChooser;
import _VisualDVM.Global;
@@ -41,7 +41,7 @@ public class CompilerFields implements DialogFields {
if (dst != null)
tfHome.setText(dst);
} else
UI_.Info("Назначение домашней папки поддерживается только для dvm системы.");
UI.Info("Назначение домашней папки поддерживается только для dvm системы.");
});
tfHome.getDocument().addDocumentListener(new DocumentListener() {
@Override

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

@@ -1,10 +1,9 @@
package _VisualDVM.GlobalData.CompilerEnvironment;
import Common.Database.Tables.DataSet;
import Common.Visual.DataSetControlForm;
import Common.Visual.Tables.TableEditors;
import Common.Visual.Tables.TableRenderers;
import static Common.Visual.Tables.TableRenderers.RendererMultiline;
import Common.Visual.Tables.RendererMultiline;
import _VisualDVM.GlobalData.CompilerEnvironment.UI.CompilerEnvironmentValueEditor;
import _VisualDVM.GlobalData.CompilerEnvironment.UI.CompilerEnvironmentValueRenderer;
public class CompilerEnvironmentsSet extends DataSet<String, CompilerEnvironment> {
public CompilerEnvironmentsSet() {
super(String.class, CompilerEnvironment.class);
@@ -35,10 +34,10 @@ public class CompilerEnvironmentsSet extends DataSet<String, CompilerEnvironment
}
@Override
protected void AdditionalInitColumns() {
columns.get(2).setRenderer(TableRenderers.RendererCompilerEnvironmentValue);
columns.get(2).setEditor(TableEditors.EditorCompilerEnvironmentValue);
columns.get(2).setRendererClass(CompilerEnvironmentValueRenderer.class);
columns.get(2).setEditorClass(CompilerEnvironmentValueEditor.class);
//-
columns.get(3).setRenderer(RendererMultiline);
columns.get(3).setRendererClass(RendererMultiline.class);
}
};
}

8
src/_VisualDVM/GlobalData/CompilerEnvironment/UI/CompilerEnvironmentValueEditor.java
View File

@@ -1,11 +1,11 @@
package _VisualDVM.GlobalData.CompilerEnvironment.UI;
import Common.MainModule_;
import Common.Visual.Fonts.VisualiserFonts;
import Common.Visual.Tables.DBObjectEditor;
import Common.Visual.UI_;
import Common.Visual.Tables.EditorDBObject;
import Common.Visual.UI;
import Common.Visual.Windows.Dialog.Text.ComboTextDialog;
import _VisualDVM.GlobalData.CompilerEnvironment.CompilerEnvironment;
public class CompilerEnvironmentValueEditor extends DBObjectEditor<CompilerEnvironment> {
public class CompilerEnvironmentValueEditor extends EditorDBObject<CompilerEnvironment> {
@Override
public void Action() {
setFont(MainModule_.instance.getUI().getTheme().Fonts.get(VisualiserFonts.Hyperlink));
@@ -21,7 +21,7 @@ public class CompilerEnvironmentValueEditor extends DBObjectEditor<CompilerEnvir
};
dialog.fields.setEditable(value.valueVariants.isEmpty());
if (!value.value.isEmpty())
UI_.TrySelect(dialog.fields, value.value);
UI.TrySelect(dialog.fields, value.value);
if (dialog.ShowDialog("Изменить значение опции " + value.name,
value.valueVariants
)) {

4
src/_VisualDVM/GlobalData/CompilerEnvironment/UI/CompilerEnvironmentValueRenderer.java
View File

@@ -1,9 +1,9 @@
package _VisualDVM.GlobalData.CompilerEnvironment.UI;
import Common.MainModule_;
import Common.Visual.Fonts.VisualiserFonts;
import Common.Visual.Tables.DBObjectRenderer;
import Common.Visual.Tables.RendererDBObject;
import _VisualDVM.GlobalData.CompilerEnvironment.CompilerEnvironment;
public class CompilerEnvironmentValueRenderer extends DBObjectRenderer {
public class CompilerEnvironmentValueRenderer extends RendererDBObject {
@Override
public void Display() {
if (value != null) {

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

@@ -1,10 +1,9 @@
package _VisualDVM.GlobalData.CompilerOption;
import Common.Database.Tables.DataSet;
import Common.Visual.DataSetControlForm;
import Common.Visual.Tables.TableEditors;
import Common.Visual.Tables.TableRenderers;
import static Common.Visual.Tables.TableRenderers.RendererMultiline;
import Common.Visual.Tables.RendererMultiline;
import _VisualDVM.GlobalData.CompilerOption.UI.CompilerOptionParameterNameRenderer;
import _VisualDVM.GlobalData.CompilerOption.UI.CompilerOptionParameterValueRenderer;
public class CompilerOptionsSet extends DataSet<String, CompilerOption> {
public CompilerOptionsSet() {
super(String.class, CompilerOption.class);
@@ -37,10 +36,10 @@ public class CompilerOptionsSet extends DataSet<String, CompilerOption> {
}
@Override
protected void AdditionalInitColumns() {
columns.get(2).setRenderer(TableRenderers.RendererCompilerOptionParameterName);
columns.get(3).setRenderer(TableRenderers.RendererCompilerOptionParameterValue);
columns.get(3).setEditor(TableEditors.EditorCompilerOptionParameterValue);
columns.get(4).setRenderer(RendererMultiline);
columns.get(2).setRendererClass( CompilerOptionParameterNameRenderer.class);
columns.get(3).setRendererClass(CompilerOptionParameterValueRenderer.class);
columns.get(3).setEditorClass(CompilerOptionParameterValueRenderer.class);
columns.get(4).setRendererClass(RendererMultiline.class);
}
};
}

4
src/_VisualDVM/GlobalData/CompilerOption/UI/CompilerOptionParameterNameRenderer.java
View File

@@ -1,9 +1,9 @@
package _VisualDVM.GlobalData.CompilerOption.UI;
import Common.MainModule_;
import Common.Visual.Fonts.VisualiserFonts;
import Common.Visual.Tables.DBObjectRenderer;
import Common.Visual.Tables.RendererDBObject;
import _VisualDVM.GlobalData.CompilerOption.CompilerOption;
public class CompilerOptionParameterNameRenderer extends DBObjectRenderer {
public class CompilerOptionParameterNameRenderer extends RendererDBObject {
@Override
public void Display() {
if (value != null) {

8
src/_VisualDVM/GlobalData/CompilerOption/UI/CompilerOptionParameterValueEditor.java
View File

@@ -1,11 +1,11 @@
package _VisualDVM.GlobalData.CompilerOption.UI;
import Common.MainModule_;
import Common.Visual.Fonts.VisualiserFonts;
import Common.Visual.Tables.DBObjectEditor;
import Common.Visual.UI_;
import Common.Visual.Tables.EditorDBObject;
import Common.Visual.UI;
import Common.Visual.Windows.Dialog.Text.ComboTextDialog;
import _VisualDVM.GlobalData.CompilerOption.CompilerOption;
public class CompilerOptionParameterValueEditor extends DBObjectEditor<CompilerOption> {
public class CompilerOptionParameterValueEditor extends EditorDBObject<CompilerOption> {
@Override
public void Action() {
if (value.hasParameter()) {
@@ -15,7 +15,7 @@ public class CompilerOptionParameterValueEditor extends DBObjectEditor<CompilerO
//-
ComboTextDialog dialog = new ComboTextDialog();
if (!value.parameterValue.isEmpty())
UI_.TrySelect(dialog.fields, value.parameterValue);
UI.TrySelect(dialog.fields, value.parameterValue);
dialog.fields.setEditable(value.parameterVariants.isEmpty());
if (dialog.ShowDialog("Изменить значение опции " + value.name,
value.parameterVariants)) {

4
src/_VisualDVM/GlobalData/CompilerOption/UI/CompilerOptionParameterValueRenderer.java
View File

@@ -1,9 +1,9 @@
package _VisualDVM.GlobalData.CompilerOption.UI;
import Common.MainModule_;
import Common.Visual.Fonts.VisualiserFonts;
import Common.Visual.Tables.DBObjectRenderer;
import Common.Visual.Tables.RendererDBObject;
import _VisualDVM.GlobalData.CompilerOption.CompilerOption;
public class CompilerOptionParameterValueRenderer extends DBObjectRenderer {
public class CompilerOptionParameterValueRenderer extends RendererDBObject {
@Override
public void Display() {
if (value != null) {

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

@@ -2,7 +2,7 @@ package _VisualDVM.GlobalData.DVMParameter;
import Common.Database.Tables.iDBTable;
import Common.Utils.Utils_;
import Common.Visual.DataSetControlForm;
import Common.Visual.UI_;
import Common.Visual.UI;
import Common.Visual.Windows.Dialog.DBObjectDialog;
import _VisualDVM.Current;
import _VisualDVM.Global;
@@ -52,7 +52,7 @@ public class DVMParameterDBTable extends iDBTable<DVMParameter> {
return new DBObjectDialog<DVMParameter, DVMParameterFields>(DVMParameterFields.class) {
@Override
public void fillFields() {
UI_.TrySelect(fields.cbName, Result.name);
UI.TrySelect(fields.cbName, Result.name);
fields.tfValue.setText(Result.value);
}
//https://javarush.ru/groups/posts/regulyarnye-vyrazheniya-v-java

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

@@ -2,7 +2,7 @@ package _VisualDVM.GlobalData.EnvironmentValue;
import Common.Database.Tables.iDBTable;
import Common.Utils.Utils_;
import Common.Visual.DataSetControlForm;
import Common.Visual.UI_;
import Common.Visual.UI;
import Common.Visual.Windows.Dialog.DBObjectDialog;
import _VisualDVM.Current;
import _VisualDVM.Global;
@@ -25,7 +25,7 @@ public class EnvironmentValuesDBTable extends iDBTable<EnvironmentValue> {
return new DBObjectDialog<EnvironmentValue, EnvironmentValueFields>(EnvironmentValueFields.class) {
@Override
public void fillFields() {
UI_.TrySelect(fields.cbName, Result.name);
UI.TrySelect(fields.cbName, Result.name);
fields.tfValue.setText(Result.value);
}
//https://javarush.ru/groups/posts/regulyarnye-vyrazheniya-v-java

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

@@ -1,8 +1,7 @@
package _VisualDVM.GlobalData.FileObject;
import Common.Database.Tables.DataSet;
import Common.Visual.DataSetControlForm;
import static Common.Visual.Tables.TableRenderers.RendererDate;
import Common.Visual.Tables.RendererDate;
public class DirInfosDataSet extends DataSet<String, DirInfo> {
public DirInfosDataSet() {
super(String.class, DirInfo.class);
@@ -12,7 +11,7 @@ public class DirInfosDataSet extends DataSet<String, DirInfo> {
return new DataSetControlForm(this) {
@Override
protected void AdditionalInitColumns() {
columns.get(1).setRenderer(RendererDate);
columns.get(1).setRendererClass(RendererDate.class);
}
};
}

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

@@ -5,7 +5,7 @@ import Common.Database.Tables.FKCurrentObjectBehaviuor;
import Common.Database.Tables.FKDataBehaviour;
import Common.Database.Tables.iDBTable;
import Common.Visual.DataSetControlForm;
import Common.Visual.UI_;
import Common.Visual.UI;
import Common.Visual.Windows.Dialog.DBObjectDialog;
import _VisualDVM.Current;
import _VisualDVM.Global;
@@ -50,7 +50,7 @@ public class MachinesDBTable extends iDBTable<Machine> {
fields.tfName.setText(Result.name);
fields.tfAddress.setText(Result.address);
fields.sPort.setValue(Result.port);
UI_.TrySelect(fields.cbMachineType, Result.type);
UI.TrySelect(fields.cbMachineType, Result.type);
}
@Override
public void ProcessResult() {

8
src/_VisualDVM/GlobalData/Module/UI/ModuleAnchestorFields.java
View File

@@ -1,7 +1,7 @@
package _VisualDVM.GlobalData.Module.UI;
import Common.Passes.Pass;
import Common.Visual.Controls.StyledTextComboBox;
import Common.Visual.UI_;
import Common.Visual.UI;
import Common.Visual.Windows.Dialog.DialogFields;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.Compiler.Compiler;
@@ -32,14 +32,14 @@ public class ModuleAnchestorFields implements DialogFields {
bHelp.addActionListener(e -> {
if (cbCompilers.getSelectedItem() != null) {
Global.mainModule.getPass(PassCode.ShowCompilerHelp).Do(compiler, true);
} else UI_.Info("Компилятор не выбран");
} else UI.Info("Компилятор не выбран");
});
BPickOptions.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
Pass<String> pass = Global.mainModule.getPass(PassCode.PickCompilerOptions);
if (pass.Do(compiler)) {
UI_.TrySelect(cbFlags, pass.target);
UI.TrySelect(cbFlags, pass.target);
}
}
});
@@ -58,7 +58,7 @@ public class ModuleAnchestorFields implements DialogFields {
cbCompilers.addActionListener(e -> {
if (cbCompilers.getSelectedItem() instanceof Compiler) {
Compiler compiler = ((Compiler) cbCompilers.getSelectedItem());
UI_.TrySelect(cbCommands,
UI.TrySelect(cbCommands,
linker ? compiler.getSpecialLinkCommand(languageName) : compiler.getSpecialCompilationCommand(languageName));
}
});

8
src/_VisualDVM/GlobalData/Module/UI/ModuleAnchestorForm.java
View File

@@ -1,6 +1,6 @@
package _VisualDVM.GlobalData.Module.UI;
import Common.CommonConstants;
import Common.Visual.UI_;
import Common.Visual.UI;
import Common.Visual.Windows.Dialog.DBObjectDialog;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.Compiler.Compiler;
@@ -93,9 +93,9 @@ public class ModuleAnchestorForm<T extends ModuleAnchestor> extends DBObjectDial
}
@Override
public void fillFields() {
UI_.TrySelect(fields.cbFlags, Result.flags);
UI_.TrySelect(fields.cbCommands, Result.command);
UI_.TrySelect(fields.cbCompilers, Result.getCompiler());
UI.TrySelect(fields.cbFlags, Result.flags);
UI.TrySelect(fields.cbCommands, Result.command);
UI.TrySelect(fields.cbCompilers, Result.getCompiler());
//--------------------------------------------
fields.setListeners(Result);
}

4
src/_VisualDVM/GlobalData/RemoteFile/UI/RemoteFileChooser.java
View File

@@ -1,6 +1,6 @@
package _VisualDVM.GlobalData.RemoteFile.UI;
import Common.Utils.Utils_;
import Common.Visual.UI_;
import Common.Visual.UI;
import Common.Visual.Windows.Dialog.Dialog;
import _VisualDVM.Current;
import _VisualDVM.Global;
@@ -84,7 +84,7 @@ public class RemoteFileChooser extends Dialog<String, RemoteFileChooserFields> {
public void goUp() {
if (!root_file.full_name.equals("/")) {
Refresh(root_file.parent);
} else UI_.Info("Корневая папка файловой системы достигнута.");
} else UI.Info("Корневая папка файловой системы достигнута.");
}
@Override
public void validateFields() {

5
src/_VisualDVM/GlobalData/RemoteFile/UI/RemoteFilesTree.java
View File

@@ -1,6 +1,5 @@
package _VisualDVM.GlobalData.RemoteFile.UI;
import Common.Visual.Trees.DataTree;
import Common.Visual.Trees.TreeRenderers;
import _VisualDVM.Current;
import _VisualDVM.Global;
public class RemoteFilesTree extends DataTree {
@@ -8,8 +7,8 @@ public class RemoteFilesTree extends DataTree {
super(Global.mainModule.getUI().getRemoteFileChooser().root);
}
@Override
public TreeRenderers getRenderer() {
return TreeRenderers.RendererRemoteFile;
public Class getRendererClass() {
return RendererTreeRemoteFile.class;
}
@Override
public Current getCurrent() {

2
src/_VisualDVM/GlobalData/RemoteFile/UI/RemoteFileRenderer.java → src/_VisualDVM/GlobalData/RemoteFile/UI/RendererTreeRemoteFile.java
View File

@@ -6,7 +6,7 @@ import _VisualDVM.GlobalData.RemoteFile.RemoteFile;
import javax.swing.*;
import javax.swing.tree.DefaultMutableTreeNode;
public class RemoteFileRenderer extends StyledTreeCellRenderer {
public class RendererTreeRemoteFile extends StyledTreeCellRenderer {
public java.awt.Component getTreeCellRendererComponent(
JTree tree, Object value,
boolean selected, boolean expanded,

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

@@ -6,7 +6,7 @@ import Common.Database.Tables.FKCurrentObjectBehaviuor;
import Common.Database.Tables.FKDataBehaviour;
import Common.Database.Tables.iDBTable;
import Common.Visual.DataSetControlForm;
import Common.Visual.UI_;
import Common.Visual.UI;
import Common.Visual.Windows.Dialog.DBObjectDialog;
import _VisualDVM.Current;
import _VisualDVM.Global;
@@ -43,14 +43,14 @@ public class RunConfigurationsDBTable extends iDBTable<RunConfiguration> {
if (compiler.isVisible() && compiler.type.equals(CompilerType.dvm))
fields.cbLauncherCall.addItem(compiler);
}
UI_.TrySelect_s(fields.cbLauncherCall, Result.LauncherCall);
UI_.TrySelect(fields.cbLaunchOptions, Result.LauncherOptions);
UI.TrySelect_s(fields.cbLauncherCall, Result.LauncherCall);
UI.TrySelect(fields.cbLaunchOptions, Result.LauncherOptions);
fields.tfArgs.setText(Result.args);
fields.cbLauncherCall.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
if (fields.cbLauncherCall.getSelectedItem() instanceof Compiler) {
UI_.TrySelect(fields.cbLaunchOptions, "run");
UI.TrySelect(fields.cbLaunchOptions, "run");
}
}
});

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

@@ -6,6 +6,8 @@ import Common.Database.Tables.FKDataBehaviour;
import Common.Database.Tables.iDBTable;
import Common.Visual.DataSetControlForm;
import Common.Visual.Menus.TableMenu;
import Common.Visual.Tables.RendererDate;
import Common.Visual.Tables.RendererStatusEnum;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.Tasks.RunTask.RunTask;
@@ -13,8 +15,6 @@ import _VisualDVM.Passes.PassCode;
import java.util.LinkedHashMap;
import static Common.Visual.Tables.TableRenderers.RendererDate;
import static Common.Visual.Tables.TableRenderers.RendererStatusEnum;
public class CompilationTasksDBTable extends iDBTable<CompilationTask> {
public CompilationTasksDBTable() {
super(CompilationTask.class);
@@ -42,8 +42,8 @@ public class CompilationTasksDBTable extends iDBTable<CompilationTask> {
}
@Override
protected void AdditionalInitColumns() {
columns.get(12).setRenderer(RendererDate);
columns.get(13).setRenderer(RendererStatusEnum);
columns.get(12).setRendererClass(RendererDate.class);
columns.get(13).setRendererClass(RendererStatusEnum.class);
}
@Override
public void ShowCurrentObject() throws Exception {

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

@@ -2,12 +2,12 @@ package _VisualDVM.GlobalData.Tasks.RunTask;
import Common.Database.Tables.iDBTable;
import Common.Visual.DataSetControlForm;
import Common.Visual.Menus.TableMenu;
import Common.Visual.Tables.RendererDate;
import Common.Visual.Tables.RendererStatusEnum;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import static Common.Visual.Tables.TableRenderers.RendererDate;
import static Common.Visual.Tables.TableRenderers.RendererStatusEnum;
public class RunTasksDBTable extends iDBTable<RunTask> {
public RunTasksDBTable() {
super(RunTask.class);
@@ -29,8 +29,8 @@ public class RunTasksDBTable extends iDBTable<RunTask> {
}
@Override
protected void AdditionalInitColumns() {
columns.get(6).setRenderer(RendererDate);
columns.get(7).setRenderer(RendererStatusEnum);
columns.get(6).setRendererClass(RendererDate.class);
columns.get(7).setRendererClass(RendererStatusEnum.class);
}
@Override
public void ShowCurrentObject() throws Exception {

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

@@ -5,7 +5,7 @@ import Common.Database.Tables.FKCurrentObjectBehaviuor;
import Common.Database.Tables.FKDataBehaviour;
import Common.Database.Tables.iDBTable;
import Common.Visual.DataSetControlForm;
import Common.Visual.Tables.TableRenderers;
import Common.Visual.Tables.RendererStatusEnum;
import Common.Visual.Windows.Dialog.DBObjectDialog;
import _VisualDVM.Current;
import _VisualDVM.Global;
@@ -75,7 +75,7 @@ public class UsersDBTable extends iDBTable<User> {
@Override
protected void AdditionalInitColumns() {
columns.get(0).setVisible(false);
columns.get(2).setRenderer(TableRenderers.RendererStatusEnum);
columns.get(2).setRendererClass(RendererStatusEnum.class);
}
@Override
public void ShowCurrentObject() throws Exception {