Migrated to XText 2.14 and Photon for RDL Editor RCP

This commit is contained in:
2018-06-02 23:41:27 +02:00
parent cc6d106838
commit 9a55dd5a21
165 changed files with 2419 additions and 662 deletions

View File

@ -1,5 +1,5 @@
/*
* generated by Xtext 2.13.0
* generated by Xtext 2.14.0
*/
package com.minres.rdl;
@ -14,6 +14,7 @@ import com.minres.rdl.scoping.RDLScopeProvider;
import com.minres.rdl.serializer.RDLSemanticSequencer;
import com.minres.rdl.serializer.RDLSyntacticSequencer;
import com.minres.rdl.services.RDLGrammarAccess;
import com.minres.rdl.validation.RDLConfigurableIssueCodesProvider;
import com.minres.rdl.validation.RDLValidator;
import java.util.Properties;
import org.eclipse.xtext.Constants;
@ -49,6 +50,7 @@ import org.eclipse.xtext.serializer.sequencer.ISemanticSequencer;
import org.eclipse.xtext.serializer.sequencer.ISyntacticSequencer;
import org.eclipse.xtext.service.DefaultRuntimeModule;
import org.eclipse.xtext.service.SingletonBinding;
import org.eclipse.xtext.validation.ConfigurableIssueCodesProvider;
/**
* Manual modifications go to {@link RDLRuntimeModule}.
@ -141,6 +143,31 @@ public abstract class AbstractRDLRuntimeModule extends DefaultRuntimeModule {
return RDLValidator.class;
}
// contributed by org.eclipse.xtext.xtext.generator.validation.ValidatorFragment2
public Class<? extends ConfigurableIssueCodesProvider> bindConfigurableIssueCodesProvider() {
return RDLConfigurableIssueCodesProvider.class;
}
// contributed by org.eclipse.xtext.xtext.generator.scoping.ImportNamespacesScopingFragment2
public Class<? extends IScopeProvider> bindIScopeProvider() {
return RDLScopeProvider.class;
}
// contributed by org.eclipse.xtext.xtext.generator.scoping.ImportNamespacesScopingFragment2
public void configureIScopeProviderDelegate(Binder binder) {
binder.bind(IScopeProvider.class).annotatedWith(Names.named(AbstractDeclarativeScopeProvider.NAMED_DELEGATE)).to(ImportedNamespaceAwareLocalScopeProvider.class);
}
// contributed by org.eclipse.xtext.xtext.generator.scoping.ImportNamespacesScopingFragment2
public Class<? extends IGlobalScopeProvider> bindIGlobalScopeProvider() {
return DefaultGlobalScopeProvider.class;
}
// contributed by org.eclipse.xtext.xtext.generator.scoping.ImportNamespacesScopingFragment2
public void configureIgnoreCaseLinking(Binder binder) {
binder.bindConstant().annotatedWith(IgnoreCaseLinking.class).to(false);
}
// contributed by org.eclipse.xtext.xtext.generator.builder.BuilderIntegrationFragment2
public Class<? extends IContainer.Manager> bindIContainer$Manager() {
return StateBasedContainerManager.class;
@ -166,26 +193,6 @@ public abstract class AbstractRDLRuntimeModule extends DefaultRuntimeModule {
return RDLGenerator.class;
}
// contributed by org.eclipse.xtext.xtext.generator.scoping.ImportNamespacesScopingFragment2
public Class<? extends IScopeProvider> bindIScopeProvider() {
return RDLScopeProvider.class;
}
// contributed by org.eclipse.xtext.xtext.generator.scoping.ImportNamespacesScopingFragment2
public void configureIScopeProviderDelegate(Binder binder) {
binder.bind(IScopeProvider.class).annotatedWith(Names.named(AbstractDeclarativeScopeProvider.NAMED_DELEGATE)).to(ImportedNamespaceAwareLocalScopeProvider.class);
}
// contributed by org.eclipse.xtext.xtext.generator.scoping.ImportNamespacesScopingFragment2
public Class<? extends IGlobalScopeProvider> bindIGlobalScopeProvider() {
return DefaultGlobalScopeProvider.class;
}
// contributed by org.eclipse.xtext.xtext.generator.scoping.ImportNamespacesScopingFragment2
public void configureIgnoreCaseLinking(Binder binder) {
binder.bindConstant().annotatedWith(IgnoreCaseLinking.class).to(false);
}
// contributed by org.eclipse.xtext.xtext.generator.exporting.SimpleNamesFragment2
public Class<? extends IQualifiedNameProvider> bindIQualifiedNameProvider() {
return SimpleNameProvider.class;

View File

@ -1,5 +1,5 @@
/*
* generated by Xtext 2.13.0
* generated by Xtext 2.14.0
*/
package com.minres.rdl;

