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-11 00:00:30 +03:00
parent a11b7711f7
commit f317ab1aa1
341 changed files with 1866 additions and 1688 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/_VisualDVM/GlobalData/Module/Module.java
View File

@@ -1,6 +1,6 @@
package _VisualDVM.GlobalData.Module;
import Common.CommonConstants;
import Common.Utils.CommonUtils;
import Common.Utils.Utils_;
import _VisualDVM.Current;
import _VisualDVM.GlobalData.Makefile.Makefile;
import _VisualDVM.ProjectData.LanguageName;
@@ -29,9 +29,9 @@ public class Module extends ModuleAnchestor {
public void Select(boolean flag) {
on = flag ? 1 : 0;
try {
CommonUtils.db.Update(this);
Utils_.db.Update(this);
} catch (Exception e) {
CommonUtils.MainLog.PrintException(e);
Utils_.MainLog.PrintException(e);
}
}
}

10
src/_VisualDVM/GlobalData/Module/ModuleAnchestor.java
View File

@@ -1,6 +1,6 @@
package _VisualDVM.GlobalData.Module;
import Common.CommonConstants;
import Common.Utils.CommonUtils;
import Common.Utils.Utils_;
import Common.Database.Objects.iDBObject;
import _VisualDVM.GlobalData.Compiler.Compiler;
public class ModuleAnchestor extends iDBObject {
@@ -16,16 +16,16 @@ public class ModuleAnchestor extends iDBObject {
return ((compiler = getCompiler()) == null) ? "" : compiler.getDescription();
}
public Compiler getCompiler() {
return CommonUtils.db.getById(Compiler.class, compiler_id);
return Utils_.db.getById(Compiler.class, compiler_id);
}
public String getDescription() {
String res = "";
if (getCompiler() != null) {
res += CommonUtils.Brackets(getCompiler().getDescription());
res += Utils_.Brackets(getCompiler().getDescription());
if (!command.isEmpty())
res += " " + CommonUtils.Brackets(command);
res += " " + Utils_.Brackets(command);
if (!flags.isEmpty())
res += " " + CommonUtils.Brackets(flags);
res += " " + Utils_.Brackets(flags);
}
return res;
}

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

@@ -1,5 +1,5 @@
package _VisualDVM.GlobalData.Module.UI;
import Common.Visual.CommonUI;
import Common.Visual.UI_;
import _VisualDVM.Current;
import Common.Visual.Controls.StyledTextComboBox;
import Common.Visual.Windows.Dialog.DialogFields;
@@ -32,14 +32,14 @@ public class ModuleAnchestorFields implements DialogFields {
bHelp.addActionListener(e -> {
if (cbCompilers.getSelectedItem() != null) {
Pass.passes.get(PassCode.ShowCompilerHelp).Do(compiler, true);
} else CommonUI.Info("Компилятор не выбран");
} else UI_.Info("Компилятор не выбран");
});
BPickOptions.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
Pass<String> pass = Pass.passes.get(PassCode.PickCompilerOptions);
if (pass.Do(compiler)) {
CommonUI.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());
CommonUI.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.CommonUI;
import Common.Visual.UI_;
import _VisualDVM.Current;
import Common.Visual.Windows.Dialog.DBObjectDialog;
import _VisualDVM.GlobalData.Compiler.Compiler;
@@ -93,9 +93,9 @@ public class ModuleAnchestorForm<T extends ModuleAnchestor> extends DBObjectDial
}
@Override
public void fillFields() {
CommonUI.TrySelect(fields.cbFlags, Result.flags);
CommonUI.TrySelect(fields.cbCommands, Result.command);
CommonUI.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);
}