no message
This commit is contained in:
5
.idea/workspace.xml
generated
5
.idea/workspace.xml
generated
@@ -7,9 +7,10 @@
|
|||||||
</component>
|
</component>
|
||||||
<component name="ChangeListManager">
|
<component name="ChangeListManager">
|
||||||
<list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
|
<list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
|
||||||
|
<change afterPath="$PROJECT_DIR$/src/_VisualDVM/ServerObjectsCache/DVMSettingsCache.java" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/src/Common/Visual/Windows/Dialog/Text/ComboTextDialog.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Windows/Dialog/Text/ComboTextDialog.java" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ServerObjectsCache/VisualCaches.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ServerObjectsCache/VisualCaches.java" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMSettings/UI/DVMSettingsFields.form" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMSettings/UI/DVMSettingsFields.form" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMSettings/UI/DVMSettingsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMSettings/UI/DVMSettingsForm.java" afterDir="false" />
|
||||||
</list>
|
</list>
|
||||||
<option name="SHOW_DIALOG" value="false" />
|
<option name="SHOW_DIALOG" value="false" />
|
||||||
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
||||||
|
|||||||
@@ -23,8 +23,8 @@ public class TableMenu extends StyledPopupMenu {
|
|||||||
//
|
//
|
||||||
add(value_scroll= new JScrollPane(value_view = new JTextArea()));
|
add(value_scroll= new JScrollPane(value_view = new JTextArea()));
|
||||||
value_view.setEditable(false);
|
value_view.setEditable(false);
|
||||||
value_view.setLineWrap(true);
|
//value_view.setLineWrap(true);
|
||||||
value_view.setWrapStyleWord(true);
|
//value_view.setWrapStyleWord(true);
|
||||||
}
|
}
|
||||||
@Override
|
@Override
|
||||||
public void CheckElementsVisibility() {
|
public void CheckElementsVisibility() {
|
||||||
|
|||||||
40
src/_VisualDVM/ServerObjectsCache/DVMSettingsCache.java
Normal file
40
src/_VisualDVM/ServerObjectsCache/DVMSettingsCache.java
Normal file
@@ -0,0 +1,40 @@
|
|||||||
|
package _VisualDVM.ServerObjectsCache;
|
||||||
|
import Common.Utils.Utils_;
|
||||||
|
import _VisualDVM.GlobalData.CompilerEnvironment.Json.EnvironmentsJson;
|
||||||
|
import _VisualDVM.GlobalData.CompilerEnvironment.Json.EnvironmentsSetJson;
|
||||||
|
import _VisualDVM.GlobalData.CompilerOption.Json.OptionsJson;
|
||||||
|
import _VisualDVM.GlobalData.CompilerOption.Json.OptionsSetJson;
|
||||||
|
import _VisualDVM.TestingSystem.DVM.DVMSettings.DVMSettings;
|
||||||
|
|
||||||
|
import java.util.Vector;
|
||||||
|
public class DVMSettingsCache extends VisualCache {
|
||||||
|
public OptionsSetJson optionsSetJson=null;
|
||||||
|
public EnvironmentsSetJson environmentsSetJson=null;
|
||||||
|
//--
|
||||||
|
public String optionsSummary = null;
|
||||||
|
public String environmentsSummary = null;
|
||||||
|
//--
|
||||||
|
public DVMSettingsCache(DVMSettings dvmSettings) {
|
||||||
|
//-->>
|
||||||
|
if (dvmSettings.packedCompilationOptionsJson.isEmpty())
|
||||||
|
optionsSetJson = new OptionsSetJson();
|
||||||
|
else
|
||||||
|
optionsSetJson = Utils_.gson.fromJson(dvmSettings.packedCompilationOptionsJson, OptionsSetJson.class);
|
||||||
|
//-->>
|
||||||
|
if (dvmSettings.packedRunEnvironmentValuesJson.isEmpty())
|
||||||
|
environmentsSetJson = new EnvironmentsSetJson();
|
||||||
|
else
|
||||||
|
environmentsSetJson = Utils_.gson.fromJson(dvmSettings.packedRunEnvironmentValuesJson, EnvironmentsSetJson.class);
|
||||||
|
//--
|
||||||
|
Vector<String> optionsSummary_=new Vector<>();
|
||||||
|
for (OptionsJson optionsJson: optionsSetJson.values){
|
||||||
|
optionsSummary_.add(optionsJson.toLine());
|
||||||
|
}
|
||||||
|
optionsSummary = String.join("\n", optionsSummary_);
|
||||||
|
Vector<String> environmentsSummary_ = new Vector<>();
|
||||||
|
for (EnvironmentsJson environmentsJson: environmentsSetJson.values){
|
||||||
|
environmentsSummary_.add(environmentsJson.toLine());
|
||||||
|
}
|
||||||
|
environmentsSummary = String.join("\n", environmentsSummary_);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -3,6 +3,7 @@ import Common.Database.Objects.DBObject;
|
|||||||
import _VisualDVM.TestingSystem.Common.Configuration.Configuration;
|
import _VisualDVM.TestingSystem.Common.Configuration.Configuration;
|
||||||
import _VisualDVM.TestingSystem.Common.TestingPackage.TestingPackage;
|
import _VisualDVM.TestingSystem.Common.TestingPackage.TestingPackage;
|
||||||
import _VisualDVM.TestingSystem.DVM.DVMConfiguration.DVMConfiguration;
|
import _VisualDVM.TestingSystem.DVM.DVMConfiguration.DVMConfiguration;
|
||||||
|
import _VisualDVM.TestingSystem.DVM.DVMSettings.DVMSettings;
|
||||||
import _VisualDVM.TestingSystem.SAPFOR.SapforConfiguration.SapforConfiguration;
|
import _VisualDVM.TestingSystem.SAPFOR.SapforConfiguration.SapforConfiguration;
|
||||||
|
|
||||||
import java.util.LinkedHashMap;
|
import java.util.LinkedHashMap;
|
||||||
@@ -29,6 +30,7 @@ public class VisualCaches {
|
|||||||
if (object instanceof SapforConfiguration) return new SapforConfigurationCache((Configuration) object);
|
if (object instanceof SapforConfiguration) return new SapforConfigurationCache((Configuration) object);
|
||||||
if (object instanceof DVMConfiguration) return new DVMConfigurationCache((Configuration) object);
|
if (object instanceof DVMConfiguration) return new DVMConfigurationCache((Configuration) object);
|
||||||
if (object instanceof TestingPackage) return new PackageCache((TestingPackage) object);
|
if (object instanceof TestingPackage) return new PackageCache((TestingPackage) object);
|
||||||
|
if (object instanceof DVMSettings) return new DVMSettingsCache((DVMSettings) object);
|
||||||
return new VisualCache();
|
return new VisualCache();
|
||||||
}
|
}
|
||||||
public static VisualCache GetCache(DBObject object) {
|
public static VisualCache GetCache(DBObject object) {
|
||||||
|
|||||||
@@ -7,9 +7,13 @@ import Common.Visual.FilterFlag;
|
|||||||
import Common.Visual.Menus.DataMenuBar;
|
import Common.Visual.Menus.DataMenuBar;
|
||||||
import Common.Visual.Tables.ColumnInfo;
|
import Common.Visual.Tables.ColumnInfo;
|
||||||
import Common.Visual.Tables.HeaderTextFilter;
|
import Common.Visual.Tables.HeaderTextFilter;
|
||||||
|
import Common.Visual.Tables.RendererMultiline;
|
||||||
import Common.Visual.Windows.Dialog.DBObjectDialog;
|
import Common.Visual.Windows.Dialog.DBObjectDialog;
|
||||||
import _VisualDVM.Global;
|
import _VisualDVM.Global;
|
||||||
import _VisualDVM.Passes.PassCode;
|
import _VisualDVM.Passes.PassCode;
|
||||||
|
import _VisualDVM.ServerObjectsCache.ConfigurationCache;
|
||||||
|
import _VisualDVM.ServerObjectsCache.DVMSettingsCache;
|
||||||
|
import _VisualDVM.ServerObjectsCache.VisualCaches;
|
||||||
import _VisualDVM.TestingSystem.DVM.DVMSettings.DVMSettings;
|
import _VisualDVM.TestingSystem.DVM.DVMSettings.DVMSettings;
|
||||||
|
|
||||||
import javax.swing.*;
|
import javax.swing.*;
|
||||||
@@ -35,13 +39,13 @@ public class DVMSettingsForm extends DataSetControlForm<DVMSettings> {
|
|||||||
new ColumnInfo<DVMSettings>("флаги") {
|
new ColumnInfo<DVMSettings>("флаги") {
|
||||||
@Override
|
@Override
|
||||||
public Object getFieldAt(DVMSettings object) {
|
public Object getFieldAt(DVMSettings object) {
|
||||||
return object.flags;
|
return ((DVMSettingsCache) VisualCaches.GetCache(object)).optionsSummary;
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
new ColumnInfo<DVMSettings>("окружение") {
|
new ColumnInfo<DVMSettings>("окружение") {
|
||||||
@Override
|
@Override
|
||||||
public Object getFieldAt(DVMSettings object) {
|
public Object getFieldAt(DVMSettings object) {
|
||||||
return object.environments;
|
return ((DVMSettingsCache) VisualCaches.GetCache(object)).environmentsSummary;
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
new ColumnInfo<DVMSettings>("usr.par") {
|
new ColumnInfo<DVMSettings>("usr.par") {
|
||||||
|
|||||||
Reference in New Issue
Block a user