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

fix

Browse Source
This commit is contained in:
02090095
2025-03-04 03:30:39 +03:00
parent 0e2d2abb84
commit b79b33e232
7 changed files with 20 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
.idea/workspace.xml generated
View File

@@ -7,7 +7,12 @@
</component>
<component name="ChangeListManager">
<list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/CompilerOption/OptionsLine.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/CompilerOption/OptionsLine.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/CompilerOption/UI/OptionsLinesForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/CompilerOption/UI/OptionsLinesForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMSettings/DVMSettings.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMSettings/DVMSettings.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMSettings/UI/DVMSettingsDialog.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMSettings/UI/DVMSettingsDialog.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMSettings/UI/DVMSettingsFields.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMSettings/UI/DVMSettingsFields.java" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />

3
src/_VisualDVM/GlobalData/CompilerOption/OptionsLine.java
View File

@@ -1,5 +1,6 @@
package _VisualDVM.GlobalData.CompilerOption;
import Common.Database.Objects.iDBObject;
import Common.Utils.Utils_;
import _VisualDVM.GlobalData.CompilerOption.Json.OptionsJson;
public class OptionsLine extends iDBObject {
public OptionsJson json;
@@ -8,6 +9,6 @@ public class OptionsLine extends iDBObject {
}
@Override
public String getBDialogName() {
return json.toLine();
return Utils_.Brackets(json.toLine());
}
}

3
src/_VisualDVM/GlobalData/CompilerOption/UI/OptionsLinesForm.java
View File

@@ -1,6 +1,7 @@
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;
@@ -94,6 +95,7 @@ public class OptionsLinesForm extends DataSetControlForm<OptionsLine> {
}
@Override
protected void body() throws Exception {
}
@Override
protected void showFinish() throws Exception {
@@ -115,6 +117,7 @@ public class OptionsLinesForm extends DataSetControlForm<OptionsLine> {
}
@Override
protected boolean canStart(Object... args) throws Exception {
System.out.println("datasource");
if (dataSource.getUI().CheckCurrent(Log)) {
target = dataSource.getUI().getCurrent();
return dataSource.getUI().ShowDeleteObjectDialog(target);

7
src/_VisualDVM/TestingSystem/DVM/DVMSettings/DVMSettings.java
View File

@@ -17,10 +17,8 @@ public class DVMSettings extends Settings {
public int max_dim_proc_count = 4;
//--
@Description("DEFAULT ''")
public String packedCompilationOptionsJson=""; //вывести (?)
@Description("DEFAULT ''")
public String packedCompilationOptionsSetsJson="";
//--
public String packedCompilationOptionsJson="";
public DVMSettings() {
}
public DVMSettings(DVMSettings src) {
@@ -34,7 +32,6 @@ public class DVMSettings extends Settings {
Is_DVM_STAT = c.Is_DVM_STAT;
// usr_par=c.usr_par;
packedCompilationOptionsJson= ((DVMSettings) src).packedCompilationOptionsJson;
packedCompilationOptionsSetsJson = ((DVMSettings)src).packedCompilationOptionsSetsJson;
//-
cube = c.cube;
max_proc_count = c.max_proc_count;

5
src/_VisualDVM/TestingSystem/DVM/DVMSettings/UI/DVMSettingsDialog.java
View File

@@ -29,9 +29,6 @@ public class DVMSettingsDialog extends DBObjectDialog<DVMSettings, DVMSettingsFi
public void fillFields() {
fields.tfName.setText(Result.description);
//------->>>
// fields.tfFlags.setText(Result.flags);
// fields.tfEnvironments.setText(Result.environments);
//------->>>
fields.sMinDimProc.setValue(Result.min_dim_proc_count);
fields.sMaxDimProc.setValue(Result.max_dim_proc_count);
fields.cbCube.setSelected(Result.cube == 1);
@@ -48,8 +45,6 @@ public class DVMSettingsDialog extends DBObjectDialog<DVMSettings, DVMSettingsFi
Result.max_dim_proc_count = (int) fields.sMaxDimProc.getValue();
Result.cube = fields.cbCube.isSelected() ? 1 : 0;
Result.max_proc_count = (int) fields.sMaxProc.getValue();
// Result.flags = fields.tfFlags.getText();
// Result.environments = fields.tfEnvironments.getText();
Result.Is_DVM_STAT = fields.cbDvmStat.isSelected() ? 1 : 0;
//--
Result.packedCompilationOptionsJson = Utils_.gson.toJson(fields.optionsLines.toJson());

8
src/_VisualDVM/TestingSystem/DVM/DVMSettings/UI/DVMSettingsFields.java
View File

@@ -1,5 +1,6 @@
package _VisualDVM.TestingSystem.DVM.DVMSettings.UI;
import Common.Database.Objects.DBObject;
import Common.MainModule_;
import Common.Passes.Pass;
import Common.Utils.Utils_;
import Common.Visual.TextField.StyledTextField;
@@ -35,7 +36,7 @@ public class DVMSettingsFields implements DialogFields {
public OptionsLinesSet optionsLines;
//
public void fillOptionsLines(String packed) {
optionsLines = new OptionsLinesSet(); //нужен для отображения таблицы, как дб объекты с ключами
optionsLines =new OptionsLinesSet();
OptionsSetJson optionsSetJson = packed.isEmpty() ? new OptionsSetJson() : Utils_.gson.fromJson(packed, OptionsSetJson.class);
for (OptionsJson optionsJson: optionsSetJson.values) {
OptionsLine optionsLine =new OptionsLine(optionsJson);
@@ -43,6 +44,11 @@ public class DVMSettingsFields implements DialogFields {
optionsLines.put(optionsLine.id, optionsLine);
}
//-
//-Это нужно для того, чтобы старый меню бар был пересоздан. бары создаются один раз в целях экономии памяти.
// В противном случае бар его проходы добавления редактирования и удаления
// привязаны к старому источнику данных и возникает БАГ!!!
if (MainModule_.instance.getUI().menuBars.containsKey(OptionsLinesSet.class))
MainModule_.instance.getUI().menuBars.remove(OptionsLinesSet.class);
optionsLines.mountUI(optionsLinesPanel);
optionsLines.ShowUI();
}

2
src/_VisualDVM/Validators/DVMHelpParser.java
View File

@@ -21,7 +21,7 @@ public class DVMHelpParser {
//-
public static Compiler compiler = null;
public static String[] banned_options = new String[]{
// "-o", todo убрать
"-o",
"-c",
"-f90",
"-FI"