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-07 17:46:38 +03:00
parent 6537eebe09
commit e7f661f7ad
87 changed files with 279 additions and 222 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/GlobalData/Compiler/CompilersDBTable.java
View File

@@ -1,5 +1,6 @@
package GlobalData.Compiler;
import Common.Utils.CommonUtils;
import Common.Visual.CommonUI;
import Common_old.Current;
import Common_old.UI.DataSetControlForm;
import Common_old.UI.UI;
@@ -95,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);
CommonUI.TrySelect(fields.cbCompilerType, Result.type);
fields.events_on = true;
}
@Override

2
src/GlobalData/Compiler/CompilersMenuBar.java
View File

@@ -1,5 +1,5 @@
package GlobalData.Compiler;
import Common_old.UI.Menus_2023.DataMenuBar;
import Common.Visual.DataMenuBar;
import Visual_DVM_2021.Passes.PassCode_2021;
public class CompilersMenuBar extends DataMenuBar {
public CompilersMenuBar() {

4
src/GlobalData/CompilerEnvironment/UI/CompilerEnvironmentValueEditor.java
View File

@@ -1,8 +1,8 @@
package GlobalData.CompilerEnvironment.UI;
import Common.Visual.CommonUI;
import Common_old.Current;
import Common_old.UI.Tables.DBObjectEditor;
import _VisualDVM.Syntax.VisualiserFonts;
import Common_old.UI.UI;
import Common_old.UI.Windows.Dialog.Text.ComboTextDialog;
import GlobalData.CompilerEnvironment.CompilerEnvironment;
public class CompilerEnvironmentValueEditor extends DBObjectEditor<CompilerEnvironment> {
@@ -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);
CommonUI.TrySelect(dialog.fields, value.value);
if (dialog.ShowDialog("Изменить значение опции " + value.name,
value.valueVariants
)) {

4
src/GlobalData/CompilerOption/UI/CompilerOptionParameterValueEditor.java
View File

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

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

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

2
src/GlobalData/DVMParameter/DVMParametersMenuBar.java
View File

@@ -1,5 +1,5 @@
package GlobalData.DVMParameter;
import Common_old.UI.Menus_2023.DataMenuBar;
import Common.Visual.DataMenuBar;
import Visual_DVM_2021.Passes.PassCode_2021;
public class DVMParametersMenuBar extends DataMenuBar {
public DVMParametersMenuBar() {

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

@@ -1,10 +1,10 @@
package GlobalData.EnvironmentValue;
import Common.Utils.CommonUtils;
import Common.Visual.CommonUI;
import Common_old.Current;
import Common.Database.Tables.iDBTable;
import _VisualDVM.Global;
import Common_old.UI.DataSetControlForm;
import Common_old.UI.UI;
import Common_old.UI.Windows.Dialog.DBObjectDialog;
import Common_old.Utils.Utils;
import GlobalData.EnvironmentValue.UI.EnvironmentValueFields;
@@ -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);
CommonUI.TrySelect(fields.cbName, Result.name);
fields.tfValue.setText(Result.value);
}
//https://javarush.ru/groups/posts/regulyarnye-vyrazheniya-v-java

2
src/GlobalData/EnvironmentValue/EnvironmentValuesMenuBar.java
View File

@@ -1,5 +1,5 @@
package GlobalData.EnvironmentValue;
import Common_old.UI.Menus_2023.DataMenuBar;
import Common.Visual.DataMenuBar;
import Visual_DVM_2021.Passes.PassCode_2021;
public class EnvironmentValuesMenuBar extends DataMenuBar {
public EnvironmentValuesMenuBar() {

3
src/GlobalData/Machine/MachinesDBTable.java
View File

@@ -1,4 +1,5 @@
package GlobalData.Machine;
import Common.Visual.CommonUI;
import Common_old.Current;
import Common_old.UI.DataSetControlForm;
import Common_old.UI.UI;
@@ -49,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);
CommonUI.TrySelect(fields.cbMachineType, Result.type);
}
@Override
public void ProcessResult() {

2
src/GlobalData/Machine/MachinesMenuBar.java
View File

@@ -1,5 +1,5 @@
package GlobalData.Machine;
import Common_old.UI.Menus_2023.DataMenuBar;
import Common.Visual.DataMenuBar;
import Common_old.UI.Menus_2023.MenuBarButton;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.Pass_2021;

2
src/GlobalData/Makefile/MakefilesMenuBar.java
View File

@@ -1,5 +1,5 @@
package GlobalData.Makefile;
import Common_old.UI.Menus_2023.DataMenuBar;
import Common.Visual.DataMenuBar;
import Visual_DVM_2021.Passes.PassCode_2021;
public class MakefilesMenuBar extends DataMenuBar {
public MakefilesMenuBar() {

2
src/GlobalData/Module/ModulesMenuBar.java
View File

@@ -1,5 +1,5 @@
package GlobalData.Module;
import Common_old.UI.Menus_2023.DataMenuBar;
import Common.Visual.DataMenuBar;
import Visual_DVM_2021.Passes.PassCode_2021;
public class ModulesMenuBar extends DataMenuBar {
public ModulesMenuBar() {

5
src/GlobalData/Module/UI/ModuleAnchestorFields.java
View File

@@ -1,4 +1,5 @@
package GlobalData.Module.UI;
import Common.Visual.CommonUI;
import Common_old.Current;
import Common_old.UI.ComboBox.StyledTextComboBox;
import Common_old.UI.UI;
@@ -39,7 +40,7 @@ public class ModuleAnchestorFields implements DialogFields {
public void actionPerformed(ActionEvent e) {
Pass_2021<String> pass = Pass_2021.passes.get(PassCode_2021.PickCompilerOptions);
if (pass.Do(compiler)) {
UI.TrySelect(cbFlags, pass.target);
CommonUI.TrySelect(cbFlags, pass.target);
}
}
});
@@ -58,7 +59,7 @@ public class ModuleAnchestorFields implements DialogFields {
cbCompilers.addActionListener(e -> {
if (cbCompilers.getSelectedItem() instanceof Compiler) {
Compiler compiler = ((Compiler) cbCompilers.getSelectedItem());
UI.TrySelect(cbCommands,
CommonUI.TrySelect(cbCommands,
linker ? compiler.getSpecialLinkCommand(languageName) : compiler.getSpecialCompilationCommand(languageName));
}
});

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

@@ -1,7 +1,7 @@
package GlobalData.Module.UI;
import Common.CommonConstants;
import Common.Visual.CommonUI;
import Common_old.Current;
import Common_old.UI.UI;
import Common_old.UI.Windows.Dialog.DBObjectDialog;
import GlobalData.Compiler.Compiler;
import GlobalData.Compiler.CompilerType;
@@ -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());
CommonUI.TrySelect(fields.cbFlags, Result.flags);
CommonUI.TrySelect(fields.cbCommands, Result.command);
CommonUI.TrySelect(fields.cbCompilers, Result.getCompiler());
//--------------------------------------------
fields.setListeners(Result);
}

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

@@ -1,9 +1,9 @@
package GlobalData.RunConfiguration;
import Common.CommonConstants;
import Common.Visual.CommonUI;
import Common_old.Current;
import _VisualDVM.Global;
import Common_old.UI.DataSetControlForm;
import Common_old.UI.UI;
import Common_old.UI.Windows.Dialog.DBObjectDialog;
import Common.Database.Objects.DBObject;
import Common.Database.Tables.FKBehaviour;
@@ -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);
CommonUI.TrySelect_s(fields.cbLauncherCall, Result.LauncherCall);
CommonUI.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");
CommonUI.TrySelect(fields.cbLaunchOptions, "run");
}
}
});

2
src/GlobalData/RunConfiguration/RunConfigurationsMenuBar.java
View File

@@ -1,5 +1,5 @@
package GlobalData.RunConfiguration;
import Common_old.UI.Menus_2023.DataMenuBar;
import Common.Visual.DataMenuBar;
import Visual_DVM_2021.Passes.PassCode_2021;
import javax.swing.*;

2
src/GlobalData/Tasks/TaskState.java
View File

@@ -1,5 +1,5 @@
package GlobalData.Tasks;
import Common_old.UI.StatusEnum;
import Common.Visual.StatusEnum;
import _VisualDVM.Syntax.VisualiserFonts;
public enum TaskState implements StatusEnum {
Inactive,

2
src/GlobalData/User/UserState.java
View File

@@ -1,5 +1,5 @@
package GlobalData.User;
import Common_old.UI.StatusEnum;
import Common.Visual.StatusEnum;
import _VisualDVM.Syntax.VisualiserFonts;
public enum UserState implements StatusEnum {
initial, //на пользователя еще не заходили.

2
src/GlobalData/User/UsersMenuBar.java
View File

@@ -1,5 +1,5 @@
package GlobalData.User;
import Common_old.UI.Menus_2023.DataMenuBar;
import Common.Visual.DataMenuBar;
import Visual_DVM_2021.Passes.PassCode_2021;
public class UsersMenuBar extends DataMenuBar {
public UsersMenuBar() {