no message

This commit is contained in:
2025-03-13 00:32:20 +03:00
parent 91e40c4393
commit 1d97048de1
204 changed files with 984 additions and 889 deletions

View File

@@ -1,12 +1,10 @@
package _VisualDVM.GlobalData.CompilerEnvironment;
import Common.Database.Objects.iDBObject;
import Common.Utils.Utils_;
import _VisualDVM.GlobalData.CompilerEnvironment.Json.EnvironmentJson;
import _VisualDVM.GlobalData.CompilerEnvironment.Json.EnvironmentsJson;
import _VisualDVM.GlobalData.CompilerOption.Json.OptionsJson;
public class EnvironmentsLine extends iDBObject {
public EnvironmentsJson json;
public EnvironmentsLine(EnvironmentsJson json_in){
public EnvironmentsLine(EnvironmentsJson json_in) {
json = json_in;
}
@Override

View File

@@ -4,7 +4,6 @@ import Common.Visual.DataSetControlForm;
import _VisualDVM.GlobalData.CompilerEnvironment.Json.EnvironmentsJson;
import _VisualDVM.GlobalData.CompilerEnvironment.Json.EnvironmentsSetJson;
import _VisualDVM.GlobalData.CompilerEnvironment.UI.EnvironmentsLinesForm;
import _VisualDVM.GlobalData.CompilerOption.OptionsLine;
import javax.swing.*;
public class EnvironmentsLinesSet extends DataSet<Integer, EnvironmentsLine> {
@@ -14,8 +13,8 @@ public class EnvironmentsLinesSet extends DataSet<Integer, EnvironmentsLine> {
}
public EnvironmentsLinesSet(EnvironmentsSetJson json) {
super(Integer.class, EnvironmentsLine.class);
for (EnvironmentsJson environmentsJson: json.values) {
EnvironmentsLine environmentsLine =new EnvironmentsLine(environmentsJson);
for (EnvironmentsJson environmentsJson : json.values) {
EnvironmentsLine environmentsLine = new EnvironmentsLine(environmentsJson);
environmentsLine.id = maxId++;
put(environmentsLine.id, environmentsLine);
}
@@ -30,11 +29,11 @@ public class EnvironmentsLinesSet extends DataSet<Integer, EnvironmentsLine> {
}
@Override
protected DataSetControlForm createUI(JPanel mountPanel) {
return new EnvironmentsLinesForm(this,mountPanel);
return new EnvironmentsLinesForm(this, mountPanel);
}
public EnvironmentsSetJson toJson(){
EnvironmentsSetJson res= new EnvironmentsSetJson();
for (EnvironmentsLine environmentsLine: Data.values()){
public EnvironmentsSetJson toJson() {
EnvironmentsSetJson res = new EnvironmentsSetJson();
for (EnvironmentsLine environmentsLine : Data.values()) {
res.values.add(environmentsLine.json);
}
return res;

View File

@@ -1,14 +1,13 @@
package _VisualDVM.GlobalData.CompilerEnvironment.Json;
import _VisualDVM.GlobalData.CompilerEnvironment.CompilerEnvironment;
import _VisualDVM.GlobalData.CompilerOption.CompilerOption;
import com.google.gson.annotations.Expose;
public class EnvironmentJson {
@Expose
public String name; //в том числе и с разделителем если есть. поиск по startswith
@Expose
public String value; //значение без кавычек
public EnvironmentJson(CompilerEnvironment src){
name= src.name;
public EnvironmentJson(CompilerEnvironment src) {
name = src.name;
value = src.value;
}
}

View File

@@ -1,6 +1,5 @@
package _VisualDVM.GlobalData.CompilerEnvironment.Json;
import Common.Utils.Utils_;
import _VisualDVM.GlobalData.CompilerOption.Json.OptionJson;
import com.google.gson.annotations.Expose;
import java.util.List;
@@ -8,10 +7,10 @@ import java.util.Vector;
public class EnvironmentsJson {
@Expose
public List<EnvironmentJson> values = new Vector<>();
public String toLine(){
public String toLine() {
Vector<String> res = new Vector<>();
for (EnvironmentJson environmentJson: values){
res.add(environmentJson.name+"="+Utils_.DQuotes(environmentJson.value));
for (EnvironmentJson environmentJson : values) {
res.add(environmentJson.name + "=" + Utils_.DQuotes(environmentJson.value));
}
return String.join(" ", res);
}

View File

@@ -1,5 +1,4 @@
package _VisualDVM.GlobalData.CompilerEnvironment.Json;
import _VisualDVM.GlobalData.CompilerOption.Json.OptionsJson;
import com.google.gson.annotations.Expose;
import java.util.List;

View File

@@ -4,9 +4,6 @@ import Common.Visual.DataSetControlForm;
import _VisualDVM.GlobalData.CompilerEnvironment.Json.EnvironmentJson;
import _VisualDVM.GlobalData.CompilerEnvironment.Json.EnvironmentsJson;
import _VisualDVM.GlobalData.CompilerEnvironment.UI.CompilerEnvironmentsForm;
import _VisualDVM.GlobalData.CompilerOption.CompilerOption;
import _VisualDVM.GlobalData.CompilerOption.Json.OptionJson;
import _VisualDVM.GlobalData.EnvironmentValue.EnvironmentValue;
import javax.swing.*;
public class RawCompilerEnvironmentsSet extends DataSet<String, CompilerEnvironment> {
@@ -25,23 +22,23 @@ public class RawCompilerEnvironmentsSet extends DataSet<String, CompilerEnvironm
public String getSingleDescription() {
return "переменная окружения";
}
public CompilerEnvironment findByJson(EnvironmentJson json){
for (CompilerEnvironment compilerEnvironment: Data.values()){
public CompilerEnvironment findByJson(EnvironmentJson json) {
for (CompilerEnvironment compilerEnvironment : Data.values()) {
if (json.name.equals(compilerEnvironment.name))
return compilerEnvironment;
}
return null;
}
public void Reset() {
for (CompilerEnvironment environment: Data.values()){
for (CompilerEnvironment environment : Data.values()) {
environment.select(false);
environment.value="";
environment.value = "";
}
}
public void Synchronize(EnvironmentsJson json) {
for (EnvironmentJson environmentJson: json.values){
for (EnvironmentJson environmentJson : json.values) {
CompilerEnvironment compilerEnvironment = findByJson(environmentJson);
if (compilerEnvironment!=null){
if (compilerEnvironment != null) {
compilerEnvironment.select(true);
compilerEnvironment.value = environmentJson.value;
}

View File

@@ -8,9 +8,6 @@ import _VisualDVM.Global;
import _VisualDVM.GlobalData.CompilerEnvironment.EnvironmentsLine;
import _VisualDVM.GlobalData.CompilerEnvironment.EnvironmentsLinesSet;
import _VisualDVM.GlobalData.CompilerEnvironment.Json.EnvironmentsJson;
import _VisualDVM.GlobalData.CompilerOption.Json.OptionsJson;
import _VisualDVM.GlobalData.CompilerOption.OptionsLine;
import _VisualDVM.GlobalData.CompilerOption.OptionsLinesSet;
import _VisualDVM.Passes.PassCode;
import javax.swing.*;
@@ -18,7 +15,6 @@ public class EnvironmentsLinesForm extends DataSetControlForm<EnvironmentsLine>
public EnvironmentsLinesForm(DataSet<?, EnvironmentsLine> dataSource_in, JPanel mountPanel_in) {
super(dataSource_in, mountPanel_in);
}
@Override
protected boolean hasCheckBox() {
return false;
@@ -40,7 +36,7 @@ public class EnvironmentsLinesForm extends DataSetControlForm<EnvironmentsLine>
protected DataMenuBar createMenuBar() {
DataMenuBar res = super.createMenuBar();
res.addPasses(
new Pass<EnvironmentsLine>(){
new Pass<EnvironmentsLine>() {
@Override
public String getIconPath() {
return "/Common/icons/RedAdd.png";
@@ -56,9 +52,9 @@ public class EnvironmentsLinesForm extends DataSetControlForm<EnvironmentsLine>
@Override
protected boolean canStart(Object... args) throws Exception {
Pass pass = Global.mainModule.getPass(PassCode.PickCompilerEnvironmentsForTesting);
if (pass.Do(Global.mainModule.getDb().compilers.getUI().getCurrent())){
target= new EnvironmentsLine((EnvironmentsJson) pass.target);
target.id = ((EnvironmentsLinesSet)dataSource).maxId++;
if (pass.Do(Global.mainModule.getDb().compilers.getUI().getCurrent())) {
target = new EnvironmentsLine((EnvironmentsJson) pass.target);
target.id = ((EnvironmentsLinesSet) dataSource).maxId++;
return true;
}
return false;
@@ -72,7 +68,7 @@ public class EnvironmentsLinesForm extends DataSetControlForm<EnvironmentsLine>
dataSource.ShowUI(target.getPK());
}
},
new Pass<EnvironmentsLine>(){
new Pass<EnvironmentsLine>() {
@Override
public String getIconPath() {
return "/Common/icons/Edit.png";
@@ -90,7 +86,7 @@ public class EnvironmentsLinesForm extends DataSetControlForm<EnvironmentsLine>
if (dataSource.getUI().CheckCurrent(Log)) {
target = dataSource.getUI().getCurrent();
Pass pass = Global.mainModule.getPass(PassCode.PickCompilerEnvironmentsForTesting);
if (pass.Do(Global.mainModule.getDb().compilers.getUI().getCurrent(), target.json)){
if (pass.Do(Global.mainModule.getDb().compilers.getUI().getCurrent(), target.json)) {
return true;
}
}
@@ -98,14 +94,13 @@ public class EnvironmentsLinesForm extends DataSetControlForm<EnvironmentsLine>
}
@Override
protected void body() throws Exception {
}
@Override
protected void showFinish() throws Exception {
dataSource.ShowUI(target.getPK());
}
},
new Pass<EnvironmentsLine>(){
new Pass<EnvironmentsLine>() {
@Override
public String getIconPath() {
return "/Common/icons/Delete.png";

View File

@@ -1,7 +1,6 @@
package _VisualDVM.GlobalData.CompilerOption;
import Common.Database.Objects.DBObject;
import Common.Utils.Utils_;
import com.sun.org.glassfish.gmbal.Description;
import java.util.Arrays;
import java.util.Vector;

View File

@@ -6,8 +6,8 @@ public class OptionJson {
public String name; //в том числе и с разделителем если есть. поиск по startswith
@Expose
public String value; //значение без кавычек
public OptionJson(CompilerOption src){
name= src.name+src.parameterSeparator;
public OptionJson(CompilerOption src) {
name = src.name + src.parameterSeparator;
value = src.parameterValue;
}
}

View File

@@ -7,12 +7,11 @@ import java.util.Vector;
public class OptionsJson {
@Expose
public List<OptionJson> values = new Vector<>();
public String toLine(){
public String toLine() {
Vector<String> res = new Vector<>();
for (OptionJson optionJson: values){
res.add(optionJson.name+
(optionJson.value.contains(" ")? Utils_.DQuotes(optionJson.value): optionJson.value));
for (OptionJson optionJson : values) {
res.add(optionJson.name +
(optionJson.value.contains(" ") ? Utils_.DQuotes(optionJson.value) : optionJson.value));
}
return String.join(" ", res);
}

View File

@@ -6,6 +6,6 @@ import java.util.Vector;
public class OptionsSetJson {
@Expose
public List<OptionsJson> values = new Vector<>();
public OptionsSetJson(){
public OptionsSetJson() {
}
}

View File

@@ -4,7 +4,7 @@ import Common.Utils.Utils_;
import _VisualDVM.GlobalData.CompilerOption.Json.OptionsJson;
public class OptionsLine extends iDBObject {
public OptionsJson json;
public OptionsLine(OptionsJson json_in){
public OptionsLine(OptionsJson json_in) {
json = json_in;
}
@Override

View File

@@ -11,10 +11,10 @@ public class OptionsLinesSet extends DataSet<Integer, OptionsLine> {
public OptionsLinesSet() {
super(Integer.class, OptionsLine.class);
}
public OptionsLinesSet(OptionsSetJson json){
public OptionsLinesSet(OptionsSetJson json) {
super(Integer.class, OptionsLine.class);
for (OptionsJson optionsJson: json.values) {
OptionsLine optionsLine =new OptionsLine(optionsJson);
for (OptionsJson optionsJson : json.values) {
OptionsLine optionsLine = new OptionsLine(optionsJson);
optionsLine.id = maxId++;
put(optionsLine.id, optionsLine);
}
@@ -29,11 +29,11 @@ public class OptionsLinesSet extends DataSet<Integer, OptionsLine> {
}
@Override
protected DataSetControlForm createUI(JPanel mountPanel) {
return new OptionsLinesForm(this,mountPanel);
return new OptionsLinesForm(this, mountPanel);
}
public OptionsSetJson toJson(){
OptionsSetJson res= new OptionsSetJson();
for (OptionsLine optionsLine: Data.values()){
public OptionsSetJson toJson() {
OptionsSetJson res = new OptionsSetJson();
for (OptionsLine optionsLine : Data.values()) {
res.values.add(optionsLine.json);
}
return res;

View File

@@ -23,24 +23,24 @@ public class RawCompilerOptionsSet extends DataSet<String, CompilerOption> {
public String getSingleDescription() {
return "опция компиляции";
}
public CompilerOption findByJson(OptionJson json){
for (CompilerOption compilerOption: Data.values()){
if (json.name.equals(compilerOption.name+compilerOption.parameterSeparator))
public CompilerOption findByJson(OptionJson json) {
for (CompilerOption compilerOption : Data.values()) {
if (json.name.equals(compilerOption.name + compilerOption.parameterSeparator))
return compilerOption;
}
return null;
}
public void Reset(){
for (CompilerOption option: Data.values()){
public void Reset() {
for (CompilerOption option : Data.values()) {
option.select(false);
option.parameterValue="";
option.parameterValue = "";
}
}
public void Synchronize(OptionsJson json){
for (OptionJson option_json: json.values){
public void Synchronize(OptionsJson json) {
for (OptionJson option_json : json.values) {
// найти опцию по началу
CompilerOption compilerOption = findByJson(option_json);
if (compilerOption!=null){
if (compilerOption != null) {
compilerOption.select(true);
compilerOption.parameterValue = option_json.value;
}

View File

@@ -1,7 +1,5 @@
package _VisualDVM.GlobalData.CompilerOption.UI;
import Common.Database.Tables.DataSet;
import Common.Passes.Pass;
import Common.Utils.Utils_;
import Common.Visual.DataSetControlForm;
import Common.Visual.Menus.DataMenuBar;
import Common.Visual.Tables.ColumnInfo;
@@ -37,7 +35,7 @@ public class OptionsLinesForm extends DataSetControlForm<OptionsLine> {
protected DataMenuBar createMenuBar() {
DataMenuBar res = super.createMenuBar();
res.addPasses(
new Pass<OptionsLine>(){
new Pass<OptionsLine>() {
@Override
public String getIconPath() {
return "/Common/icons/RedAdd.png";
@@ -53,9 +51,9 @@ public class OptionsLinesForm extends DataSetControlForm<OptionsLine> {
@Override
protected boolean canStart(Object... args) throws Exception {
Pass pass = Global.mainModule.getPass(PassCode.PickCompilerOptions);
if (pass.Do(Global.mainModule.getDb().compilers.getUI().getCurrent())){
target= new OptionsLine((OptionsJson) pass.target);
target.id = ((OptionsLinesSet)dataSource).maxId++;
if (pass.Do(Global.mainModule.getDb().compilers.getUI().getCurrent())) {
target = new OptionsLine((OptionsJson) pass.target);
target.id = ((OptionsLinesSet) dataSource).maxId++;
return true;
}
return false;
@@ -69,7 +67,7 @@ public class OptionsLinesForm extends DataSetControlForm<OptionsLine> {
dataSource.ShowUI(target.getPK());
}
},
new Pass<OptionsLine>(){
new Pass<OptionsLine>() {
@Override
public String getIconPath() {
return "/Common/icons/Edit.png";
@@ -87,7 +85,7 @@ public class OptionsLinesForm extends DataSetControlForm<OptionsLine> {
if (dataSource.getUI().CheckCurrent(Log)) {
target = dataSource.getUI().getCurrent();
Pass pass = Global.mainModule.getPass(PassCode.PickCompilerOptions);
if (pass.Do(Global.mainModule.getDb().compilers.getUI().getCurrent(), target.json)){
if (pass.Do(Global.mainModule.getDb().compilers.getUI().getCurrent(), target.json)) {
return true;
}
}
@@ -95,14 +93,13 @@ public class OptionsLinesForm extends DataSetControlForm<OptionsLine> {
}
@Override
protected void body() throws Exception {
}
@Override
protected void showFinish() throws Exception {
dataSource.ShowUI(target.getPK());
}
},
new Pass<OptionsLine>(){
new Pass<OptionsLine>() {
@Override
public String getIconPath() {
return "/Common/icons/Delete.png";

View File

@@ -2,7 +2,6 @@ package _VisualDVM.GlobalData;
import Common.CommonConstants;
import Common.Database.VisualiserDatabase;
import Common.MainModule_;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.Compiler.Compiler;
import _VisualDVM.GlobalData.Compiler.CompilersDBTable;
@@ -98,7 +97,6 @@ public class GlobalDatabase extends VisualiserDatabase {
//--
//проверить, есть ли профиль с таким же набором настроек.
public SapforProfile checkProfileForCurrentSettings() {
LinkedHashMap<String, String> current_values = Global.mainModule.getProject().sapforProperties.toMap();
for (SapforProfile profile : sapforProfiles.Data.values()) {
//--получить все настройки профиля
@@ -152,9 +150,9 @@ public class GlobalDatabase extends VisualiserDatabase {
Insert(profile);
insertProfileSettings(profile);
}
public SapforProfile getDefaultSapforProfile(){
for (SapforProfile sapforProfile: sapforProfiles.Data.values()){
if (sapforProfile.isAuto!=0)
public SapforProfile getDefaultSapforProfile() {
for (SapforProfile sapforProfile : sapforProfiles.Data.values()) {
if (sapforProfile.isAuto != 0)
return sapforProfile;
}
return null;

View File

@@ -33,8 +33,8 @@ public class MachineFields implements DialogFields {
//-
cbMachineType = new JComboBox<>();
cbMachineType.addItem(MachineType.Server);
// cbMachineType.addItem(MachineType.MVS_cluster);
// cbMachineType.addItem(MachineType.Local);
// cbMachineType.addItem(MachineType.MVS_cluster);
// cbMachineType.addItem(MachineType.Local);
}
@Override
public Component getContent() {

View File

@@ -24,7 +24,7 @@ public class MachinesForm extends DataSetControlForm<Machine> {
return object.name;
}
},
new ColumnInfo<Machine>("URL") {
new ColumnInfo<Machine>("URL") {
@Override
public Object getFieldAt(Machine object) {
return object.getURL();

View File

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

View File

@@ -42,7 +42,7 @@ public class ModuleAnchestorFields implements DialogFields {
public void actionPerformed(ActionEvent e) {
Pass pass = Global.mainModule.getPass(PassCode.PickCompilerOptions);
if (pass.Do(compiler)) {
UI.TrySelect(cbFlags, ((OptionsJson)pass.target).toLine());
UI.TrySelect(cbFlags, ((OptionsJson) pass.target).toLine());
}
}
});
@@ -60,7 +60,7 @@ public class ModuleAnchestorFields implements DialogFields {
((Module) target).language;
cbCompilers.addActionListener(e -> {
if (cbCompilers.getSelectedItem() instanceof Compiler) {
Compiler compiler = ((Compiler) cbCompilers.getSelectedItem());
Compiler compiler = ((Compiler) cbCompilers.getSelectedItem());
UI.TrySelect(cbCommands,
linker ? compiler.getSpecialLinkCommand(languageName) : compiler.getSpecialCompilationCommand(languageName));
}

View File

@@ -45,8 +45,8 @@ public abstract class LinuxLocalTaskSupervisor<T extends Task> extends LocalTask
@Override
public void WaitForTask() throws Exception {
if (isTaskActive()) {
// if (task.PID.isEmpty())
// throw new PassException("Ошибка при старте : идентификатор задачи не определен.");
// if (task.PID.isEmpty())
// throw new PassException("Ошибка при старте : идентификатор задачи не определен.");
task.StartDate = (new Date()).getTime();
pass.ShowMessage1("Задача активна, идентификатор " + Utils_.Brackets(task.PID));
RefreshProgress();

View File

@@ -18,7 +18,7 @@ public class ServerRunSupervisor extends RemoteTaskSupervisor<RunTask> {
String env = String.join(" ", MainModule_.instance.getDb().getTable(RunConfiguration.class).getUI().getCurrent().getEnvList());
if (!env.isEmpty()) res = env + " " + res;
//--
// task.PID =
// task.PID =
pass.user.connection.startShellProcess(getRemoteProject(), "PID", res);
task.state = TaskState.Running;
}

View File

@@ -113,8 +113,8 @@ public abstract class TaskSupervisor<T extends Task, P extends Pass> {
}
public void WaitForTask() throws Exception {
if (isTaskActive()) {
// if (task.PID.isEmpty())
// throw new PassException("Ошибка при старте : идентификатор задачи не определен.");
// if (task.PID.isEmpty())
// throw new PassException("Ошибка при старте : идентификатор задачи не определен.");
task.StartDate = (new Date()).getTime();
pass.ShowMessage1("Задача активна");//, идентификатор " + Utils_.Brackets(task.PID));
RefreshProgress();

View File

@@ -48,7 +48,7 @@ public class UsersForm extends DataSetControlForm<User> {
protected void ShowNoCurrentObject() throws Exception {
super.ShowNoCurrentObject();
Global.mainModule.getUI().mainMenuBar.ShowNoUser();
// Global.mainModule.getUI().getCredentialsMenuBar().ShowNoUser();
// Global.mainModule.getUI().getCredentialsMenuBar().ShowNoUser();
}
@Override
public PassCode_ getDeletePassCode() {