Update to XText 2.13

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

View File

@ -1,5 +1,5 @@
/* /*
* generated by Xtext 2.12.0 * generated by Xtext 2.13.0
*/ */
package com.minres.rdl.ide; package com.minres.rdl.ide;
@ -15,6 +15,9 @@ import org.eclipse.xtext.ide.editor.contentassist.IProposalConflictHelper;
import org.eclipse.xtext.ide.editor.contentassist.antlr.AntlrProposalConflictHelper; import org.eclipse.xtext.ide.editor.contentassist.antlr.AntlrProposalConflictHelper;
import org.eclipse.xtext.ide.editor.contentassist.antlr.IContentAssistParser; import org.eclipse.xtext.ide.editor.contentassist.antlr.IContentAssistParser;
import org.eclipse.xtext.ide.editor.contentassist.antlr.internal.Lexer; import org.eclipse.xtext.ide.editor.contentassist.antlr.internal.Lexer;
import org.eclipse.xtext.ide.refactoring.IRenameStrategy2;
import org.eclipse.xtext.ide.server.rename.IRenameService;
import org.eclipse.xtext.ide.server.rename.RenameService;
/** /**
* Manual modifications go to {@link RDLIdeModule}. * Manual modifications go to {@link RDLIdeModule}.
@ -44,4 +47,14 @@ public abstract class AbstractRDLIdeModule extends DefaultIdeModule {
return FQNPrefixMatcher.class; return FQNPrefixMatcher.class;
} }
// contributed by org.eclipse.xtext.xtext.generator.ui.refactoring.RefactorElementNameFragment2
public Class<? extends IRenameService> bindIRenameService() {
return RenameService.class;
}
// contributed by org.eclipse.xtext.xtext.generator.ui.refactoring.RefactorElementNameFragment2
public Class<? extends IRenameStrategy2> bindIRenameStrategy2() {
return IRenameStrategy2.DefaultImpl.class;
}
} }

View File

@ -1,5 +1,5 @@
/* /*
* generated by Xtext 2.12.0 * generated by Xtext 2.13.0
*/ */
package com.minres.rdl.ide.contentassist.antlr; package com.minres.rdl.ide.contentassist.antlr;

View File

@ -1,5 +1,5 @@
/* /*
* generated by Xtext 2.12.0 * generated by Xtext 2.13.0
*/ */
package com.minres.rdl.ide.contentassist.antlr; package com.minres.rdl.ide.contentassist.antlr;

View File

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

View File

