no message
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
package _VisualDVM.GlobalData.CompilerOption;
|
||||
import Common.Database.Objects.DBObject;
|
||||
import Common.Utils.CommonUtils;
|
||||
import Common.Utils.Utils_;
|
||||
import com.sun.org.glassfish.gmbal.Description;
|
||||
|
||||
import java.util.Arrays;
|
||||
@@ -26,7 +26,7 @@ public class CompilerOption extends DBObject {
|
||||
@Override
|
||||
public String toString() {
|
||||
return name + (hasParameter() ? (parameterSeparator +
|
||||
(parameterValue.contains(" ") ? CommonUtils.DQuotes(parameterValue) : parameterValue)) : "");
|
||||
(parameterValue.contains(" ") ? Utils_.DQuotes(parameterValue) : parameterValue)) : "");
|
||||
}
|
||||
public void CheckParameterVariants() {
|
||||
for (String line : description)
|
||||
@@ -34,7 +34,7 @@ public class CompilerOption extends DBObject {
|
||||
}
|
||||
public boolean CheckLine(String line) {
|
||||
if (hasParameter()) {
|
||||
Pattern DVM_PARAM_VALUES_REGEX = Pattern.compile(CommonUtils.TBrackets(parameterName) + "\\s*=\\s*" + "\\w+(\\|\\w+)+", Pattern.CASE_INSENSITIVE);
|
||||
Pattern DVM_PARAM_VALUES_REGEX = Pattern.compile(Utils_.TBrackets(parameterName) + "\\s*=\\s*" + "\\w+(\\|\\w+)+", Pattern.CASE_INSENSITIVE);
|
||||
Matcher matcher = DVM_PARAM_VALUES_REGEX.matcher(line);
|
||||
if (matcher.find()) {
|
||||
String s = line.substring(matcher.start(), matcher.end());
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
package _VisualDVM.GlobalData.CompilerOption.UI;
|
||||
import Common.Visual.CommonUI;
|
||||
import Common.Visual.UI_;
|
||||
import Common.Visual.Tables.DBObjectRenderer;
|
||||
import Common.Visual.Fonts.VisualiserFonts;
|
||||
import _VisualDVM.GlobalData.CompilerOption.CompilerOption;
|
||||
@@ -9,10 +9,10 @@ public class CompilerOptionParameterNameRenderer extends DBObjectRenderer {
|
||||
if (value != null) {
|
||||
CompilerOption option = (CompilerOption) value;
|
||||
if (option.hasParameter()) {
|
||||
setFont(CommonUI.getTheme().Fonts.get(VisualiserFonts.TreePlain));
|
||||
setFont(UI_.getTheme().Fonts.get(VisualiserFonts.TreePlain));
|
||||
setText(option.parameterName);
|
||||
} else {
|
||||
setFont(CommonUI.getTheme().Fonts.get(VisualiserFonts.UnknownState));
|
||||
setFont(UI_.getTheme().Fonts.get(VisualiserFonts.UnknownState));
|
||||
setText("нет");
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
package _VisualDVM.GlobalData.CompilerOption.UI;
|
||||
import Common.Visual.CommonUI;
|
||||
import Common.Visual.UI_;
|
||||
import Common.Visual.Tables.DBObjectEditor;
|
||||
import Common.Visual.Fonts.VisualiserFonts;
|
||||
import Common.Visual.Windows.Dialog.Text.ComboTextDialog;
|
||||
@@ -8,13 +8,13 @@ public class CompilerOptionParameterValueEditor extends DBObjectEditor<CompilerO
|
||||
@Override
|
||||
public void Action() {
|
||||
if (value.hasParameter()) {
|
||||
setFont(CommonUI.getTheme().Fonts.get(VisualiserFonts.Hyperlink));
|
||||
setFont(UI_.getTheme().Fonts.get(VisualiserFonts.Hyperlink));
|
||||
//-
|
||||
setText(value.parameterValue.isEmpty() ? "не задано" : value.parameterValue);
|
||||
//-
|
||||
ComboTextDialog dialog = new ComboTextDialog();
|
||||
if (!value.parameterValue.isEmpty())
|
||||
CommonUI.TrySelect(dialog.fields, value.parameterValue);
|
||||
UI_.TrySelect(dialog.fields, value.parameterValue);
|
||||
dialog.fields.setEditable(value.parameterVariants.isEmpty());
|
||||
if (dialog.ShowDialog("Изменить значение опции " + value.name,
|
||||
value.parameterVariants)) {
|
||||
@@ -22,7 +22,7 @@ public class CompilerOptionParameterValueEditor extends DBObjectEditor<CompilerO
|
||||
setText(value.parameterValue.isEmpty() ? "не задано" : value.parameterValue);
|
||||
}
|
||||
} else {
|
||||
setFont(CommonUI.getTheme().Fonts.get(VisualiserFonts.UnknownState));
|
||||
setFont(UI_.getTheme().Fonts.get(VisualiserFonts.UnknownState));
|
||||
setText("нет");
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
package _VisualDVM.GlobalData.CompilerOption.UI;
|
||||
import Common.Visual.CommonUI;
|
||||
import Common.Visual.UI_;
|
||||
import Common.Visual.Tables.DBObjectRenderer;
|
||||
import Common.Visual.Fonts.VisualiserFonts;
|
||||
import _VisualDVM.GlobalData.CompilerOption.CompilerOption;
|
||||
@@ -9,10 +9,10 @@ public class CompilerOptionParameterValueRenderer extends DBObjectRenderer {
|
||||
if (value != null) {
|
||||
CompilerOption option = (CompilerOption) value;
|
||||
if (option.hasParameter()) {
|
||||
setFont(CommonUI.getTheme().Fonts.get(VisualiserFonts.Hyperlink));
|
||||
setFont(UI_.getTheme().Fonts.get(VisualiserFonts.Hyperlink));
|
||||
setText(option.parameterValue.isEmpty() ? "не задано" : option.parameterValue);
|
||||
} else {
|
||||
setFont(CommonUI.getTheme().Fonts.get(VisualiserFonts.UnknownState));
|
||||
setFont(UI_.getTheme().Fonts.get(VisualiserFonts.UnknownState));
|
||||
setText("нет");
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user