View File

@ -1,5 +1,5 @@
/*
* generated by Xtext 2.13.0
* generated by Xtext 2.14.0
*/
package com.minres.rdl.parser.antlr;

View File

@ -1,5 +1,5 @@
/*
* generated by Xtext 2.13.0
* generated by Xtext 2.14.0
*/
package com.minres.rdl.parser.antlr;

View File

@ -1,5 +1,5 @@
/*
* generated by Xtext 2.13.0
* generated by Xtext 2.14.0
*/
grammar InternalRDL;

View File

@ -1,5 +1,5 @@
/**
* generated by Xtext 2.13.0
* generated by Xtext 2.14.0
*/
package com.minres.rdl.rdl;

View File

@ -1,5 +1,5 @@
/**
* generated by Xtext 2.13.0
* generated by Xtext 2.14.0
*/
package com.minres.rdl.rdl;

View File

@ -1,5 +1,5 @@
/**
* generated by Xtext 2.13.0
* generated by Xtext 2.14.0
*/
package com.minres.rdl.rdl;

View File

@ -1,5 +1,5 @@
/**
* generated by Xtext 2.13.0
* generated by Xtext 2.14.0
*/
package com.minres.rdl.rdl;

View File

@ -1,5 +1,5 @@
/**
* generated by Xtext 2.13.0
* generated by Xtext 2.14.0
*/
package com.minres.rdl.rdl;

View File

@ -1,5 +1,5 @@
/**
* generated by Xtext 2.13.0
* generated by Xtext 2.14.0
*/
package com.minres.rdl.rdl;

View File

@ -1,5 +1,5 @@
/**
* generated by Xtext 2.13.0
* generated by Xtext 2.14.0
*/
package com.minres.rdl.rdl;

View File

@ -1,5 +1,5 @@
/**
* generated by Xtext 2.13.0
* generated by Xtext 2.14.0
*/
package com.minres.rdl.rdl;

View File

@ -1,5 +1,5 @@
/**
* generated by Xtext 2.13.0
* generated by Xtext 2.14.0
*/
package com.minres.rdl.rdl;

View File

@ -1,5 +1,5 @@
/**
* generated by Xtext 2.13.0
* generated by Xtext 2.14.0
*/
package com.minres.rdl.rdl;

View File

@ -1,5 +1,5 @@
/**
* generated by Xtext 2.13.0
* generated by Xtext 2.14.0
*/
package com.minres.rdl.rdl;

View File

@ -1,5 +1,5 @@
/**
* generated by Xtext 2.13.0
* generated by Xtext 2.14.0
*/
package com.minres.rdl.rdl;

View File

@ -1,5 +1,5 @@
/**
* generated by Xtext 2.13.0
* generated by Xtext 2.14.0
*/
package com.minres.rdl.rdl;

View File

@ -1,5 +1,5 @@
/**
* generated by Xtext 2.13.0
* generated by Xtext 2.14.0
*/
package com.minres.rdl.rdl;

View File

@ -1,5 +1,5 @@
/**
* generated by Xtext 2.13.0
* generated by Xtext 2.14.0
*/
package com.minres.rdl.rdl;

View File

@ -1,5 +1,5 @@
/**
* generated by Xtext 2.13.0
* generated by Xtext 2.14.0
*/
package com.minres.rdl.rdl;