@ -25,393 +25,6 @@
id="org.eclipse.rcp" id="org.eclipse.rcp"
version="0.0.0"/> version="0.0.0"/>
<requires>
<import plugin="org.eclipse.e4.core.di" version="1.5.1" match="greaterOrEqual"/>
<import plugin="org.eclipse.core.runtime" version="3.5.0" match="compatible"/>
<import plugin="org.eclipse.core.resources" version="3.5.0" match="compatible"/>
<import plugin="org.eclipse.jdt.core" version="3.5.0" match="compatible"/>
<import plugin="org.eclipse.jdt.launching" version="3.5.0" match="compatible"/>
<import plugin="org.eclipse.emf.ecore" version="2.12.0" match="compatible"/>
<import plugin="org.eclipse.emf.codegen" version="2.11.0" match="compatible"/>
<import plugin="org.eclipse.emf.ecore.xmi" version="2.12.0" match="compatible"/>
<import plugin="org.eclipse.text" version="3.5.0" match="compatible"/>
<import plugin="org.apache.batik.util.gui" version="1.7.0" match="equivalent"/>
<import plugin="org.eclipse.equinox.common" version="3.5.0" match="compatible"/>
<import plugin="org.eclipse.equinox.common" version="3.6.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.equinox.registry" version="3.5.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.debug.core" version="3.9.0" match="compatible"/>
<import plugin="org.eclipse.core.variables" version="3.2.800" match="compatible"/>
<import plugin="org.eclipse.xtend" version="1.1.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.xpand" version="1.1.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.xtend.typesystem.emf" version="1.0.1" match="greaterOrEqual"/>
<import plugin="org.eclipse.emf.ecore" version="2.10.2" match="greaterOrEqual"/>
<import plugin="org.eclipse.emf.common" version="2.10.1" match="greaterOrEqual"/>
<import plugin="org.eclipse.core.runtime" version="3.6.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.equinox.security" version="1.0.0" match="compatible"/>
<import plugin="org.eclipse.equinox.common" version="3.4.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.equinox.preferences" version="3.2.200" match="greaterOrEqual"/>
<import plugin="org.eclipse.osgi" version="3.4.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.equinox.registry" version="3.4.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.core.expressions" version="3.4.0" match="compatible"/>
<import plugin="org.eclipse.ui" version="3.5.0" match="compatible"/>
<import plugin="org.eclipse.ui.console" version="3.5.300" match="compatible"/>
<import plugin="org.eclipse.help" version="3.4.0" match="compatible"/>
<import plugin="org.eclipse.jface.text" version="3.5.0" match="compatible"/>
<import plugin="org.eclipse.ui.workbench.texteditor" version="3.5.0" match="compatible"/>
<import plugin="org.eclipse.ui.ide" version="3.5.0" match="compatible"/>
<import plugin="org.eclipse.ui.editors" version="3.5.0" match="compatible"/>
<import plugin="org.eclipse.core.runtime" version="3.11.0" match="compatible"/>
<import plugin="org.eclipse.core.filesystem" version="1.2.0" match="compatible"/>
<import plugin="org.eclipse.emf.codegen.ecore" version="2.10.2" match="greaterOrEqual"/>
<import plugin="org.eclipse.jdt.core" version="3.3.0" match="compatible"/>
<import plugin="org.eclipse.pde.core" version="3.6.0" match="compatible"/>
<import plugin="org.eclipse.ui.ide" version="3.2.0" match="compatible"/>
<import plugin="org.eclipse.ui.views" version="3.2.0" match="compatible"/>
<import plugin="org.eclipse.jface.text" version="3.7.0" match="compatible"/>
<import plugin="org.eclipse.ui.editors" version="3.2.0" match="compatible"/>
<import plugin="org.eclipse.debug.ui" version="3.10.0" match="compatible"/>
<import plugin="org.eclipse.jdt.core" version="3.2.0" match="compatible"/>
<import plugin="org.eclipse.jdt.debug.ui" version="3.2.0" match="compatible"/>
<import plugin="org.eclipse.jdt.launching" version="3.2.0" match="compatible"/>
<import plugin="org.eclipse.jdt.ui" version="3.2.0" match="compatible"/>
<import plugin="org.eclipse.pde.build" version="3.2.0" match="compatible"/>
<import plugin="org.eclipse.search" version="3.7.0" match="compatible"/>
<import plugin="org.eclipse.team.core" version="3.2.0" match="compatible"/>
<import plugin="org.eclipse.ui.forms" version="3.2.0" match="compatible"/>
<import plugin="org.eclipse.ant.launching" version="1.0.400" match="compatible"/>
<import plugin="org.eclipse.ant.ui" version="3.1.0" match="compatible"/>
<import plugin="org.eclipse.jdt.junit" version="3.2.0" match="compatible"/>
<import plugin="org.eclipse.ui.intro" version="3.2.0" match="compatible"/>
<import plugin="org.eclipse.ui.cheatsheets" version="3.2.0" match="compatible"/>
<import plugin="org.eclipse.update.configurator" version="3.1.0" match="compatible"/>
<import plugin="org.eclipse.ui.views.log" version="1.0.0" match="compatible"/>
<import plugin="org.eclipse.ltk.core.refactoring" version="3.2.0" match="compatible"/>
<import plugin="org.eclipse.core.variables" version="3.1.0" match="compatible"/>
<import plugin="org.eclipse.compare" version="3.2.0" match="compatible"/>
<import plugin="org.eclipse.core.filesystem" version="1.0.0" match="compatible"/>
<import plugin="org.eclipse.ltk.ui.refactoring" version="3.2.0" match="compatible"/>
<import plugin="org.eclipse.core.expressions" version="3.2.0" match="compatible"/>
<import plugin="org.eclipse.ui.navigator.resources" version="3.3.100" match="compatible"/>
<import plugin="org.eclipse.equinox.p2.ui" version="2.0.0" match="compatible"/>
<import plugin="org.eclipse.equinox.p2.metadata" version="2.0.0" match="compatible"/>
<import plugin="org.eclipse.equinox.p2.engine" version="2.0.0" match="compatible"/>
<import plugin="org.eclipse.equinox.p2.core" version="2.0.0" match="compatible"/>
<import plugin="org.eclipse.equinox.p2.director" version="2.1.0" match="compatible"/>
<import plugin="org.eclipse.equinox.p2.artifact.repository" version="1.0.100" match="compatible"/>
<import plugin="org.eclipse.equinox.p2.metadata.repository" version="1.0.100" match="compatible"/>
<import plugin="org.eclipse.equinox.p2.operations" version="2.0.0" match="compatible"/>
<import plugin="org.eclipse.equinox.p2.repository" version="2.0.0" match="compatible"/>
<import plugin="org.eclipse.equinox.frameworkadmin" version="2.0.0" match="compatible"/>
<import plugin="org.eclipse.equinox.frameworkadmin.equinox" version="1.0.100" match="compatible"/>
<import plugin="org.eclipse.pde.launching" version="3.6.0" match="compatible"/>
<import plugin="org.eclipse.ui.console" version="3.5.0" match="compatible"/>
<import plugin="org.eclipse.equinox.simpleconfigurator" version="1.0.200" match="compatible"/>
<import plugin="org.eclipse.equinox.p2.repository.tools" version="2.0.100" match="compatible"/>
<import plugin="org.eclipse.team.ui" version="3.6.100" match="compatible"/>
<import plugin="org.eclipse.debug.core" version="3.10.0" match="compatible"/>
<import plugin="org.eclipse.ui.trace" version="1.0.0" match="compatible"/>
<import plugin="org.eclipse.equinox.bidi" version="0.10.0"/>
<import plugin="org.eclipse.equinox.registry" version="3.3.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.emf.codegen.ecore" version="2.12.0" match="compatible"/>
<import plugin="org.eclipse.emf.edit.ui" version="2.12.0" match="compatible"/>
<import plugin="org.eclipse.emf.ecore.edit" version="2.9.0" match="compatible"/>
<import plugin="org.eclipse.equinox.common" version="3.3.0" match="compatible"/>
<import plugin="org.eclipse.core.jobs" version="3.3.0" match="compatible"/>
<import plugin="org.sat4j.core" version="2.3.5" match="compatible"/>
<import plugin="org.sat4j.pb" version="2.3.5" match="compatible"/>
<import plugin="org.eclipse.swt" version="3.2.0" match="compatible"/>
<import plugin="org.eclipse.jface" version="3.2.0" match="compatible"/>
<import plugin="org.eclipse.equinox.common" version="3.2.0" match="compatible"/>
<import plugin="org.eclipse.core.databinding.observable" version="1.3.0" match="compatible"/>
<import plugin="org.eclipse.core.databinding.property" version="1.3.0" match="compatible"/>
<import plugin="org.eclipse.core.databinding" version="1.2.0" match="compatible"/>
<import plugin="org.eclipse.equinox.registry" version="3.4.0" match="compatible"/>
<import plugin="com.google.guava" version="14.0.0"/>
<import plugin="com.google.inject" version="3.0.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.e4.ui.model.workbench" version="1.0.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.e4.core.contexts" version="0.9.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.e4.core.di" version="0.9.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.e4.ui.workbench" version="0.9.1" match="greaterOrEqual"/>
<import plugin="org.eclipse.e4.core.services" version="0.9.1" match="greaterOrEqual"/>
<import plugin="org.eclipse.osgi.services" version="3.2.100" match="compatible"/>
<import plugin="org.eclipse.e4.ui.workbench.renderers.swt" version="0.9.1" match="greaterOrEqual"/>
<import plugin="org.eclipse.e4.ui.widgets" version="0.11.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.e4.ui.css.swt" version="0.9.1" match="greaterOrEqual"/>
<import plugin="org.eclipse.e4.ui.css.core" version="0.9.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.swt" version="3.7.0" match="compatible"/>
<import plugin="org.eclipse.jface" version="3.7.0" match="compatible"/>
<import plugin="org.eclipse.core.runtime" version="3.7.0" match="compatible"/>
<import plugin="org.eclipse.e4.ui.di" version="0.10.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.e4.ui.services" version="1.0.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.emf.ecore.xmi" version="2.7.0" match="greaterOrEqual"/>
<import plugin="org.apache.ant" version="1.9.4" match="greaterOrEqual"/>
<import plugin="org.eclipse.ant.core" version="3.2.0" match="compatible"/>
<import plugin="org.eclipse.core.resources" version="3.2.0" match="compatible"/>
<import plugin="org.eclipse.ui.externaltools" version="3.2.0" match="compatible"/>
<import plugin="org.eclipse.ui" version="3.2.0" match="compatible"/>
<import plugin="org.eclipse.ui.console" version="3.1.0" match="compatible"/>
<import plugin="org.eclipse.debug.core" version="3.6.0" match="compatible"/>
<import plugin="org.eclipse.debug.ui" version="3.6.0" match="compatible"/>
<import plugin="org.eclipse.jdt.junit" version="3.5.0" match="compatible"/>
<import plugin="org.eclipse.ant.launching" version="1.0.0" match="compatible"/>
<import plugin="org.eclipse.core.externaltools" version="1.0.0" match="compatible"/>
<import plugin="org.eclipse.emf.edit" version="2.10.1" match="greaterOrEqual"/>
<import plugin="org.eclipse.equinox.preferences" version="3.2.200" match="compatible"/>
<import plugin="org.eclipse.ui" version="3.4.0" match="compatible"/>
<import plugin="org.eclipse.core.runtime" version="3.4.0" match="compatible"/>
<import plugin="org.eclipse.swt" version="3.6.0" match="compatible"/>
<import plugin="org.eclipse.equinox.common" version="3.6.0" match="compatible"/>
<import plugin="org.w3c.css.sac" version="1.3.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.equinox.registry" version="3.5.0" match="compatible"/>
<import plugin="org.eclipse.equinox.preferences" version="3.3.0" match="compatible"/>
<import plugin="org.eclipse.core.runtime" version="3.8.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.ui.editors" version="3.5.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.ui.ide" version="3.5.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.core.runtime" version="3.6.0" match="compatible"/>
<import plugin="org.eclipse.help" version="3.2.0" match="compatible"/>
<import plugin="org.eclipse.jface" version="3.9.0" match="compatible"/>
<import plugin="org.eclipse.swt" version="3.101.0" match="compatible"/>
<import plugin="org.eclipse.jface.databinding" version="1.3.0" match="compatible"/>
<import plugin="org.eclipse.core.databinding.property" version="1.2.0" match="compatible"/>
<import plugin="org.eclipse.core.databinding.observable" version="1.2.0" match="compatible"/>
<import plugin="org.eclipse.e4.core.services" version="1.0.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.e4.core.contexts" version="1.0.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.e4.core.di" version="1.1.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.e4.ui.workbench.swt" version="0.9.1" match="greaterOrEqual"/>
<import plugin="org.eclipse.e4.ui.di" version="0.9.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.e4.ui.model.workbench" version="0.9.1" match="greaterOrEqual"/>
<import plugin="org.eclipse.e4.ui.css.swt.theme" version="0.9.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.e4.ui.bindings" version="0.9.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.e4.ui.workbench3" version="0.12.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.e4.ui.workbench.addons.swt" version="0.10.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.emf.ecore" version="2.7.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.emf.ecore.xmi" version="2.11.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.e4.core.di.extensions" version="0.13.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.e4.ui.workbench.renderers.swt" version="0.10.0" match="compatible"/>
<import plugin="org.eclipse.equinox.common" version="3.3.0" match="greaterOrEqual"/>
<import plugin="org.tukaani.xz" version="1.3.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.text" version="3.1.0" match="compatible"/>
<import plugin="org.eclipse.core.filebuffers" version="3.2.0" match="compatible"/>
<import plugin="org.eclipse.ant.core" version="3.1.0" match="compatible"/>
<import plugin="org.eclipse.equinox.simpleconfigurator.manipulator" version="2.0.0" match="compatible"/>
<import plugin="org.eclipse.debug.core" version="3.5.0" match="compatible"/>
<import plugin="org.eclipse.equinox.p2.repository" version="2.0.0"/>
<import plugin="org.eclipse.equinox.p2.garbagecollector" version="1.0.100" match="compatible"/>
<import plugin="org.eclipse.equinox.p2.touchpoint.eclipse" version="2.0.0" match="compatible"/>
<import plugin="org.eclipse.emf.common" version="2.12.0" match="compatible"/>
<import plugin="org.eclipse.core.commands" version="3.5.0" match="compatible"/>
<import plugin="org.eclipse.equinox.common" version="3.8.0" match="compatible"/>
<import plugin="org.eclipse.ui" version="3.107.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.equinox.security.ui" version="1.0.0" match="compatible"/>
<import plugin="org.eclipse.core.resources" version="3.3.0" match="compatible"/>
<import plugin="org.eclipse.core.runtime" version="3.2.0" match="compatible"/>
<import plugin="org.eclipse.core.filesystem" version="1.1.0" match="compatible"/>
<import plugin="org.eclipse.compare.core" version="3.5.200" match="compatible"/>
<import plugin="org.eclipse.osgi" version="3.10.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.ui.ide" version="3.6.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.jdt.core" version="3.6.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.debug.ui" version="3.6.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.help" version="3.5.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.core.expressions" version="3.4.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.ui.editors" version="3.6.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.ui" version="3.6.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.compare" version="3.5.101" match="greaterOrEqual"/>
<import plugin="org.eclipse.jface.databinding" version="1.3.1" match="greaterOrEqual"/>
<import plugin="org.eclipse.core.databinding" version="1.2.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.core.databinding.beans" version="1.2.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.core.databinding.property" version="1.2.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.jdt.launching" version="3.5.0" match="greaterOrEqual"/>
<import plugin="org.apache.batik.util" version="1.7.0" match="equivalent"/>
<import plugin="org.eclipse.emf.common.ui" version="2.11.0" match="compatible"/>
<import plugin="org.eclipse.e4.core.services" version="0.9.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.e4.core.di" version="1.0.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.emf.ecore" version="2.9.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.e4.emf.xpath" version="0.1.100" match="greaterOrEqual"/>
<import plugin="org.eclipse.emf.ecore.editor" version="2.10.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.ui.views" version="3.3.100" match="compatible"/>
<import plugin="org.eclipse.core.expressions" version="3.4.100" match="compatible"/>
<import plugin="org.eclipse.debug.ui" version="3.5.0" match="compatible"/>
<import plugin="org.eclipse.jdt.core" version="3.12.0" match="compatible"/>
<import plugin="org.eclipse.jdt.ui" version="3.12.0" match="compatible"/>
<import plugin="org.eclipse.jdt.debug.ui" version="3.3.0" match="compatible"/>
<import plugin="org.eclipse.jdt.junit.runtime" version="3.4.100" match="compatible"/>
<import plugin="org.eclipse.compare" version="3.5.0" match="compatible"/>
<import plugin="org.eclipse.ltk.core.refactoring" version="3.5.0" match="compatible"/>
<import plugin="org.eclipse.core.variables" version="3.2.200" match="compatible"/>
<import plugin="org.eclipse.ltk.ui.refactoring" version="3.5.0" match="compatible"/>
<import plugin="org.eclipse.jdt.junit.core" version="3.6.0" match="compatible"/>
<import plugin="com.ibm.icu" version="4.4.2" match="greaterOrEqual"/>
<import plugin="org.eclipse.emf.ecore.xmi" version="2.10.2" match="greaterOrEqual"/>
<import plugin="org.eclipse.equinox.common" version="3.5.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.core.resources" version="3.4.0" match="compatible"/>
<import plugin="org.eclipse.jface.text" version="3.8.0" match="compatible"/>
<import plugin="org.eclipse.ui.ide" version="3.3.0" match="compatible"/>
<import plugin="org.eclipse.compare.core" version="3.5.0" match="compatible"/>
<import plugin="org.eclipse.e4.ui.workbench" version="0.9.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.e4.ui.services" version="0.9.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.swt" version="3.5.0" match="compatible"/>
<import plugin="org.eclipse.jface" version="3.5.0" match="compatible"/>
<import plugin="org.eclipse.e4.ui.workbench.swt" version="0.9.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.e4.ui.model.workbench" version="0.9.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.osgi.services" version="3.2.0" match="compatible"/>
<import plugin="org.eclipse.e4.core.commands" version="0.9.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.core.expressions" version="3.4.200" match="compatible"/>
<import plugin="org.eclipse.osgi" version="3.6.0" match="compatible"/>
<import plugin="org.eclipse.e4.ui.css.swt" version="0.11.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.e4.core.di.extensions" version="0.12.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.equinox.preferences" version="3.5.200" match="greaterOrEqual"/>
<import plugin="org.eclipse.osgi" version="3.8.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.core.runtime" version="3.3.0" match="compatible"/>
<import plugin="com.jcraft.jsch" version="0.1.50" match="compatible"/>
<import plugin="org.eclipse.core.net" version="1.0.0" match="compatible"/>
<import plugin="org.eclipse.swt" version="3.104.0" match="compatible"/>
<import plugin="org.eclipse.core.commands" version="3.4.0" match="compatible"/>
<import plugin="org.eclipse.ui" version="3.106.0" match="compatible"/>
<import plugin="org.eclipse.ui.workbench" version="3.7.0" match="compatible"/>
<import plugin="org.eclipse.jface.text" version="3.2.0" match="compatible"/>
<import plugin="org.eclipse.e4.core.services" version="2.0.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.e4.core.contexts" version="1.3.100" match="compatible"/>
<import plugin="org.eclipse.e4.ui.workbench" version="1.3.0" match="compatible"/>
<import plugin="org.eclipse.e4.core.commands" version="0.11.0" match="compatible"/>
<import plugin="org.eclipse.e4.ui.model.workbench" version="1.1.0" match="compatible"/>
<import plugin="org.eclipse.e4.core.di" version="1.6.0" match="compatible"/>
<import plugin="org.eclipse.e4.core.di.extensions" version="0.14.0" match="compatible"/>
<import plugin="org.eclipse.osgi.services" version="3.5.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.jdt.core" version="3.8.0" match="compatible"/>
<import plugin="org.eclipse.core.runtime" version="3.12.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.emf.mwe2.runtime" version="2.9.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.xtext" version="2.8.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.xtext.common.types" version="2.8.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.swt" version="3.4.1" match="compatible"/>
<import plugin="org.eclipse.ui" version="3.6.0" match="compatible"/>
<import plugin="org.eclipse.ui.forms" version="3.5.0" match="compatible"/>
<import plugin="org.eclipse.help" version="3.5.0" match="compatible"/>
<import plugin="org.eclipse.core.expressions" version="3.4.200" match="greaterOrEqual"/>
<import plugin="org.eclipse.equinox.common" version="3.7.0" match="compatible"/>
<import plugin="org.eclipse.swt" version="3.103.0" match="compatible"/>
<import plugin="org.eclipse.core.resources" version="3.9.0" match="compatible"/>
<import plugin="org.objectweb.asm" version="5.0.1" match="compatible"/>
<import plugin="org.eclipse.jdt.debug" version="3.7.100" match="compatible"/>
<import plugin="org.eclipse.core.variables" version="3.2.0" match="compatible"/>
<import plugin="org.eclipse.osgi" version="3.8.0" match="compatible"/>
<import plugin="org.eclipse.core.resources" version="3.6.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.jdt.ui" version="3.6.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.search" version="3.5.1" match="greaterOrEqual"/>
<import plugin="org.eclipse.ltk.ui.refactoring" version="3.4.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.jdt.core.manipulation" version="1.3.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.swt" version="3.0.0" match="compatible"/>
<import plugin="org.eclipse.core.filebuffers" version="3.5.0" match="compatible"/>
<import plugin="org.eclipse.jdt.debug" version="3.10.0" match="compatible"/>
<import plugin="org.eclipse.jdt.launching" version="3.7.0" match="compatible"/>
<import plugin="org.eclipse.jdt.ui" version="3.8.0" match="compatible"/>
<import plugin="org.eclipse.ui.console" version="3.4.0" match="compatible"/>
<import plugin="org.eclipse.jdt.core.manipulation" version="1.3.0" match="compatible"/>
<import plugin="org.eclipse.search" version="3.5.0" match="compatible"/>
<import plugin="org.eclipse.ui.forms" version="3.4.0" match="compatible"/>
<import plugin="org.eclipse.core.jobs" version="3.5.0" match="greaterOrEqual"/>
<import plugin="org.junit" version="3.8.2" match="greaterOrEqual"/>
<import plugin="org.eclipse.ui.console" version="3.5.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.osgi" version="3.7.0" match="compatible"/>
<import plugin="org.eclipse.core.jobs" version="3.2.0" match="compatible"/>
<import plugin="org.eclipse.equinox.preferences" version="3.4.0" match="compatible"/>
<import plugin="org.eclipse.core.contenttype" version="3.3.0" match="compatible"/>
<import plugin="org.eclipse.equinox.app" version="1.0.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.equinox.p2.metadata.repository" version="0.1.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.equinox.p2.artifact.repository" version="0.1.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.ltk.core.refactoring" version="3.7.0" match="compatible"/>
<import plugin="org.eclipse.ui.navigator" version="3.3.200" match="compatible"/>
<import plugin="org.eclipse.team.core" version="3.4.100" match="compatible"/>
<import plugin="org.eclipse.team.ui" version="3.4.100" match="compatible"/>
<import plugin="org.eclipse.ui.forms" version="3.3.0" match="compatible"/>
<import plugin="org.eclipse.ui" version="3.3.0" match="compatible"/>
<import plugin="org.apache.commons.lang" version="2.0.0" match="compatible"/>
<import plugin="org.apache.commons.logging" version="1.0.0" match="compatible"/>
<import plugin="org.eclipse.core.filesystem" version="1.3.0" match="compatible"/>
<import plugin="org.hamcrest.core" version="1.3.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.equinox.preferences" version="3.3.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.ui.ide" version="3.6.0" match="compatible"/>
<import plugin="org.eclipse.core.resources" version="3.6.0" match="compatible"/>
<import plugin="org.eclipse.jface" version="3.6.0" match="compatible"/>
<import plugin="org.eclipse.ui.navigator" version="3.5.0" match="compatible"/>
<import plugin="org.eclipse.ui.views.properties.tabbed" version="3.5.0" match="compatible"/>
<import plugin="org.eclipse.ui.workbench.texteditor" version="3.6.0" match="compatible"/>
<import plugin="org.eclipse.jface" version="3.10.100" match="compatible"/>
<import plugin="org.eclipse.ui.workbench" version="3.105.0" match="compatible"/>
<import plugin="org.eclipse.ui.workbench.texteditor" version="3.6.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.core.expressions" version="3.4.100" match="greaterOrEqual"/>
<import plugin="org.eclipse.ui.navigator" version="3.4.1" match="greaterOrEqual"/>
<import plugin="org.eclipse.e4.core.di.extensions" version="0.13.200" match="greaterOrEqual"/>
<import plugin="org.eclipse.core.runtime" version="3.4.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.core.resources" version="3.4.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.ui" version="3.4.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.ui.editors" version="3.4.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.jface.text" version="3.4.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.ui.ide" version="3.4.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.ui.views" version="3.3.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.emf.edit.ui" version="2.10.2" match="greaterOrEqual"/>
<import plugin="org.eclipse.ui.workbench.texteditor" version="3.4.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.ui.forms" version="3.4.1" match="greaterOrEqual"/>
<import plugin="org.eclipse.e4.ui.css.core" version="0.10.100" match="greaterOrEqual"/>
<import plugin="org.eclipse.e4.ui.css.swt" version="0.11.100" match="greaterOrEqual"/>
<import plugin="org.apache.commons.jxpath" version="1.2.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.emf.ecore" version="2.6.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.e4.core.di.annotations" version="1.4.0" match="compatible"/>
<import plugin="org.eclipse.core.runtime" version="3.1.0" match="compatible"/>
<import plugin="org.eclipse.core.externaltools" version="1.0.300" match="compatible"/>
<import plugin="org.apache.lucene.core" version="3.5.0" match="compatible"/>
<import plugin="org.eclipse.ui.views" version="3.4.0" match="compatible"/>
<import plugin="org.eclipse.ui.workbench" version="3.5.0" match="compatible"/>
<import plugin="org.eclipse.emf.edit" version="2.12.0" match="compatible"/>
<import plugin="org.eclipse.core.jobs" version="3.4.0" match="compatible"/>
<import plugin="org.eclipse.search" version="3.10.0" match="compatible"/>
<import plugin="org.eclipse.debug.ui" version="3.11.0" match="compatible"/>
<import plugin="org.eclipse.jdt.launching" version="3.8.0" match="compatible"/>
<import plugin="org.eclipse.jface" version="3.11.0" match="compatible"/>
<import plugin="org.eclipse.ui.workbench.texteditor" version="3.10.0" match="compatible"/>
<import plugin="org.eclipse.ltk.ui.refactoring" version="3.8.0" match="compatible"/>
<import plugin="org.eclipse.ui.navigator.resources" version="3.4.0" match="compatible"/>
<import plugin="org.eclipse.jdt.core.manipulation" version="1.7.0" match="compatible"/>
<import plugin="org.w3c.dom.smil" version="1.0.0" match="equivalent"/>
<import plugin="org.eclipse.core.runtime" version="3.12.0" match="compatible"/>
<import plugin="org.eclipse.core.resources" version="3.8.100" match="compatible"/>
<import plugin="org.eclipse.e4.ui.model.workbench" version="1.2.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.osgi" version="3.4.0" match="compatible"/>
<import plugin="org.eclipse.e4.core.commands" version="0.11.100" match="greaterOrEqual"/>
<import plugin="org.eclipse.emf.ecore.change" version="2.5.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.core.runtime" version="3.3.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.equinox.preferences" version="3.2.0" match="compatible"/>
<import plugin="org.eclipse.equinox.registry" version="3.2.0" match="compatible"/>
<import plugin="org.eclipse.xtext.ide" version="2.11.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.ant.core" version="3.1.100" match="compatible"/>
<import plugin="org.eclipse.osgi" version="3.3.0" match="compatible"/>
<import plugin="org.eclipse.equinox.p2.jarprocessor" version="1.0.1" match="compatible"/>
<import plugin="org.eclipse.equinox.p2.publisher" version="1.1.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.equinox.p2.director.app" version="1.0.200" match="greaterOrEqual"/>
<import plugin="org.eclipse.equinox.p2.publisher.eclipse" version="1.0.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.osgi" version="3.2.0" match="compatible"/>
<import plugin="org.eclipse.team.core" version="3.6.0" match="compatible"/>
<import plugin="org.eclipse.compare" version="3.3.0" match="compatible"/>
<import plugin="org.eclipse.ui.navigator" version="3.3.0" match="compatible"/>
<import plugin="org.eclipse.jface.text" version="3.3.0" match="compatible"/>
<import plugin="org.eclipse.ui.editors" version="3.3.0" match="compatible"/>
<import plugin="org.eclipse.ltk.core.refactoring" version="3.6.0" match="compatible"/>
<import plugin="org.eclipse.debug.core" version="3.2.0" match="compatible"/>
<import plugin="org.eclipse.pde.core" version="3.2.0" match="compatible"/>
<import plugin="org.eclipse.jdt.debug" version="3.2.0" match="compatible"/>
<import plugin="org.eclipse.help.base" version="4.0.0" match="compatible"/>
<import plugin="org.eclipse.equinox.app" version="1.3.0" match="compatible"/>
<import plugin="org.eclipse.e4.ui.workbench" version="0.10.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.e4.ui.services" version="0.1.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.e4.ui.css.swt" version="0.9.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.e4.ui.workbench3" version="0.11.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.core.jobs" version="3.5.0" match="compatible"/>
<import plugin="org.eclipse.core.filesystem" version="1.3.0" match="greaterOrEqual"/>
<import plugin="org.apache.lucene.analysis" version="3.5.0" match="compatible"/>
<import plugin="org.eclipse.core.net" version="1.2.200" match="greaterOrEqual"/>
<import plugin="org.apache.batik.css" version="1.7.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.emf.mwe.utils" version="1.3.0" match="greaterOrEqual"/>
</requires>
<plugin <plugin
id="org.eclipse.e4.core.di.extensions" id="org.eclipse.e4.core.di.extensions"
download-size="0" download-size="0"
@ -433,13 +46,6 @@
version="0.0.0" version="0.0.0"
unpack="false"/> unpack="false"/>
<plugin
id="org.apache.batik.util"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin <plugin
id="org.eclipse.equinox.p2.director.app" id="org.eclipse.equinox.p2.director.app"
download-size="0" download-size="0"
@ -531,13 +137,6 @@
version="0.0.0" version="0.0.0"
unpack="false"/> unpack="false"/>
<plugin
id="com.minres.rdl.ide"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin <plugin
id="org.eclipse.equinox.p2.repository" id="org.eclipse.equinox.p2.repository"
download-size="0" download-size="0"
@ -657,13 +256,6 @@
version="0.0.0" version="0.0.0"
unpack="false"/> unpack="false"/>
<plugin
id="com.minres.rdl.ui"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin <plugin
id="org.eclipse.ui.workbench" id="org.eclipse.ui.workbench"
download-size="0" download-size="0"
@ -713,13 +305,6 @@
version="0.0.0" version="0.0.0"
unpack="false"/> unpack="false"/>
<plugin
id="javax.xml"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin <plugin
id="org.eclipse.core.jobs" id="org.eclipse.core.jobs"
download-size="0" download-size="0"
@ -784,13 +369,6 @@
version="0.0.0" version="0.0.0"
unpack="false"/> unpack="false"/>
<plugin
id="org.apache.batik.css"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin <plugin
id="org.eclipse.emf.common" id="org.eclipse.emf.common"
download-size="0" download-size="0"
@ -915,13 +493,6 @@
install-size="0" install-size="0"
version="0.0.0"/> version="0.0.0"/>
<plugin
id="com.minres.rdl.product"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin <plugin
id="org.eclipse.emf.mwe2.language" id="org.eclipse.emf.mwe2.language"
download-size="0" download-size="0"
@ -1313,13 +884,6 @@
version="0.0.0" version="0.0.0"
unpack="false"/> unpack="false"/>
<plugin
id="com.minres.rdl"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin <plugin
id="org.eclipse.ui.navigator.resources" id="org.eclipse.ui.navigator.resources"
download-size="0" download-size="0"
@ -1411,13 +975,6 @@
version="0.0.0" version="0.0.0"
unpack="false"/> unpack="false"/>
<plugin
id="org.apache.batik.util.gui"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin <plugin
id="org.eclipse.e4.emf.xpath" id="org.eclipse.e4.emf.xpath"
download-size="0" download-size="0"
@ -1446,13 +1003,6 @@
version="0.0.0" version="0.0.0"
unpack="false"/> unpack="false"/>
<plugin
id="org.apache.lucene.analysis"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin <plugin
id="org.eclipse.emf.edit.ui" id="org.eclipse.emf.edit.ui"
download-size="0" download-size="0"
@ -1901,4 +1451,11 @@
version="0.0.0" version="0.0.0"
unpack="false"/> unpack="false"/>
<plugin
id="org.antlr.runtime"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
</feature> </feature>

