diff options
author | Dennis Huebner | 2015-02-25 10:52:49 +0000 |
---|---|---|
committer | Dennis Huebner | 2015-02-25 10:52:49 +0000 |
commit | 5ea9a54f2bb01610e6bdac2c9e74485e93a8a271 (patch) | |
tree | be087537778179dd7eca2af6e6ef3820f0815b6c | |
parent | a35c0a37cd4e4590cc83905786c29b91a10f2465 (diff) | |
download | org.eclipse.emf-5ea9a54f2bb01610e6bdac2c9e74485e93a8a271.tar.gz org.eclipse.emf-5ea9a54f2bb01610e6bdac2c9e74485e93a8a271.tar.xz org.eclipse.emf-5ea9a54f2bb01610e6bdac2c9e74485e93a8a271.zip |
[xcore] Regenerated with latest xtext (ide moved back to ui)
[releng] Use development time dependency for mwe2.launch
Change-Id: Idc9cff725eebb5eef6b18e20b9a05878c3bb72ba
Signed-off-by: Dennis Huebner <dennis.huebner@itemis.de>
10 files changed, 67 insertions, 67 deletions
diff --git a/features/org.eclipse.emf.ecore.xcore-feature/pom.xml b/features/org.eclipse.emf.ecore.xcore-feature/pom.xml index c921aca56..b3a1edb42 100644 --- a/features/org.eclipse.emf.ecore.xcore-feature/pom.xml +++ b/features/org.eclipse.emf.ecore.xcore-feature/pom.xml @@ -113,9 +113,11 @@ <artifactId>tycho-maven-plugin</artifactId> <version>${tycho-version}</version> <extensions>true</extensions> - <configuration> - - </configuration> + </plugin> + <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>tycho-versions-plugin</artifactId> + <version>${tycho-version}</version> </plugin> <plugin> <groupId>org.codehaus.mojo</groupId> diff --git a/plugins/org.eclipse.emf.ecore.xcore.ui/src-gen/org/eclipse/emf/ecore/xcore/ui/AbstractXcoreUiModule.java b/plugins/org.eclipse.emf.ecore.xcore.ui/src-gen/org/eclipse/emf/ecore/xcore/ui/AbstractXcoreUiModule.java index 12073d6b7..1557dce66 100644 --- a/plugins/org.eclipse.emf.ecore.xcore.ui/src-gen/org/eclipse/emf/ecore/xcore/ui/AbstractXcoreUiModule.java +++ b/plugins/org.eclipse.emf.ecore.xcore.ui/src-gen/org/eclipse/emf/ecore/xcore/ui/AbstractXcoreUiModule.java @@ -44,12 +44,12 @@ public abstract class AbstractXcoreUiModule extends org.eclipse.xtext.xbase.ui.D // contributed by org.eclipse.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment
public void configureHighlightingLexer(com.google.inject.Binder binder) {
- binder.bind(org.eclipse.xtext.parser.antlr.Lexer.class).annotatedWith(com.google.inject.name.Names.named(org.eclipse.xtext.ide.LexerIdeBindings.HIGHLIGHTING)).to(org.eclipse.emf.ecore.xcore.parser.antlr.internal.InternalXcoreLexer.class);
+ binder.bind(org.eclipse.xtext.parser.antlr.Lexer.class).annotatedWith(com.google.inject.name.Names.named(org.eclipse.xtext.ui.LexerUIBindings.HIGHLIGHTING)).to(org.eclipse.emf.ecore.xcore.parser.antlr.internal.InternalXcoreLexer.class);
}
// contributed by org.eclipse.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment
public void configureHighlightingTokenDefProvider(com.google.inject.Binder binder) {
- binder.bind(org.eclipse.xtext.parser.antlr.ITokenDefProvider.class).annotatedWith(com.google.inject.name.Names.named(org.eclipse.xtext.ide.LexerIdeBindings.HIGHLIGHTING)).to(org.eclipse.xtext.parser.antlr.AntlrTokenDefProvider.class);
+ binder.bind(org.eclipse.xtext.parser.antlr.ITokenDefProvider.class).annotatedWith(com.google.inject.name.Names.named(org.eclipse.xtext.ui.LexerUIBindings.HIGHLIGHTING)).to(org.eclipse.xtext.parser.antlr.AntlrTokenDefProvider.class);
}
// contributed by org.eclipse.xtext.ui.generator.labeling.LabelProviderFragment
@@ -79,11 +79,11 @@ public abstract class AbstractXcoreUiModule extends org.eclipse.xtext.xbase.ui.D // contributed by org.eclipse.xtext.generator.parser.antlr.XtextAntlrUiGeneratorFragment
public Class<? extends org.eclipse.xtext.ui.editor.contentassist.ContentAssistContext.Factory> bindContentAssistContext$Factory() {
- return org.eclipse.xtext.ui.editor.contentassist.antlr.DelegatingContentAssistContextFactory.class;
+ return org.eclipse.xtext.ui.editor.contentassist.antlr.ParserBasedContentAssistContextFactory.class;
}
// contributed by org.eclipse.xtext.generator.parser.antlr.XtextAntlrUiGeneratorFragment
- public Class<? extends org.eclipse.xtext.ide.editor.contentassist.antlr.IContentAssistParser> bindIContentAssistParser() {
+ public Class<? extends org.eclipse.xtext.ui.editor.contentassist.antlr.IContentAssistParser> bindIContentAssistParser() {
return org.eclipse.emf.ecore.xcore.ui.contentassist.antlr.XcoreParser.class;
}
@@ -94,12 +94,12 @@ public abstract class AbstractXcoreUiModule extends org.eclipse.xtext.xbase.ui.D // contributed by org.eclipse.xtext.generator.parser.antlr.XtextAntlrUiGeneratorFragment
public void configureContentAssistLexer(com.google.inject.Binder binder) {
- binder.bind(org.eclipse.xtext.ide.editor.contentassist.antlr.internal.Lexer.class).annotatedWith(com.google.inject.name.Names.named(org.eclipse.xtext.ide.LexerIdeBindings.CONTENT_ASSIST)).to(org.eclipse.emf.ecore.xcore.ui.contentassist.antlr.internal.InternalXcoreLexer.class);
+ binder.bind(org.eclipse.xtext.ui.editor.contentassist.antlr.internal.Lexer.class).annotatedWith(com.google.inject.name.Names.named(org.eclipse.xtext.ui.LexerUIBindings.CONTENT_ASSIST)).to(org.eclipse.emf.ecore.xcore.ui.contentassist.antlr.internal.InternalXcoreLexer.class);
}
// contributed by org.eclipse.xtext.generator.parser.antlr.XtextAntlrUiGeneratorFragment
- public Class<? extends org.eclipse.xtext.ide.editor.contentassist.antlr.ContentAssistContextFactory> bindContentAssistContextFactory() {
- return org.eclipse.xtext.ide.editor.contentassist.antlr.PartialContentAssistContextFactory.class;
+ public Class<? extends org.eclipse.xtext.ui.editor.contentassist.antlr.ParserBasedContentAssistContextFactory.StatefulFactory> bindParserBasedContentAssistContextFactory$StatefulFactory() {
+ return org.eclipse.xtext.ui.editor.contentassist.antlr.ParserBasedContentAssistContextFactory.PartialStatefulFactory.class;
}
// contributed by org.eclipse.xtext.ui.generator.compare.CompareFragment
diff --git a/plugins/org.eclipse.emf.ecore.xcore.ui/src-gen/org/eclipse/emf/ecore/xcore/ui/contentassist/antlr/XcoreParser.java b/plugins/org.eclipse.emf.ecore.xcore.ui/src-gen/org/eclipse/emf/ecore/xcore/ui/contentassist/antlr/XcoreParser.java index e2730182f..4ae0bfaa4 100644 --- a/plugins/org.eclipse.emf.ecore.xcore.ui/src-gen/org/eclipse/emf/ecore/xcore/ui/contentassist/antlr/XcoreParser.java +++ b/plugins/org.eclipse.emf.ecore.xcore.ui/src-gen/org/eclipse/emf/ecore/xcore/ui/contentassist/antlr/XcoreParser.java @@ -9,9 +9,9 @@ import java.util.HashMap; import org.antlr.runtime.RecognitionException;
import org.eclipse.xtext.AbstractElement;
-import org.eclipse.xtext.ide.editor.contentassist.antlr.AbstractPartialContentAssistParser;
-import org.eclipse.xtext.ide.editor.contentassist.antlr.FollowElement;
-import org.eclipse.xtext.ide.editor.contentassist.antlr.internal.AbstractInternalContentAssistParser;
+import org.eclipse.xtext.ui.editor.contentassist.antlr.AbstractPartialContentAssistParser;
+import org.eclipse.xtext.ui.editor.contentassist.antlr.FollowElement;
+import org.eclipse.xtext.ui.editor.contentassist.antlr.internal.AbstractInternalContentAssistParser;
import com.google.inject.Inject;
diff --git a/plugins/org.eclipse.emf.ecore.xcore.ui/src-gen/org/eclipse/emf/ecore/xcore/ui/contentassist/antlr/internal/InternalXcore.g b/plugins/org.eclipse.emf.ecore.xcore.ui/src-gen/org/eclipse/emf/ecore/xcore/ui/contentassist/antlr/internal/InternalXcore.g index f9af947f6..f03605027 100644 --- a/plugins/org.eclipse.emf.ecore.xcore.ui/src-gen/org/eclipse/emf/ecore/xcore/ui/contentassist/antlr/internal/InternalXcore.g +++ b/plugins/org.eclipse.emf.ecore.xcore.ui/src-gen/org/eclipse/emf/ecore/xcore/ui/contentassist/antlr/internal/InternalXcore.g @@ -14,7 +14,7 @@ package org.eclipse.emf.ecore.xcore.ui.contentassist.antlr.internal; // Hack: Use our own Lexer superclass by means of import.
// Currently there is no other way to specify the superclass for the lexer.
-import org.eclipse.xtext.ide.editor.contentassist.antlr.internal.Lexer;
+import org.eclipse.xtext.ui.editor.contentassist.antlr.internal.Lexer;
}
@parser::header {
@@ -28,8 +28,8 @@ import org.eclipse.emf.ecore.util.EcoreUtil; import org.eclipse.emf.ecore.EObject;
import org.eclipse.xtext.parser.antlr.XtextTokenStream;
import org.eclipse.xtext.parser.antlr.XtextTokenStream.HiddenTokens;
-import org.eclipse.xtext.ide.editor.contentassist.antlr.internal.AbstractInternalContentAssistParser;
-import org.eclipse.xtext.ide.editor.contentassist.antlr.internal.DFA;
+import org.eclipse.xtext.ui.editor.contentassist.antlr.internal.AbstractInternalContentAssistParser;
+import org.eclipse.xtext.ui.editor.contentassist.antlr.internal.DFA;
import org.eclipse.emf.ecore.xcore.services.XcoreGrammarAccess;
}
diff --git a/plugins/org.eclipse.emf.ecore.xcore.ui/src-gen/org/eclipse/emf/ecore/xcore/ui/contentassist/antlr/internal/InternalXcoreLexer.java b/plugins/org.eclipse.emf.ecore.xcore.ui/src-gen/org/eclipse/emf/ecore/xcore/ui/contentassist/antlr/internal/InternalXcoreLexer.java index f80b30c47..b3ece0462 100644 --- a/plugins/org.eclipse.emf.ecore.xcore.ui/src-gen/org/eclipse/emf/ecore/xcore/ui/contentassist/antlr/internal/InternalXcoreLexer.java +++ b/plugins/org.eclipse.emf.ecore.xcore.ui/src-gen/org/eclipse/emf/ecore/xcore/ui/contentassist/antlr/internal/InternalXcoreLexer.java @@ -2,7 +2,7 @@ package org.eclipse.emf.ecore.xcore.ui.contentassist.antlr.internal; // Hack: Use our own Lexer superclass by means of import.
// Currently there is no other way to specify the superclass for the lexer.
-import org.eclipse.xtext.ide.editor.contentassist.antlr.internal.Lexer;
+import org.eclipse.xtext.ui.editor.contentassist.antlr.internal.Lexer;
import org.antlr.runtime.*;
diff --git a/plugins/org.eclipse.emf.ecore.xcore.ui/src-gen/org/eclipse/emf/ecore/xcore/ui/contentassist/antlr/internal/InternalXcoreParser.java b/plugins/org.eclipse.emf.ecore.xcore.ui/src-gen/org/eclipse/emf/ecore/xcore/ui/contentassist/antlr/internal/InternalXcoreParser.java index 735786499..bbf0efacf 100644 --- a/plugins/org.eclipse.emf.ecore.xcore.ui/src-gen/org/eclipse/emf/ecore/xcore/ui/contentassist/antlr/internal/InternalXcoreParser.java +++ b/plugins/org.eclipse.emf.ecore.xcore.ui/src-gen/org/eclipse/emf/ecore/xcore/ui/contentassist/antlr/internal/InternalXcoreParser.java @@ -8,8 +8,8 @@ import org.eclipse.emf.ecore.util.EcoreUtil; import org.eclipse.emf.ecore.EObject;
import org.eclipse.xtext.parser.antlr.XtextTokenStream;
import org.eclipse.xtext.parser.antlr.XtextTokenStream.HiddenTokens;
-import org.eclipse.xtext.ide.editor.contentassist.antlr.internal.AbstractInternalContentAssistParser;
-import org.eclipse.xtext.ide.editor.contentassist.antlr.internal.DFA;
+import org.eclipse.xtext.ui.editor.contentassist.antlr.internal.AbstractInternalContentAssistParser;
+import org.eclipse.xtext.ui.editor.contentassist.antlr.internal.DFA;
import org.eclipse.emf.ecore.xcore.services.XcoreGrammarAccess;
diff --git a/plugins/org.eclipse.emf.ecore.xcore.ui/src/org/eclipse/emf/ecore/xcore/ui/XcoreUiModule.java b/plugins/org.eclipse.emf.ecore.xcore.ui/src/org/eclipse/emf/ecore/xcore/ui/XcoreUiModule.java index 65fe83127..87be6fcd3 100644 --- a/plugins/org.eclipse.emf.ecore.xcore.ui/src/org/eclipse/emf/ecore/xcore/ui/XcoreUiModule.java +++ b/plugins/org.eclipse.emf.ecore.xcore.ui/src/org/eclipse/emf/ecore/xcore/ui/XcoreUiModule.java @@ -38,9 +38,9 @@ import org.eclipse.xtext.common.types.ui.refactoring.participant.JdtRenamePartic import org.eclipse.xtext.common.types.util.jdt.IJavaElementFinder; import org.eclipse.xtext.common.types.xtext.ui.ITypesProposalProvider; import org.eclipse.xtext.common.types.xtext.ui.JdtVariableCompletions; -import org.eclipse.xtext.ide.editor.contentassist.antlr.IContentAssistParser; import org.eclipse.xtext.resource.containers.IAllContainersState; import org.eclipse.xtext.service.SingletonBinding; +import org.eclipse.xtext.ui.editor.contentassist.antlr.IContentAssistParser; import org.eclipse.xtext.ui.editor.formatting.IContentFormatterFactory; import org.eclipse.xtext.ui.editor.hover.IEObjectHover; import org.eclipse.xtext.ui.editor.hover.IEObjectHoverProvider; diff --git a/plugins/org.eclipse.emf.ecore.xcore/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.ecore.xcore/META-INF/MANIFEST.MF index 644509257..43223f067 100644 --- a/plugins/org.eclipse.emf.ecore.xcore/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.emf.ecore.xcore/META-INF/MANIFEST.MF @@ -1,46 +1,41 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: %pluginName -Bundle-Vendor: %providerName -Bundle-Localization: plugin -Bundle-Version: 1.3.0.qualifier -Bundle-ClassPath: . -Bundle-SymbolicName: org.eclipse.emf.ecore.xcore;singleton:=true -Bundle-Activator: org.eclipse.emf.ecore.xcore.XcorePlugin$Implementation -Bundle-ActivationPolicy: lazy -Require-Bundle: org.eclipse.xtext;visibility:=reexport, - org.apache.log4j;visibility:=reexport, - org.apache.commons.logging;resolution:=optional;visibility:=reexport, - org.eclipse.xtext.generator;resolution:=optional, - org.eclipse.emf.codegen.ecore;resolution:=optional, - org.eclipse.emf.mwe.utils;resolution:=optional, - org.eclipse.emf.mwe2.launch;resolution:=optional, - org.eclipse.emf.ecore;visibility:=reexport, - org.eclipse.xtext.util, - org.antlr.runtime, - org.eclipse.xtext.xbase;visibility:=reexport, - org.eclipse.xtext.common.types;visibility:=reexport, - org.eclipse.xtext.xbase.lib;visibility:=reexport, - org.eclipse.core.runtime, - org.eclipse.xtext.ecore;visibility:=reexport, - org.eclipse.emf.ecore.xcore.lib;visibility:=reexport, - org.eclipse.emf.codegen.ecore.xtext;visibility:=reexport, - org.objectweb.asm;bundle-version="[5.0.1,6.0.0)";resolution:=optional -Import-Package: org.apache.log4j, - org.apache.commons.logging, - org.eclipse.xtext.xbase.lib -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 -Export-Package: org.eclipse.emf.ecore.xcore, - org.eclipse.emf.ecore.xcore.formatting, - org.eclipse.emf.ecore.xcore.generator, - org.eclipse.emf.ecore.xcore.impl, - org.eclipse.emf.ecore.xcore.interpreter, - org.eclipse.emf.ecore.xcore.mappings, - org.eclipse.emf.ecore.xcore.parser.antlr, - org.eclipse.emf.ecore.xcore.parser.antlr.internal, - org.eclipse.emf.ecore.xcore.resource, - org.eclipse.emf.ecore.xcore.scoping, - org.eclipse.emf.ecore.xcore.services, - org.eclipse.emf.ecore.xcore.util, - org.eclipse.emf.ecore.xcore.validation - +Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %pluginName
+Bundle-Vendor: %providerName
+Bundle-Localization: plugin
+Bundle-Version: 1.3.0.qualifier
+Bundle-ClassPath: .
+Bundle-SymbolicName: org.eclipse.emf.ecore.xcore;singleton:=true
+Bundle-Activator: org.eclipse.emf.ecore.xcore.XcorePlugin$Implementation
+Bundle-ActivationPolicy: lazy
+Require-Bundle: org.eclipse.xtext;visibility:=reexport,
+ org.apache.log4j;visibility:=reexport,
+ org.eclipse.emf.ecore;visibility:=reexport,
+ org.eclipse.xtext.util,
+ org.antlr.runtime,
+ org.eclipse.xtext.xbase;visibility:=reexport,
+ org.eclipse.xtext.common.types;visibility:=reexport,
+ org.eclipse.xtext.xbase.lib;visibility:=reexport,
+ org.eclipse.core.runtime,
+ org.eclipse.xtext.ecore;visibility:=reexport,
+ org.eclipse.emf.ecore.xcore.lib;visibility:=reexport,
+ org.eclipse.emf.codegen.ecore.xtext;visibility:=reexport,
+ org.eclipse.emf.codegen.ecore,
+ org.objectweb.asm;bundle-version="[5.0.1,6.0.0)";resolution:=optional
+Import-Package: org.apache.commons.logging,
+ org.apache.log4j
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Export-Package: org.eclipse.emf.ecore.xcore,
+ org.eclipse.emf.ecore.xcore.formatting,
+ org.eclipse.emf.ecore.xcore.generator,
+ org.eclipse.emf.ecore.xcore.impl,
+ org.eclipse.emf.ecore.xcore.interpreter,
+ org.eclipse.emf.ecore.xcore.mappings,
+ org.eclipse.emf.ecore.xcore.parser.antlr,
+ org.eclipse.emf.ecore.xcore.parser.antlr.internal,
+ org.eclipse.emf.ecore.xcore.resource,
+ org.eclipse.emf.ecore.xcore.scoping,
+ org.eclipse.emf.ecore.xcore.services,
+ org.eclipse.emf.ecore.xcore.util,
+ org.eclipse.emf.ecore.xcore.validation
+
diff --git a/plugins/org.eclipse.emf.ecore.xcore/build.properties b/plugins/org.eclipse.emf.ecore.xcore/build.properties index e4f6709f6..8ffbf07d0 100755 --- a/plugins/org.eclipse.emf.ecore.xcore/build.properties +++ b/plugins/org.eclipse.emf.ecore.xcore/build.properties @@ -15,3 +15,7 @@ src.includes = about.html,\ source.. = src/,\ src-gen/,\ xtend-gen/ +additional.bundles = org.eclipse.emf.mwe2.launch,\ + org.objectweb.asm,\ + org.eclipse.emf.mwe.utils,\ + org.eclipse.xtext.generator diff --git a/plugins/org.eclipse.emf.ecore.xcore/src-gen/org/eclipse/emf/ecore/xcore/AbstractXcoreRuntimeModule.java b/plugins/org.eclipse.emf.ecore.xcore/src-gen/org/eclipse/emf/ecore/xcore/AbstractXcoreRuntimeModule.java index 2da8dcf84..51406b339 100644 --- a/plugins/org.eclipse.emf.ecore.xcore/src-gen/org/eclipse/emf/ecore/xcore/AbstractXcoreRuntimeModule.java +++ b/plugins/org.eclipse.emf.ecore.xcore/src-gen/org/eclipse/emf/ecore/xcore/AbstractXcoreRuntimeModule.java @@ -154,4 +154,3 @@ public abstract class AbstractXcoreRuntimeModule extends org.eclipse.xtext.xbase }
}
- |