View File

@ -1,5 +1,5 @@
/**
* generated by Xtext 2.13.0
* generated by Xtext 2.14.0
*/
package com.minres.rdl.rdl;

View File

@ -1,5 +1,5 @@
/**
* generated by Xtext 2.13.0
* generated by Xtext 2.14.0
*/
package com.minres.rdl.rdl;

View File

@ -1,5 +1,5 @@
/**
* generated by Xtext 2.13.0
* generated by Xtext 2.14.0
*/
package com.minres.rdl.rdl;

View File

@ -1,5 +1,5 @@
/**
* generated by Xtext 2.13.0
* generated by Xtext 2.14.0
*/
package com.minres.rdl.rdl;

View File

@ -1,5 +1,5 @@
/**
* generated by Xtext 2.13.0
* generated by Xtext 2.14.0
*/
package com.minres.rdl.rdl;

View File

@ -1,5 +1,5 @@
/**
* generated by Xtext 2.13.0
* generated by Xtext 2.14.0
*/
package com.minres.rdl.rdl;

View File

@ -1,5 +1,5 @@
/**
* generated by Xtext 2.13.0
* generated by Xtext 2.14.0
*/
package com.minres.rdl.rdl;

View File

@ -1,5 +1,5 @@
/**
* generated by Xtext 2.13.0
* generated by Xtext 2.14.0
*/
package com.minres.rdl.rdl;

View File

@ -1,5 +1,5 @@
/**
* generated by Xtext 2.13.0
* generated by Xtext 2.14.0
*/
package com.minres.rdl.rdl;

View File

@ -1,5 +1,5 @@
/**
* generated by Xtext 2.13.0
* generated by Xtext 2.14.0
*/
package com.minres.rdl.rdl;

View File

@ -1,5 +1,5 @@
/**
* generated by Xtext 2.13.0
* generated by Xtext 2.14.0
*/
package com.minres.rdl.rdl;

View File

@ -1,5 +1,5 @@
/**
* generated by Xtext 2.13.0
* generated by Xtext 2.14.0
*/
package com.minres.rdl.rdl;

View File

@ -1,5 +1,5 @@
/**
* generated by Xtext 2.13.0
* generated by Xtext 2.14.0
*/
package com.minres.rdl.rdl;

View File

@ -1,5 +1,5 @@
/**
* generated by Xtext 2.13.0
* generated by Xtext 2.14.0
*/
package com.minres.rdl.rdl;

View File

@ -1,5 +1,5 @@
/**
* generated by Xtext 2.13.0
* generated by Xtext 2.14.0
*/
package com.minres.rdl.rdl;

View File

@ -1,5 +1,5 @@
/**
* generated by Xtext 2.13.0
* generated by Xtext 2.14.0
*/
package com.minres.rdl.rdl;

View File

@ -1,5 +1,5 @@
/**
* generated by Xtext 2.13.0
* generated by Xtext 2.14.0
*/
package com.minres.rdl.rdl;

View File

@ -1,5 +1,5 @@
/**
* generated by Xtext 2.13.0
* generated by Xtext 2.14.0
*/
package com.minres.rdl.rdl.impl;

View File

@ -1,5 +1,5 @@
/**
* generated by Xtext 2.13.0
* generated by Xtext 2.14.0
*/
package com.minres.rdl.rdl.impl;

View File

@ -1,5 +1,5 @@
/**
* generated by Xtext 2.13.0
* generated by Xtext 2.14.0
*/
package com.minres.rdl.rdl.impl;

View File

@ -1,5 +1,5 @@
/**
* generated by Xtext 2.13.0
* generated by Xtext 2.14.0
*/
package com.minres.rdl.rdl.impl;

View File

@ -1,5 +1,5 @@
/**
* generated by Xtext 2.13.0
* generated by Xtext 2.14.0
*/
package com.minres.rdl.rdl.impl;

View File

@ -1,5 +1,5 @@
/**
* generated by Xtext 2.13.0
* generated by Xtext 2.14.0
*/
package com.minres.rdl.rdl.impl;