View File

@ -12,11 +12,7 @@
<attribute name="maven.pomderived" value="true"/> <attribute name="maven.pomderived" value="true"/>
</attributes> </attributes>
</classpathentry> </classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"> <classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes> <attributes>
<attribute name="maven.pomderived" value="true"/> <attribute name="maven.pomderived" value="true"/>

View File

@ -1,5 +1,8 @@
eclipse.preferences.version=1 eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.compliance=1.5 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
org.eclipse.jdt.core.compiler.compliance=1.8
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
org.eclipse.jdt.core.compiler.source=1.5 org.eclipse.jdt.core.compiler.source=1.8

View File

@ -1,25 +1,28 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?> <?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde version="3.8"?><target name="com.minres.rdl.target" sequenceNumber="3"> <?pde version="3.8"?><target name="com.minres.rdl.target" sequenceNumber="2">
<locations> <locations>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit"> <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.emf.mwe2.launcher.feature.group" version="0.0.0"/> <unit id="org.eclipse.emf.mwe2.launcher.feature.group" version="0.0.0"/>
<repository location="http://download.eclipse.org/modeling/emft/mwe/updates/releases/2.9.0/"/> <repository location="http://download.eclipse.org/modeling/emft/mwe/updates/releases/2.9.1/"/>
</location> </location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit"> <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.xtext.sdk.feature.group" version="0.0.0"/> <unit id="org.eclipse.xtext.sdk.feature.group" version="0.0.0"/>
<repository location="http://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.12.0/"/> <repository location="http://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.13.0/"/>
</location> </location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit"> <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.equinox.sdk.feature.group" version="0.0.0"/>
<unit id="org.eclipse.jdt.feature.group" version="0.0.0"/>
<unit id="org.eclipse.platform.feature.group" version="0.0.0"/>
<unit id="org.eclipse.pde.feature.group" version="0.0.0"/> <unit id="org.eclipse.pde.feature.group" version="0.0.0"/>
<unit id="org.eclipse.draw2d.feature.group" version="0.0.0"/> <unit id="org.eclipse.jdt.feature.group" version="0.0.0"/>
<unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/> <unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
<unit id="org.eclipse.xpand" version="0.0.0"/> <unit id="org.eclipse.rcp.feature.group" version="0.0.0"/>
<unit id="org.eclipse.xtend" version="0.0.0"/> <unit id="org.eclipse.e4.rcp.feature.group" version="0.0.0"/>
<unit id="org.eclipse.xtend.typesystem.emf" version="0.0.0"/> <unit id="org.eclipse.platform.feature.group" version="0.0.0"/>
<repository location="http://download.eclipse.org/releases/neon/201606221000/"/> <unit id="org.eclipse.equinox.executable.feature.group" version="0.0.0"/>
<repository location="http://download.eclipse.org/releases/oxygen"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.codehaus.groovy.eclipse.feature.feature.group" version="0.0.0"/>
<unit id="org.codehaus.groovy25.feature.feature.group" version="0.0.0"/>
<repository location="http://dist.springsource.org/release/GRECLIPSE/2.9.2/e4.7"/>
</location> </location>
</locations> </locations>
</target> </target>

