mirror of
https://github.com/sigmasternchen/xtext-core
synced 2025-03-15 16:28:56 +00:00
[#664] fixed generation of val prefs/issue codes when deprecation disabled
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
This commit is contained in:
parent
5c1f19b4c6
commit
f2a738ae3e
2 changed files with 35 additions and 17 deletions
|
@ -241,12 +241,16 @@ class ValidatorFragment2 extends AbstractInheritingFragment {
|
|||
public class «configurableIssueCodesProviderClass» extends «superConfigurableIssueCodesProviderClass» {
|
||||
protected static final String ISSUE_CODE_PREFIX = "«grammar.runtimeBasePackage».";
|
||||
|
||||
public static final String DEPRECATED_MODEL_PART = ISSUE_CODE_PREFIX + "deprecatedModelPart";
|
||||
«IF generateDeprecationValidation»
|
||||
public static final String DEPRECATED_MODEL_PART = ISSUE_CODE_PREFIX + "deprecatedModelPart";
|
||||
«ENDIF»
|
||||
|
||||
@Override
|
||||
protected void initialize(«IAcceptor»<«PreferenceKey»> acceptor) {
|
||||
super.initialize(acceptor);
|
||||
acceptor.accept(create(DEPRECATED_MODEL_PART, «SeverityConverter».SEVERITY_WARNING));
|
||||
«IF generateDeprecationValidation»
|
||||
acceptor.accept(create(DEPRECATED_MODEL_PART, «SeverityConverter».SEVERITY_WARNING));
|
||||
«ENDIF»
|
||||
}
|
||||
}
|
||||
'''
|
||||
|
@ -261,7 +265,9 @@ class ValidatorFragment2 extends AbstractInheritingFragment {
|
|||
|
||||
@Override
|
||||
protected void fillSettingsPage(«typeRef("org.eclipse.swt.widgets.Composite")» composite, int nColumns, int defaultIndent) {
|
||||
addComboBox(«getConfigurableIssueCodesProviderClass».DEPRECATED_MODEL_PART, "Deprecated Model Part", composite, defaultIndent);
|
||||
«IF generateDeprecationValidation»
|
||||
addComboBox(«getConfigurableIssueCodesProviderClass».DEPRECATED_MODEL_PART, "Deprecated Model Part", composite, defaultIndent);
|
||||
«ENDIF»
|
||||
«IF language.grammar.inheritsXbase»
|
||||
super.fillSettingsPage(composite, nColumns, defaultIndent);
|
||||
«ENDIF»
|
||||
|
|
|
@ -480,9 +480,13 @@ public class ValidatorFragment2 extends AbstractInheritingFragment {
|
|||
_builder.append(".\";");
|
||||
_builder.newLineIfNotEmpty();
|
||||
_builder.newLine();
|
||||
_builder.append("\t");
|
||||
_builder.append("public static final String DEPRECATED_MODEL_PART = ISSUE_CODE_PREFIX + \"deprecatedModelPart\";");
|
||||
_builder.newLine();
|
||||
{
|
||||
if (ValidatorFragment2.this.generateDeprecationValidation) {
|
||||
_builder.append("\t");
|
||||
_builder.append("public static final String DEPRECATED_MODEL_PART = ISSUE_CODE_PREFIX + \"deprecatedModelPart\";");
|
||||
_builder.newLine();
|
||||
}
|
||||
}
|
||||
_builder.newLine();
|
||||
_builder.append("\t");
|
||||
_builder.append("@Override");
|
||||
|
@ -497,11 +501,15 @@ public class ValidatorFragment2 extends AbstractInheritingFragment {
|
|||
_builder.append("\t\t");
|
||||
_builder.append("super.initialize(acceptor);");
|
||||
_builder.newLine();
|
||||
_builder.append("\t\t");
|
||||
_builder.append("acceptor.accept(create(DEPRECATED_MODEL_PART, ");
|
||||
_builder.append(SeverityConverter.class, "\t\t");
|
||||
_builder.append(".SEVERITY_WARNING));");
|
||||
_builder.newLineIfNotEmpty();
|
||||
{
|
||||
if (ValidatorFragment2.this.generateDeprecationValidation) {
|
||||
_builder.append("\t\t");
|
||||
_builder.append("acceptor.accept(create(DEPRECATED_MODEL_PART, ");
|
||||
_builder.append(SeverityConverter.class, "\t\t");
|
||||
_builder.append(".SEVERITY_WARNING));");
|
||||
_builder.newLineIfNotEmpty();
|
||||
}
|
||||
}
|
||||
_builder.append("\t");
|
||||
_builder.append("}");
|
||||
_builder.newLine();
|
||||
|
@ -548,12 +556,16 @@ public class ValidatorFragment2 extends AbstractInheritingFragment {
|
|||
_builder.append(_typeRef, "\t");
|
||||
_builder.append(" composite, int nColumns, int defaultIndent) {");
|
||||
_builder.newLineIfNotEmpty();
|
||||
_builder.append("\t\t");
|
||||
_builder.append("addComboBox(");
|
||||
TypeReference _configurableIssueCodesProviderClass = ValidatorFragment2.this.getConfigurableIssueCodesProviderClass();
|
||||
_builder.append(_configurableIssueCodesProviderClass, "\t\t");
|
||||
_builder.append(".DEPRECATED_MODEL_PART, \"Deprecated Model Part\", composite, defaultIndent);");
|
||||
_builder.newLineIfNotEmpty();
|
||||
{
|
||||
if (ValidatorFragment2.this.generateDeprecationValidation) {
|
||||
_builder.append("\t\t");
|
||||
_builder.append("addComboBox(");
|
||||
TypeReference _configurableIssueCodesProviderClass = ValidatorFragment2.this.getConfigurableIssueCodesProviderClass();
|
||||
_builder.append(_configurableIssueCodesProviderClass, "\t\t");
|
||||
_builder.append(".DEPRECATED_MODEL_PART, \"Deprecated Model Part\", composite, defaultIndent);");
|
||||
_builder.newLineIfNotEmpty();
|
||||
}
|
||||
}
|
||||
{
|
||||
boolean _inheritsXbase_1 = ValidatorFragment2.this._xbaseUsageDetector.inheritsXbase(ValidatorFragment2.this.getLanguage().getGrammar());
|
||||
if (_inheritsXbase_1) {
|
||||
|
|
Loading…
Reference in a new issue