View File

@ -1,5 +1,5 @@
/**
* generated by Xtext 2.13.0
* generated by Xtext 2.14.0
*/
package com.minres.rdl.rdl.impl;

View File

@ -1,5 +1,5 @@
/**
* generated by Xtext 2.13.0
* generated by Xtext 2.14.0
*/
package com.minres.rdl.rdl.impl;

View File

@ -1,5 +1,5 @@
/**
* generated by Xtext 2.13.0
* generated by Xtext 2.14.0
*/
package com.minres.rdl.rdl.impl;

View File

@ -1,5 +1,5 @@
/**
* generated by Xtext 2.13.0
* generated by Xtext 2.14.0
*/
package com.minres.rdl.rdl.impl;

View File

@ -1,5 +1,5 @@
/**
* generated by Xtext 2.13.0
* generated by Xtext 2.14.0
*/
package com.minres.rdl.rdl.impl;

View File

@ -1,5 +1,5 @@
/**
* generated by Xtext 2.13.0
* generated by Xtext 2.14.0
*/
package com.minres.rdl.rdl.impl;

View File

@ -1,5 +1,5 @@
/**
* generated by Xtext 2.13.0
* generated by Xtext 2.14.0
*/
package com.minres.rdl.rdl.impl;

View File

@ -1,5 +1,5 @@
/**
* generated by Xtext 2.13.0
* generated by Xtext 2.14.0
*/
package com.minres.rdl.rdl.impl;

View File

@ -1,5 +1,5 @@
/**
* generated by Xtext 2.13.0
* generated by Xtext 2.14.0
*/
package com.minres.rdl.rdl.impl;

View File

@ -1,5 +1,5 @@
/**
* generated by Xtext 2.13.0
* generated by Xtext 2.14.0
*/
package com.minres.rdl.rdl.impl;

View File

@ -1,5 +1,5 @@
/**
* generated by Xtext 2.13.0
* generated by Xtext 2.14.0
*/
package com.minres.rdl.rdl.impl;

View File

@ -1,5 +1,5 @@
/**
* generated by Xtext 2.13.0
* generated by Xtext 2.14.0
*/
package com.minres.rdl.rdl.impl;

View File

@ -1,5 +1,5 @@
/**
* generated by Xtext 2.13.0
* generated by Xtext 2.14.0
*/
package com.minres.rdl.rdl.impl;

View File

@ -1,5 +1,5 @@
/**
* generated by Xtext 2.13.0
* generated by Xtext 2.14.0
*/
package com.minres.rdl.rdl.impl;

View File

@ -1,5 +1,5 @@
/**
* generated by Xtext 2.13.0
* generated by Xtext 2.14.0
*/
package com.minres.rdl.rdl.impl;

View File

@ -1,5 +1,5 @@
/**
* generated by Xtext 2.13.0
* generated by Xtext 2.14.0
*/
package com.minres.rdl.rdl.impl;

View File

@ -1,5 +1,5 @@
/**
* generated by Xtext 2.13.0
* generated by Xtext 2.14.0
*/
package com.minres.rdl.rdl.impl;

View File

@ -1,5 +1,5 @@
/**
* generated by Xtext 2.13.0
* generated by Xtext 2.14.0
*/
package com.minres.rdl.rdl.impl;

View File

@ -1,5 +1,5 @@
/**
* generated by Xtext 2.13.0
* generated by Xtext 2.14.0
*/
package com.minres.rdl.rdl.impl;

View File

@ -1,5 +1,5 @@
/**
* generated by Xtext 2.13.0
* generated by Xtext 2.14.0
*/
package com.minres.rdl.rdl.impl;

View File

@ -1,5 +1,5 @@
/**
* generated by Xtext 2.13.0
* generated by Xtext 2.14.0
*/
package com.minres.rdl.rdl.impl;

View File

@ -1,5 +1,5 @@
/**
* generated by Xtext 2.13.0
* generated by Xtext 2.14.0
*/
package com.minres.rdl.rdl.util;