View File

@ -9,7 +9,7 @@ Require-Bundle: com.minres.rdl,
org.junit;bundle-version="4.12.0", org.junit;bundle-version="4.12.0",
org.eclipse.xtext.testing, org.eclipse.xtext.testing,
org.eclipse.xtext.xbase.testing, org.eclipse.xtext.xbase.testing,
org.eclipse.xtext.xbase.lib org.eclipse.xtext.xbase.lib;bundle-version="2.13.0"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Export-Package: com.minres.rdl.tests;x-internal=true Export-Package: com.minres.rdl.tests;x-internal=true
Import-Package: org.hamcrest.core, Import-Package: org.hamcrest.core,

View File

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

View File

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

View File

@ -16,7 +16,7 @@ Require-Bundle: com.minres.rdl,
org.eclipse.compare, org.eclipse.compare,
org.eclipse.xtext.builder, org.eclipse.xtext.builder,
org.eclipse.xtend.lib;resolution:=optional, org.eclipse.xtend.lib;resolution:=optional,
org.eclipse.xtext.xbase.lib org.eclipse.xtext.xbase.lib;bundle-version="2.13.0"
Import-Package: org.apache.log4j Import-Package: org.apache.log4j
Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Export-Package: com.minres.rdl.ui.internal, Export-Package: com.minres.rdl.ui.internal,

