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-08 22:33:49 +03:00
parent 90546fc62e
commit e0974fe4a8
246 changed files with 1170 additions and 849 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4,7 +4,7 @@ import Common.Visual.CommonUI;
import Common_old.Current;
import Common.Visual.DataSetControlForm;
import Common_old.UI.UI;
import Common_old.UI.Windows.Dialog.DBObjectDialog;
import Common.Visual.Windows.Dialog.DBObjectDialog;
import Common_old.Utils.Utils;
import Common_old.Utils.Validators.PathValidator;
import Common.Database.Objects.DBObject;

6
src/GlobalData/Compiler/UI/CompilerFields.java
View File

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

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

@@ -1,14 +1,13 @@
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.Windows.Dialog.Text.ComboTextDialog;
import Common.Visual.Fonts.VisualiserFonts;
import Common.Visual.Windows.Dialog.Text.ComboTextDialog;
import GlobalData.CompilerEnvironment.CompilerEnvironment;
public class CompilerEnvironmentValueEditor extends DBObjectEditor<CompilerEnvironment> {
@Override
public void Action() {
setFont(Current.getTheme().Fonts.get(VisualiserFonts.Hyperlink));
setFont(CommonUI.getTheme().Fonts.get(VisualiserFonts.Hyperlink));
setText(value.value.isEmpty() ? "не задано" : value.value);
//-
ComboTextDialog dialog = new ComboTextDialog() {

6
src/GlobalData/CompilerEnvironment/UI/CompilerEnvironmentValueRenderer.java
View File

@@ -1,14 +1,14 @@
package GlobalData.CompilerEnvironment.UI;
import Common_old.Current;
import Common.Visual.CommonUI;
import Common_old.UI.Tables.DBObjectRenderer;
import _VisualDVM.Syntax.VisualiserFonts;
import Common.Visual.Fonts.VisualiserFonts;
import GlobalData.CompilerEnvironment.CompilerEnvironment;
public class CompilerEnvironmentValueRenderer extends DBObjectRenderer {
@Override
public void Display() {
if (value != null) {
CompilerEnvironment environment = (CompilerEnvironment) value;
setFont(Current.getTheme().Fonts.get(VisualiserFonts.Hyperlink));
setFont(CommonUI.getTheme().Fonts.get(VisualiserFonts.Hyperlink));
setText(environment.value.isEmpty() ? "не задано" : environment.value);
}
}

2
src/GlobalData/CompilerEnvironment/UI/CompilerEnvironmentsFields.java
View File

@@ -1,5 +1,5 @@
package GlobalData.CompilerEnvironment.UI;
import Common_old.UI.Windows.Dialog.DialogFields;
import Common.Visual.Windows.Dialog.DialogFields;
import javax.swing.*;
import java.awt.*;

8
src/GlobalData/CompilerOption/UI/CompilerOptionParameterNameRenderer.java
View File

@@ -1,7 +1,7 @@
package GlobalData.CompilerOption.UI;
import Common_old.Current;
import Common.Visual.CommonUI;
import Common_old.UI.Tables.DBObjectRenderer;
import _VisualDVM.Syntax.VisualiserFonts;
import Common.Visual.Fonts.VisualiserFonts;
import GlobalData.CompilerOption.CompilerOption;
public class CompilerOptionParameterNameRenderer extends DBObjectRenderer {
@Override
@@ -9,10 +9,10 @@ public class CompilerOptionParameterNameRenderer extends DBObjectRenderer {
if (value != null) {
CompilerOption option = (CompilerOption) value;
if (option.hasParameter()) {
setFont(Current.getTheme().Fonts.get(VisualiserFonts.TreePlain));
setFont(CommonUI.getTheme().Fonts.get(VisualiserFonts.TreePlain));
setText(option.parameterName);
} else {
setFont(Current.getTheme().Fonts.get(VisualiserFonts.UnknownState));
setFont(CommonUI.getTheme().Fonts.get(VisualiserFonts.UnknownState));
setText("нет");
}
}

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

@@ -1,15 +1,14 @@
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.Windows.Dialog.Text.ComboTextDialog;
import Common.Visual.Fonts.VisualiserFonts;
import Common.Visual.Windows.Dialog.Text.ComboTextDialog;
import GlobalData.CompilerOption.CompilerOption;
public class CompilerOptionParameterValueEditor extends DBObjectEditor<CompilerOption> {
@Override
public void Action() {
if (value.hasParameter()) {
setFont(Current.getTheme().Fonts.get(VisualiserFonts.Hyperlink));
setFont(CommonUI.getTheme().Fonts.get(VisualiserFonts.Hyperlink));
//-
setText(value.parameterValue.isEmpty() ? "не задано" : value.parameterValue);
//-
@@ -23,7 +22,7 @@ public class CompilerOptionParameterValueEditor extends DBObjectEditor<CompilerO
setText(value.parameterValue.isEmpty() ? "не задано" : value.parameterValue);
}
} else {
setFont(Current.getTheme().Fonts.get(VisualiserFonts.UnknownState));
setFont(CommonUI.getTheme().Fonts.get(VisualiserFonts.UnknownState));
setText("нет");
}
}

8
src/GlobalData/CompilerOption/UI/CompilerOptionParameterValueRenderer.java
View File

@@ -1,7 +1,7 @@
package GlobalData.CompilerOption.UI;
import Common_old.Current;
import Common.Visual.CommonUI;
import Common_old.UI.Tables.DBObjectRenderer;
import _VisualDVM.Syntax.VisualiserFonts;
import Common.Visual.Fonts.VisualiserFonts;
import GlobalData.CompilerOption.CompilerOption;
public class CompilerOptionParameterValueRenderer extends DBObjectRenderer {
@Override
@@ -9,10 +9,10 @@ public class CompilerOptionParameterValueRenderer extends DBObjectRenderer {
if (value != null) {
CompilerOption option = (CompilerOption) value;
if (option.hasParameter()) {
setFont(Current.getTheme().Fonts.get(VisualiserFonts.Hyperlink));
setFont(CommonUI.getTheme().Fonts.get(VisualiserFonts.Hyperlink));
setText(option.parameterValue.isEmpty() ? "не задано" : option.parameterValue);
} else {
setFont(Current.getTheme().Fonts.get(VisualiserFonts.UnknownState));
setFont(CommonUI.getTheme().Fonts.get(VisualiserFonts.UnknownState));
setText("нет");
}
}

2
src/GlobalData/CompilerOption/UI/CompilerOptionsFields.java
View File

@@ -1,5 +1,5 @@
package GlobalData.CompilerOption.UI;
import Common_old.UI.Windows.Dialog.DialogFields;
import Common.Visual.Windows.Dialog.DialogFields;
import javax.swing.*;
import java.awt.*;

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

@@ -4,7 +4,7 @@ import Common.Visual.CommonUI;
import Common_old.Current;
import Common.Database.Tables.iDBTable;
import Common.Visual.DataSetControlForm;
import Common_old.UI.Windows.Dialog.DBObjectDialog;
import Common.Visual.Windows.Dialog.DBObjectDialog;
import Common_old.Utils.Utils;
import GlobalData.DVMParameter.UI.DVMParameterFields;
import GlobalData.GlobalDatabase;

2
src/GlobalData/DVMParameter/UI/DVMParameterFields.java
View File

@@ -1,7 +1,7 @@
package GlobalData.DVMParameter.UI;
import Common.Visual.Controls.StyledTextComboBox;
import Common_old.UI.TextField.StyledTextField;
import Common_old.UI.Windows.Dialog.DialogFields;
import Common.Visual.Windows.Dialog.DialogFields;
import javax.swing.*;
import java.awt.*;

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

@@ -4,7 +4,7 @@ import Common.Visual.CommonUI;
import Common_old.Current;
import Common.Database.Tables.iDBTable;
import Common.Visual.DataSetControlForm;
import Common_old.UI.Windows.Dialog.DBObjectDialog;
import Common.Visual.Windows.Dialog.DBObjectDialog;
import Common_old.Utils.Utils;
import GlobalData.EnvironmentValue.UI.EnvironmentValueFields;
import GlobalData.GlobalDatabase;

2
src/GlobalData/EnvironmentValue/UI/EnvironmentValueFields.java
View File

@@ -1,6 +1,6 @@
package GlobalData.EnvironmentValue.UI;
import Common_old.UI.TextField.StyledTextField;
import Common_old.UI.Windows.Dialog.DialogFields;
import Common.Visual.Windows.Dialog.DialogFields;
import javax.swing.*;
import java.awt.*;

2
src/GlobalData/FileObject/DirInfosFields.java
View File

@@ -1,5 +1,5 @@
package GlobalData.FileObject;
import Common_old.UI.Windows.Dialog.DialogFields;
import Common.Visual.Windows.Dialog.DialogFields;
import javax.swing.*;
import java.awt.*;

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

@@ -3,7 +3,7 @@ import Common.Visual.CommonUI;
import Common_old.Current;
import Common.Visual.DataSetControlForm;
import Common_old.UI.UI;
import Common_old.UI.Windows.Dialog.DBObjectDialog;
import Common.Visual.Windows.Dialog.DBObjectDialog;
import Common.Database.Objects.DBObject;
import Common.Database.Tables.FKBehaviour;
import Common.Database.Tables.FKCurrentObjectBehaviuor;

2
src/GlobalData/Machine/UI/MachineFields.java
View File

@@ -1,6 +1,6 @@
package GlobalData.Machine.UI;
import Common_old.UI.TextField.StyledTextField;
import Common_old.UI.Windows.Dialog.DialogFields;
import Common.Visual.Windows.Dialog.DialogFields;
import GlobalData.Machine.MachineType;
import javax.swing.*;

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

@@ -1,7 +1,7 @@
package GlobalData.Makefile;
import Common_old.Current;
import Common.Visual.DataSetControlForm;
import Common_old.UI.Windows.Dialog.DBObjectDialog;
import Common.Visual.Windows.Dialog.DBObjectDialog;
import Common.Database.Objects.DBObject;
import Common.Database.Tables.FKBehaviour;
import Common.Database.Tables.FKCurrentObjectBehaviuor;

2
src/GlobalData/Makefile/UI/MakefilePreviewForm.java
View File

@@ -1,6 +1,6 @@
package GlobalData.Makefile.UI;
import Common_old.UI.Editor.Viewer;
import Common_old.UI.Windows.Dialog.Text.TextDialog;
import Common.Visual.Windows.Dialog.Text.TextDialog;
public class MakefilePreviewForm extends TextDialog<Viewer> {
public MakefilePreviewForm() {
super(Viewer.class);

4
src/GlobalData/Module/ModulesDBTable.java
View File

@@ -2,8 +2,8 @@ package GlobalData.Module;
import Common_old.Current;
import Common.Database.Tables.iDBTable;
import Common.Visual.DataSetControlForm;
import Common_old.UI.Windows.Dialog.DBObjectDialog;
import Common_old.UI.Windows.Dialog.DialogFields;
import Common.Visual.Windows.Dialog.DBObjectDialog;
import Common.Visual.Windows.Dialog.DialogFields;
import GlobalData.Module.UI.ModuleAnchestorForm;
public class ModulesDBTable extends iDBTable<Module> {
public ModulesDBTable() {

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

@@ -2,8 +2,7 @@ package GlobalData.Module.UI;
import Common.Visual.CommonUI;
import Common_old.Current;
import Common.Visual.Controls.StyledTextComboBox;
import Common_old.UI.UI;
import Common_old.UI.Windows.Dialog.DialogFields;
import Common.Visual.Windows.Dialog.DialogFields;
import GlobalData.Compiler.Compiler;
import GlobalData.Makefile.Makefile;
import GlobalData.Module.Module;
@@ -33,7 +32,7 @@ public class ModuleAnchestorFields implements DialogFields {
bHelp.addActionListener(e -> {
if (cbCompilers.getSelectedItem() != null) {
Pass_2021.passes.get(PassCode_2021.ShowCompilerHelp).Do(compiler, true);
} else UI.Info("Компилятор не выбран");
} else CommonUI.Info("Компилятор не выбран");
});
BPickOptions.addActionListener(new ActionListener() {
@Override

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

@@ -2,7 +2,7 @@ package GlobalData.Module.UI;
import Common.CommonConstants;
import Common.Visual.CommonUI;
import Common_old.Current;
import Common_old.UI.Windows.Dialog.DBObjectDialog;
import Common.Visual.Windows.Dialog.DBObjectDialog;
import GlobalData.Compiler.Compiler;
import GlobalData.Compiler.CompilerType;
import GlobalData.Makefile.Makefile;

6
src/GlobalData/RemoteFile/UI/RemoteFileChooser.java
View File

@@ -1,9 +1,9 @@
package GlobalData.RemoteFile.UI;
import Common.CurrentAnchestor;
import Common.Utils.CommonUtils;
import Common.Visual.CommonUI;
import Common_old.Current;
import Common_old.UI.UI;
import Common_old.UI.Windows.Dialog.Dialog;
import Common.Visual.Windows.Dialog.Dialog;
import GlobalData.RemoteFile.RemoteFile;
import Visual_DVM_2021.Passes.SSH.ConnectionPass;
import com.jcraft.jsch.ChannelSftp.LsEntry;
@@ -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 CommonUI.Info("Корневая папка файловой системы достигнута.");
}
@Override
public void validateFields() {

2
src/GlobalData/RemoteFile/UI/RemoteFileChooserFields.java
View File

@@ -1,7 +1,7 @@
package GlobalData.RemoteFile.UI;
import Common_old.UI.Trees.TreeForm;
import Common_old.UI.UI;
import Common_old.UI.Windows.Dialog.DialogFields;
import Common.Visual.Windows.Dialog.DialogFields;
import javax.swing.*;
import java.awt.*;

6
src/GlobalData/RemoteFile/UI/RemoteFileRenderer.java
View File

@@ -1,6 +1,6 @@
package GlobalData.RemoteFile.UI;
import Common_old.Current;
import _VisualDVM.Syntax.VisualiserFonts;
import Common.Visual.CommonUI;
import Common.Visual.Fonts.VisualiserFonts;
import Common_old.UI.Trees.StyledTreeCellRenderer;
import GlobalData.RemoteFile.RemoteFile;
@@ -16,7 +16,7 @@ public class RemoteFileRenderer extends StyledTreeCellRenderer {
if (o instanceof RemoteFile) {
RemoteFile file = (RemoteFile) o;
setText(file.name);
setFont(Current.getTheme().Fonts.get(VisualiserFonts.TreePlain));
setFont(CommonUI.getTheme().Fonts.get(VisualiserFonts.TreePlain));
if (file.isDirectory())
setIcon(new ImageIcon(getClass().getResource("/icons/Folder.png")));
}

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

@@ -4,7 +4,7 @@ import Common.Utils.CommonUtils;
import Common.Visual.CommonUI;
import Common_old.Current;
import Common.Visual.DataSetControlForm;
import Common_old.UI.Windows.Dialog.DBObjectDialog;
import Common.Visual.Windows.Dialog.DBObjectDialog;
import Common.Database.Objects.DBObject;
import Common.Database.Tables.FKBehaviour;
import Common.Database.Tables.FKCurrentObjectBehaviuor;

2
src/GlobalData/RunConfiguration/UI/RunConfigurationFields.java
View File

@@ -1,6 +1,6 @@
package GlobalData.RunConfiguration.UI;
import Common_old.UI.TextField.StyledTextField;
import Common_old.UI.Windows.Dialog.DialogFields;
import Common.Visual.Windows.Dialog.DialogFields;
import javax.swing.*;
import java.awt.*;

2
src/GlobalData/SapforProfile/SapforProfilesDBTable.java
View File

@@ -1,7 +1,7 @@
package GlobalData.SapforProfile;
import Common_old.Current;
import Common.Visual.DataSetControlForm;
import Common_old.UI.Windows.Dialog.DBObjectDialog;
import Common.Visual.Windows.Dialog.DBObjectDialog;
import Common.Database.Objects.DBObject;
import Common.Database.Tables.FKBehaviour;
import Common.Database.Tables.FKCurrentObjectBehaviuor;

2
src/GlobalData/SapforProfile/UI/SapforProfileFields.java
View File

@@ -1,6 +1,6 @@
package GlobalData.SapforProfile.UI;
import Common_old.UI.TextField.StyledTextField;
import Common_old.UI.Windows.Dialog.DialogFields;
import Common.Visual.Windows.Dialog.DialogFields;
import javax.swing.*;
import java.awt.*;

2
src/GlobalData/Settings/SettingsDBTable.java
View File

@@ -43,7 +43,7 @@ public class SettingsDBTable extends DBTable<SettingName, DBSetting> {
AddSetting(new DBSetting(SettingName.Kernels, Utils.getHalfKernels(), SettingType.IntField, ComponentType.Visualiser));
AddSetting(new DBSetting(SettingName.AutoBugReportsLoad, 0, SettingType.SapforFlag, ComponentType.Visualiser, true));
AddSetting(new DBSetting(SettingName.AutoTestsLoad, 0, SettingType.SapforFlag, ComponentType.Visualiser, true));
if (CommonUtils.isWindows)
if (CommonUtils.isWindows())
AddSetting(new DBSetting(SettingName.LocalMakePathWindows, "C:\\MinGW\\msys\\1.0\\bin\\make.exe", SettingType.StringField, ComponentType.Visualiser));
AddSetting(new DBSetting(SettingName.SmallScreen, 0, SettingType.SapforFlag, ComponentType.Visualiser));
//совместимость. указываем явно чтобы не были видны в меню.

2
src/GlobalData/Tasks/Supervisor/Local/LocalTaskSupervisor.java
View File

@@ -44,7 +44,7 @@ public abstract class LocalTaskSupervisor<T extends Task> extends TaskSupervisor
return Paths.get(task.getUser().getLocalProjectsDir().getAbsolutePath(), project.getUniqKey()).toFile();
}
protected File getBinary() {
return Paths.get(getProjectCopy().getAbsolutePath(), "0" + (CommonUtils.isWindows ? ".exe" : "")).toFile();
return Paths.get(getProjectCopy().getAbsolutePath(), "0" + (CommonUtils.isWindows() ? ".exe" : "")).toFile();
}
protected File getProjectOutput() {
return Paths.get(getProjectCopy().getAbsolutePath(), Constants.out_file).toFile();

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

@@ -1,6 +1,6 @@
package GlobalData.Tasks;
import Common.Visual.StatusEnum;
import _VisualDVM.Syntax.VisualiserFonts;
import Common.Visual.Fonts.VisualiserFonts;
public enum TaskState implements StatusEnum {
Inactive,
//--

2
src/GlobalData/User/UI/UserFields.java
View File

@@ -3,7 +3,7 @@ import Common.Utils.CommonUtils;
import Common_old.UI.Menus.TextEditorMenu;
import Common_old.UI.TextField.StyledPasswordField;
import Common_old.UI.TextField.StyledTextField;
import Common_old.UI.Windows.Dialog.DialogFields;
import Common.Visual.Windows.Dialog.DialogFields;
import javax.swing.*;
import java.awt.*;

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

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

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

@@ -3,7 +3,7 @@ import Common_old.Current;
import Common.Visual.DataSetControlForm;
import Common_old.UI.Tables.TableRenderers;
import Common_old.UI.UI;
import Common_old.UI.Windows.Dialog.DBObjectDialog;
import Common.Visual.Windows.Dialog.DBObjectDialog;
import Common.Database.Objects.DBObject;
import Common.Database.Tables.FKBehaviour;
import Common.Database.Tables.FKCurrentObjectBehaviuor;