View File

@ -1,5 +1,5 @@
/**
* generated by Xtext 2.13.0
* generated by Xtext 2.14.0
*/
package com.minres.rdl.rdl.util;

View File

@ -1,5 +1,5 @@
/*
* generated by Xtext 2.13.0
* generated by Xtext 2.14.0
*/
package com.minres.rdl.scoping;

View File

@ -1,5 +1,5 @@
/*
* generated by Xtext 2.13.0
* generated by Xtext 2.14.0
*/
package com.minres.rdl.serializer;

View File

@ -1,5 +1,5 @@
/*
* generated by Xtext 2.13.0
* generated by Xtext 2.14.0
*/
package com.minres.rdl.serializer;

View File

@ -1,5 +1,5 @@
/*
* generated by Xtext 2.13.0
* generated by Xtext 2.14.0
*/
package com.minres.rdl.services;
@ -676,8 +676,9 @@ public class RDLGrammarAccess extends AbstractGrammarElementFinder {
private final RuleCall cComponentInstancesComponentInstanceParserRuleCall_2_1_0 = (RuleCall)cComponentInstancesAssignment_2_1.eContents().get(0);
//Instantiation:
// (instanceType=EnumInstanceType? ("alias" alias=ID)? componentRef=[ComponentDefinition] | component=ComponentDefinition
// instanceType=EnumInstanceType?) componentInstances+=ComponentInstance (',' componentInstances+=ComponentInstance)*;
// (instanceType=EnumInstanceType? ("alias" alias=ID)?
// componentRef=[ComponentDefinition] | component=ComponentDefinition instanceType=EnumInstanceType?)
// componentInstances+=ComponentInstance (',' componentInstances+=ComponentInstance)*;
@Override public ParserRule getRule() { return rule; }
//(instanceType=EnumInstanceType? ("alias" alias=ID)? componentRef=[ComponentDefinition] | component=ComponentDefinition
@ -3602,8 +3603,9 @@ public class RDLGrammarAccess extends AbstractGrammarElementFinder {
}
//Instantiation:
// (instanceType=EnumInstanceType? ("alias" alias=ID)? componentRef=[ComponentDefinition] | component=ComponentDefinition
// instanceType=EnumInstanceType?) componentInstances+=ComponentInstance (',' componentInstances+=ComponentInstance)*;
// (instanceType=EnumInstanceType? ("alias" alias=ID)?
// componentRef=[ComponentDefinition] | component=ComponentDefinition instanceType=EnumInstanceType?)
// componentInstances+=ComponentInstance (',' componentInstances+=ComponentInstance)*;
public InstantiationElements getInstantiationAccess() {
return pInstantiation;
}

View File

@ -1,5 +1,5 @@
/*
* generated by Xtext 2.13.0
* generated by Xtext 2.14.0
*/
package com.minres.rdl.validation;
@ -16,5 +16,4 @@ public abstract class AbstractRDLValidator extends AbstractDeclarativeValidator
result.add(com.minres.rdl.rdl.RdlPackage.eINSTANCE);
return result;
}
}

View File

@ -0,0 +1,22 @@
/*
* generated by Xtext 2.14.0
*/
package com.minres.rdl.validation;
import org.eclipse.xtext.preferences.PreferenceKey;
import org.eclipse.xtext.util.IAcceptor;
import org.eclipse.xtext.validation.ConfigurableIssueCodesProvider;
import org.eclipse.xtext.validation.SeverityConverter;
@SuppressWarnings("restriction")
public class RDLConfigurableIssueCodesProvider extends ConfigurableIssueCodesProvider {
protected static final String ISSUE_CODE_PREFIX = "com.minres.rdl.";
public static final String DEPRECATED_MODEL_PART = ISSUE_CODE_PREFIX + "deprecatedModelPart";
@Override
protected void initialize(IAcceptor<PreferenceKey> acceptor) {
super.initialize(acceptor);
acceptor.accept(create(DEPRECATED_MODEL_PART, SeverityConverter.SEVERITY_WARNING));
}
}