View File

@ -1,5 +1,5 @@
/* /*
* generated by Xtext 2.12.0 * generated by Xtext 2.13.0
*/ */
package com.minres.rdl.ui; package com.minres.rdl.ui;
@ -210,6 +210,13 @@ public abstract class AbstractRDLUiModule extends DefaultUiModule {
return RDLProposalProvider.class; return RDLProposalProvider.class;
} }
// contributed by org.eclipse.xtext.xtext.generator.ui.refactoring.RefactorElementNameFragment2
public void configureIPreferenceStoreInitializer(Binder binder) {
binder.bind(IPreferenceStoreInitializer.class)
.annotatedWith(Names.named("RefactoringPreferences"))
.to(RefactoringPreferences.Initializer.class);
}
// contributed by org.eclipse.xtext.xtext.generator.ui.refactoring.RefactorElementNameFragment2 // contributed by org.eclipse.xtext.xtext.generator.ui.refactoring.RefactorElementNameFragment2
public Class<? extends IRenameStrategy> bindIRenameStrategy() { public Class<? extends IRenameStrategy> bindIRenameStrategy() {
return DefaultRenameStrategy.class; return DefaultRenameStrategy.class;
@ -220,13 +227,6 @@ public abstract class AbstractRDLUiModule extends DefaultUiModule {
return DefaultReferenceUpdater.class; return DefaultReferenceUpdater.class;
} }
// contributed by org.eclipse.xtext.xtext.generator.ui.refactoring.RefactorElementNameFragment2
public void configureIPreferenceStoreInitializer(Binder binder) {
binder.bind(IPreferenceStoreInitializer.class)
.annotatedWith(Names.named("RefactoringPreferences"))
.to(RefactoringPreferences.Initializer.class);
}
// contributed by org.eclipse.xtext.xtext.generator.ui.refactoring.RefactorElementNameFragment2 // contributed by org.eclipse.xtext.xtext.generator.ui.refactoring.RefactorElementNameFragment2
public Class<? extends IRenameRefactoringProvider> bindIRenameRefactoringProvider() { public Class<? extends IRenameRefactoringProvider> bindIRenameRefactoringProvider() {
return DefaultRenameRefactoringProvider.class; return DefaultRenameRefactoringProvider.class;

View File

@ -1,10 +1,11 @@
/* /*
* generated by Xtext 2.12.0 * generated by Xtext 2.13.0
*/ */
package com.minres.rdl.ui; package com.minres.rdl.ui;
import com.google.inject.Injector; import com.google.inject.Injector;
import com.minres.rdl.ui.internal.RdlActivator; import com.minres.rdl.ui.internal.RdlActivator;
import org.eclipse.core.runtime.Platform;
import org.eclipse.xtext.ui.guice.AbstractGuiceAwareExecutableExtensionFactory; import org.eclipse.xtext.ui.guice.AbstractGuiceAwareExecutableExtensionFactory;
import org.osgi.framework.Bundle; import org.osgi.framework.Bundle;
@ -16,12 +17,13 @@ public class RDLExecutableExtensionFactory extends AbstractGuiceAwareExecutableE
@Override @Override
protected Bundle getBundle() { protected Bundle getBundle() {
return RdlActivator.getInstance().getBundle(); return Platform.getBundle(RdlActivator.PLUGIN_ID);
} }
@Override @Override
protected Injector getInjector() { protected Injector getInjector() {
return RdlActivator.getInstance().getInjector(RdlActivator.COM_MINRES_RDL_RDL); RdlActivator activator = RdlActivator.getInstance();
return activator != null ? activator.getInjector(RdlActivator.COM_MINRES_RDL_RDL) : null;
} }
} }

View File

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

View File

@ -1,5 +1,5 @@
/* /*
* generated by Xtext 2.12.0 * generated by Xtext 2.13.0
*/ */
package com.minres.rdl.ui.internal; package com.minres.rdl.ui.internal;
@ -23,6 +23,7 @@ import org.osgi.framework.BundleContext;
*/ */
public class RdlActivator extends AbstractUIPlugin { public class RdlActivator extends AbstractUIPlugin {
public static final String PLUGIN_ID = "com.minres.rdl.ui";
public static final String COM_MINRES_RDL_RDL = "com.minres.rdl.RDL"; public static final String COM_MINRES_RDL_RDL = "com.minres.rdl.RDL";
private static final Logger logger = Logger.getLogger(RdlActivator.class); private static final Logger logger = Logger.getLogger(RdlActivator.class);
@ -90,4 +91,5 @@ public class RdlActivator extends AbstractUIPlugin {
return new SharedStateModule(); return new SharedStateModule();
} }
} }

