Update to XText 2.13

This commit is contained in:
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.ui;
@ -210,6 +210,13 @@ public abstract class AbstractRDLUiModule extends DefaultUiModule {
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
public Class<? extends IRenameStrategy> bindIRenameStrategy() {
return DefaultRenameStrategy.class;
@ -220,13 +227,6 @@ public abstract class AbstractRDLUiModule extends DefaultUiModule {
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
public Class<? extends IRenameRefactoringProvider> bindIRenameRefactoringProvider() {
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;
import com.google.inject.Injector;
import com.minres.rdl.ui.internal.RdlActivator;
import org.eclipse.core.runtime.Platform;
import org.eclipse.xtext.ui.guice.AbstractGuiceAwareExecutableExtensionFactory;
import org.osgi.framework.Bundle;
@ -16,12 +17,13 @@ public class RDLExecutableExtensionFactory extends AbstractGuiceAwareExecutableE
@Override
protected Bundle getBundle() {
return RdlActivator.getInstance().getBundle();
return Platform.getBundle(RdlActivator.PLUGIN_ID);
}
@Override
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;

View File

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