diff --git a/build/org.eclipse.elk.targetplatform/org.eclipse.elk.targetplatform.target b/build/org.eclipse.elk.targetplatform/org.eclipse.elk.targetplatform.target index b7a2a2084e..1fdbcaa94e 100644 --- a/build/org.eclipse.elk.targetplatform/org.eclipse.elk.targetplatform.target +++ b/build/org.eclipse.elk.targetplatform/org.eclipse.elk.targetplatform.target @@ -1,21 +1,19 @@ - + - - - - - - + + + + + - - + diff --git a/plugins/org.eclipse.elk.core.debug.grandom.ide/src-gen/org/eclipse/elk/core/debug/grandom/ide/AbstractGRandomIdeModule.java b/plugins/org.eclipse.elk.core.debug.grandom.ide/src-gen/org/eclipse/elk/core/debug/grandom/ide/AbstractGRandomIdeModule.java index 8196096946..32da75bebf 100644 --- a/plugins/org.eclipse.elk.core.debug.grandom.ide/src-gen/org/eclipse/elk/core/debug/grandom/ide/AbstractGRandomIdeModule.java +++ b/plugins/org.eclipse.elk.core.debug.grandom.ide/src-gen/org/eclipse/elk/core/debug/grandom/ide/AbstractGRandomIdeModule.java @@ -9,6 +9,8 @@ *******************************************************************************/ package org.eclipse.elk.core.debug.grandom.ide; +import com.google.inject.Binder; +import com.google.inject.name.Names; import org.eclipse.elk.core.debug.grandom.ide.contentassist.antlr.GRandomParser; import org.eclipse.elk.core.debug.grandom.ide.contentassist.antlr.internal.InternalGRandomLexer; import org.eclipse.xtext.ide.DefaultIdeModule; @@ -20,11 +22,8 @@ import org.eclipse.xtext.ide.editor.contentassist.antlr.IContentAssistParser; import org.eclipse.xtext.ide.editor.contentassist.antlr.internal.Lexer; import org.eclipse.xtext.ide.refactoring.IRenameStrategy2; -import org.eclipse.xtext.ide.server.rename.IRenameService2; -import org.eclipse.xtext.ide.server.rename.RenameService2; - -import com.google.inject.Binder; -import com.google.inject.name.Names; +import org.eclipse.xtext.ide.server.rename.IRenameService; +import org.eclipse.xtext.ide.server.rename.RenameService; /** * Manual modifications go to {@link GRandomIdeModule}. @@ -55,8 +54,8 @@ public Class bindIPrefixMatcher() { } // contributed by org.eclipse.xtext.xtext.generator.ui.refactoring.RefactorElementNameFragment2 - public Class bindIRenameService() { - return RenameService2.class; + public Class bindIRenameService() { + return RenameService.class; } // contributed by org.eclipse.xtext.xtext.generator.ui.refactoring.RefactorElementNameFragment2 diff --git a/plugins/org.eclipse.elk.core.meta.ui/src-gen/org/eclipse/elk/core/meta/ide/AbstractMetaDataIdeModule.java b/plugins/org.eclipse.elk.core.meta.ui/src-gen/org/eclipse/elk/core/meta/ide/AbstractMetaDataIdeModule.java index 946e966a84..2407577598 100644 --- a/plugins/org.eclipse.elk.core.meta.ui/src-gen/org/eclipse/elk/core/meta/ide/AbstractMetaDataIdeModule.java +++ b/plugins/org.eclipse.elk.core.meta.ui/src-gen/org/eclipse/elk/core/meta/ide/AbstractMetaDataIdeModule.java @@ -9,6 +9,8 @@ *******************************************************************************/ package org.eclipse.elk.core.meta.ide; +import com.google.inject.Binder; +import com.google.inject.name.Names; import org.eclipse.elk.core.meta.ide.contentassist.antlr.MetaDataParser; import org.eclipse.elk.core.meta.ide.contentassist.antlr.internal.InternalMetaDataLexer; import org.eclipse.xtext.ide.LexerIdeBindings; @@ -19,13 +21,10 @@ import org.eclipse.xtext.ide.editor.contentassist.antlr.IContentAssistParser; import org.eclipse.xtext.ide.editor.contentassist.antlr.internal.Lexer; import org.eclipse.xtext.ide.refactoring.IRenameStrategy2; -import org.eclipse.xtext.ide.server.rename.IRenameService2; -import org.eclipse.xtext.ide.server.rename.RenameService2; +import org.eclipse.xtext.ide.server.rename.IRenameService; +import org.eclipse.xtext.ide.server.rename.RenameService; import org.eclipse.xtext.xbase.ide.DefaultXbaseIdeModule; -import com.google.inject.Binder; -import com.google.inject.name.Names; - /** * Manual modifications go to {@link MetaDataIdeModule}. */ @@ -55,8 +54,8 @@ public Class bindIPrefixMatcher() { } // contributed by org.eclipse.xtext.xtext.generator.ui.refactoring.RefactorElementNameFragment2 - public Class bindIRenameService() { - return RenameService2.class; + public Class bindIRenameService() { + return RenameService.class; } // contributed by org.eclipse.xtext.xtext.generator.ui.refactoring.RefactorElementNameFragment2 diff --git a/plugins/org.eclipse.elk.graph.json.text/build.properties b/plugins/org.eclipse.elk.graph.json.text/build.properties index a04f5f87be..652c6e679b 100644 --- a/plugins/org.eclipse.elk.graph.json.text/build.properties +++ b/plugins/org.eclipse.elk.graph.json.text/build.properties @@ -17,4 +17,4 @@ additional.bundles = org.eclipse.xtext.xbase,\ org.apache.commons.logging,\ org.apache.log4j,\ com.ibm.icu,\ - org.eclipse.xtext.xtext.generator + org.eclipse.xtext.generator