View File

@ -25,7 +25,7 @@ public class RDLUiModule extends AbstractRDLUiModule {
return RDLEObjectDocumentationProvider.class; return RDLEObjectDocumentationProvider.class;
} }
public RDLUiModule(final AbstractUIPlugin arg0) { public RDLUiModule(final AbstractUIPlugin plugin) {
super(arg0); super(plugin);
} }
} }

View File

@ -9,10 +9,10 @@ Require-Bundle: org.eclipse.xtext,
org.eclipse.xtext.xbase, org.eclipse.xtext.xbase,
org.eclipse.equinox.common;bundle-version="3.5.0", org.eclipse.equinox.common;bundle-version="3.5.0",
org.eclipse.emf.ecore, org.eclipse.emf.ecore,
org.eclipse.xtext.xbase.lib, org.eclipse.xtext.xbase.lib;bundle-version="2.13.0",
org.antlr.runtime, org.antlr.runtime,
org.eclipse.xtext.util, org.eclipse.xtext.util,
org.eclipse.xtend.lib, org.eclipse.xtend.lib;bundle-version="2.13.0",
org.eclipse.emf.common, org.eclipse.emf.common,
org.eclipse.equinox.preferences org.eclipse.equinox.preferences
Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-RequiredExecutionEnvironment: JavaSE-1.8

