Tools/RDL-Editor
9
0
Fork 0
mirror of https://github.com/Minres/RDL-Editor.git synced 2025-07-01 21:43:26 +02:00
Code Issues 1 Packages Releases Wiki Activity

Update to XText 2.13

Browse Source
This commit is contained in:
Eyck Jentzsch
2018-06-02 18:41:09 +02:00
parent 71f8f3b920
commit cc6d106838
95 changed files with 150 additions and 578 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
com.minres.rdl.parent/com.minres.rdl/src/com/minres/rdl/RDL.xtext
View File

@ -61,7 +61,8 @@ enum ComponentDefinitionType:
Instantiation:
(
instanceType=EnumInstanceType? ("alias" alias=ID)? componentRef=[ComponentDefinition]| component=ComponentDefinition instanceType=EnumInstanceType?
instanceType=EnumInstanceType? ("alias" alias=ID)?
componentRef=[ComponentDefinition] | component=ComponentDefinition instanceType=EnumInstanceType?
) componentInstances+=ComponentInstance (',' componentInstances+=ComponentInstance)*
;

7
com.minres.rdl.parent/com.minres.rdl/src/com/minres/rdl/preferences/PreferenceInitializer.java
View File

@ -1,7 +1,6 @@
package com.minres.rdl.preferences;
import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer;
import org.eclipse.core.runtime.preferences.DefaultScope;
import org.eclipse.core.runtime.preferences.IEclipsePreferences;
/**
@ -16,7 +15,7 @@ public class PreferenceInitializer extends AbstractPreferenceInitializer {
* initializeDefaultPreferences()
*/
public void initializeDefaultPreferences() {
IEclipsePreferences store = getPreferenceStore();
IEclipsePreferences store = RdlPreferences.getPreferenceStore();
store.putBoolean(PreferenceConstants.P_GENERATE_CSV, true);
String value = System.getProperty(PreferenceConstants.ADDRESSUNIT_PROP);
if(value!=null){
@ -34,8 +33,4 @@ public class PreferenceInitializer extends AbstractPreferenceInitializer {
store.put(PreferenceConstants.P_ADDRESSUNIT, "byte");
}
public static IEclipsePreferences getPreferenceStore() {
return DefaultScope.INSTANCE.getNode(PreferenceConstants.SCOPE_NAME);
}
}

1
com.minres.rdl.parent/com.minres.rdl/src/com/minres/rdl/scoping/RDLScopeProvider.xtend
View File

@ -5,7 +5,6 @@ package com.minres.rdl.scoping
import com.minres.rdl.rdl.ComponentDefinition
import com.minres.rdl.rdl.Root
import org.eclipse.emf.ecore.EObject
import org.eclipse.xtext.EcoreUtil2
import org.eclipse.xtext.scoping.IScope
import org.eclipse.xtext.scoping.Scopes