View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" <genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="generated by Xtext 2.12.0" modelDirectory="/com.minres.rdl/src-gen" xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="generated by Xtext 2.13.0" modelDirectory="/com.minres.rdl/src-gen"
modelPluginID="com.minres.rdl" forceOverwrite="true" modelName="RDL" updateClasspath="false" modelPluginID="com.minres.rdl" forceOverwrite="true" modelName="RDL" updateClasspath="false"
rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" complianceLevel="6.0" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" complianceLevel="6.0"
copyrightFields="false" runtimeVersion="2.12"> copyrightFields="false" runtimeVersion="2.12">

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -61,7 +61,8 @@ enum ComponentDefinitionType:
Instantiation: 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)* ) componentInstances+=ComponentInstance (',' componentInstances+=ComponentInstance)*
; ;

View File

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

View File

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

View File

@ -92,7 +92,8 @@
<artifact> <artifact>
<groupId>com.minres.rdl</groupId> <groupId>com.minres.rdl</groupId>
<artifactId>com.minres.rdl.target</artifactId> <artifactId>com.minres.rdl.target</artifactId>
<version>${project.version}</version> <!-- <version>${project.version}</version> -->
<version>1.0.0-SNAPSHOT</version>
</artifact> </artifact>
</target> </target>
<environments> <environments>