Skip to content

Commit

Permalink
[eclipse/xtext-eclipse#463] Regenerated languages.
Browse files Browse the repository at this point in the history
- added generated editors for PureXbase and XbaseWithAnnotations
- removed editors that were already generated for non-Xbase languages

Signed-off-by: Florian Stolte <fstolte@itemis.de>
  • Loading branch information
Florian Stolte committed Dec 7, 2017
1 parent 8ed34fe commit 5986579
Show file tree
Hide file tree
Showing 16 changed files with 54 additions and 69 deletions.
3 changes: 2 additions & 1 deletion org.eclipse.xtext.purexbase.ui/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,6 @@ Export-Package: org.eclipse.xtext.purexbase.ui,
org.eclipse.xtext.purexbase.ui.internal,
org.eclipse.xtext.purexbase.ui.labeling,
org.eclipse.xtext.purexbase.ui.outline,
org.eclipse.xtext.purexbase.ui.quickfix
org.eclipse.xtext.purexbase.ui.quickfix,
org.eclipse.xtext.purexbase.ui.editor
Bundle-Activator: org.eclipse.xtext.purexbase.ui.internal.PurexbaseActivator
2 changes: 1 addition & 1 deletion org.eclipse.xtext.purexbase.ui/plugin.xml
Original file line number Diff line number Diff line change
Expand Up @@ -412,7 +412,7 @@
<extension
point="org.eclipse.core.runtime.adapters">
<factory class="org.eclipse.xtext.purexbase.ui.PureXbaseExecutableExtensionFactory:org.eclipse.xtext.builder.smap.StratumBreakpointAdapterFactory"
adaptableType="org.eclipse.xtext.ui.editor.XtextEditor">
adaptableType="org.eclipse.xtext.purexbase.ui.editor.PureXbaseEditor">
<adapter type="org.eclipse.debug.ui.actions.IToggleBreakpointsTarget"/>
</factory>
</extension>
Expand Down
2 changes: 1 addition & 1 deletion org.eclipse.xtext.purexbase.ui/plugin.xml_gen
Original file line number Diff line number Diff line change
Expand Up @@ -484,7 +484,7 @@
</extension>
<extension point="org.eclipse.core.runtime.adapters">
<factory class="org.eclipse.xtext.purexbase.ui.PureXbaseExecutableExtensionFactory:org.eclipse.xtext.builder.smap.StratumBreakpointAdapterFactory"
adaptableType="org.eclipse.xtext.ui.editor.XtextEditor">
adaptableType="org.eclipse.xtext.purexbase.ui.editor.PureXbaseEditor">
<adapter type="org.eclipse.debug.ui.actions.IToggleBreakpointsTarget"/>
</factory>
</extension>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
import org.eclipse.xtext.purexbase.ide.contentassist.antlr.PureXbaseParser;
import org.eclipse.xtext.purexbase.ide.contentassist.antlr.internal.InternalPureXbaseLexer;
import org.eclipse.xtext.purexbase.ui.contentassist.PureXbaseProposalProvider;
import org.eclipse.xtext.purexbase.ui.editor.PureXbaseEditor;
import org.eclipse.xtext.purexbase.ui.labeling.PureXbaseDescriptionLabelProvider;
import org.eclipse.xtext.purexbase.ui.labeling.PureXbaseLabelProvider;
import org.eclipse.xtext.purexbase.ui.outline.PureXbaseOutlineTreeProvider;
Expand Down Expand Up @@ -96,7 +97,6 @@
import org.eclipse.xtext.xbase.ui.DefaultXbaseUiModule;
import org.eclipse.xtext.xbase.ui.contentassist.ImportingTypesProposalProvider;
import org.eclipse.xtext.xbase.ui.editor.XbaseDocumentProvider;
import org.eclipse.xtext.xbase.ui.editor.XbaseEditor;
import org.eclipse.xtext.xbase.ui.generator.trace.XbaseOpenGeneratedFileHandler;
import org.eclipse.xtext.xbase.ui.imports.InteractiveUnresolvedTypeResolver;
import org.eclipse.xtext.xbase.ui.jvmmodel.findrefs.JvmModelFindReferenceHandler;
Expand Down Expand Up @@ -126,11 +126,6 @@ public Provider<? extends IAllContainersState> provideIAllContainersState() {
return Access.getJavaProjectsState();
}

// contributed by org.eclipse.xtext.xtext.generator.ImplicitFragment
public Class<? extends XtextEditor> bindXtextEditor() {
return XbaseEditor.class;
}

// contributed by org.eclipse.xtext.xtext.generator.ImplicitFragment
public Class<? extends XtextDocumentProvider> bindXtextDocumentProvider() {
return XbaseDocumentProvider.class;
Expand Down Expand Up @@ -364,6 +359,11 @@ public Class<? extends XtextTemplateContextType> bindXtextTemplateContextType()
return XbaseTemplateContextType.class;
}

// contributed by org.eclipse.xtext.xtext.generator.xbase.XbaseGeneratorFragment2
public Class<? extends XtextEditor> bindXtextEditor() {
return PureXbaseEditor.class;
}

// contributed by org.eclipse.xtext.xtext.generator.ui.templates.CodetemplatesGeneratorFragment2
public Provider<? extends TemplatesLanguageConfiguration> provideTemplatesLanguageConfiguration() {
return AccessibleCodetemplatesActivator.getTemplatesLanguageConfigurationProvider();
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
/*
* generated by Xtext
*/
package org.eclipse.xtext.purexbase.ui.editor;

import org.eclipse.xtext.xbase.ui.editor.XbaseEditor;

/**
* This class was generated. Customizations should only happen in a newly
* introduced subclass.
*/
public class PureXbaseEditor extends XbaseEditor {
}
3 changes: 2 additions & 1 deletion org.eclipse.xtext.xbase.ui/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -67,5 +67,6 @@ Export-Package: org.eclipse.xtext.xbase.annotations.ui;x-internal:=true,
org.eclipse.xtext.xbase.ui.refactoring;x-friends:="org.eclipse.xtend.ide",
org.eclipse.xtext.xbase.ui.syntaxcoloring;x-internal:=true,
org.eclipse.xtext.xbase.ui.templates;x-friends:="org.eclipse.xtend.ide",
org.eclipse.xtext.xbase.ui.validation;x-friends:="org.eclipse.xtend.ide"
org.eclipse.xtext.xbase.ui.validation;x-friends:="org.eclipse.xtend.ide",
org.eclipse.xtext.xbase.annotations.ui.editor
Bundle-Localization: plugin
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@
import org.eclipse.xtext.resource.impl.ResourceDescriptionsProvider;
import org.eclipse.xtext.ui.editor.DocumentBasedDirtyResource;
import org.eclipse.xtext.ui.editor.IXtextEditorCallback;
import org.eclipse.xtext.ui.editor.XtextEditor;
import org.eclipse.xtext.ui.editor.contentassist.ContentAssistContext;
import org.eclipse.xtext.ui.editor.contentassist.FQNPrefixMatcher;
import org.eclipse.xtext.ui.editor.contentassist.IContentProposalProvider;
Expand All @@ -50,6 +49,7 @@
import org.eclipse.xtext.xbase.annotations.ide.contentassist.antlr.XbaseWithAnnotationsParser;
import org.eclipse.xtext.xbase.annotations.ide.contentassist.antlr.internal.InternalXbaseWithAnnotationsLexer;
import org.eclipse.xtext.xbase.annotations.ui.contentassist.XbaseWithAnnotationsProposalProvider;
import org.eclipse.xtext.xbase.annotations.ui.editor.XbaseWithAnnotationsEditor;
import org.eclipse.xtext.xbase.annotations.ui.outline.XbaseWithAnnotationsOutlineTreeProvider;
import org.eclipse.xtext.xbase.annotations.ui.quickfix.XbaseWithAnnotationsQuickfixProvider;
import org.eclipse.xtext.xbase.ui.editor.XbaseDocumentProvider;
Expand All @@ -76,11 +76,6 @@ public Provider<? extends IAllContainersState> provideIAllContainersState() {
return Access.getJavaProjectsState();
}

// contributed by org.eclipse.xtext.xtext.generator.ImplicitFragment
public Class<? extends XtextEditor> bindXtextEditor() {
return XbaseEditor.class;
}

// contributed by org.eclipse.xtext.xtext.generator.ImplicitFragment
public Class<? extends XtextDocumentProvider> bindXtextDocumentProvider() {
return XbaseDocumentProvider.class;
Expand Down Expand Up @@ -147,6 +142,11 @@ public Class<? extends JavaTypeQuickfixes> bindJavaTypeQuickfixes() {
return JavaTypeQuickfixesNoImportSection.class;
}

// contributed by org.eclipse.xtext.xtext.generator.xbase.XbaseGeneratorFragment2
public Class<? extends XbaseEditor> bindXbaseEditor() {
return XbaseWithAnnotationsEditor.class;
}

// contributed by org.eclipse.xtext.xtext.generator.builder.BuilderIntegrationFragment2
public void configureIResourceDescriptionsBuilderScope(Binder binder) {
binder.bind(IResourceDescriptions.class).annotatedWith(Names.named(ResourceDescriptionsProvider.NAMED_BUILDER_SCOPE)).to(CurrentDescriptions.ResourceSetAware.class);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
/*******************************************************************************
* Copyright (c) 2015 itemis AG (http://www.itemis.eu) and others.
* Copyright (c) 2010-2017 itemis AG (http://www.itemis.eu) and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
*******************************************************************************/
package org.eclipse.xtext.example.arithmetics.ui.editor;
package org.eclipse.xtext.xbase.annotations.ui.editor;

import org.eclipse.xtext.ui.editor.XtextEditor;
import org.eclipse.xtext.xbase.ui.editor.XbaseEditor;

/**
* This class was generated. Customizations should only happen in a newly
* introduced subclass.
*/
public class ArithmeticsEditor extends XtextEditor {
public class XbaseWithAnnotationsEditor extends XbaseEditor {
}
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@
import org.eclipse.xtext.resource.impl.ResourceDescriptionsProvider;
import org.eclipse.xtext.ui.editor.DocumentBasedDirtyResource;
import org.eclipse.xtext.ui.editor.IXtextEditorCallback;
import org.eclipse.xtext.ui.editor.XtextEditor;
import org.eclipse.xtext.ui.editor.contentassist.ContentAssistContext;
import org.eclipse.xtext.ui.editor.contentassist.FQNPrefixMatcher;
import org.eclipse.xtext.ui.editor.contentassist.IContentProposalProvider;
Expand Down Expand Up @@ -76,11 +75,6 @@ public Provider<? extends IAllContainersState> provideIAllContainersState() {
return Access.getJavaProjectsState();
}

// contributed by org.eclipse.xtext.xtext.generator.ImplicitFragment
public Class<? extends XtextEditor> bindXtextEditor() {
return XbaseEditor.class;
}

// contributed by org.eclipse.xtext.xtext.generator.ImplicitFragment
public Class<? extends XtextDocumentProvider> bindXtextDocumentProvider() {
return XbaseDocumentProvider.class;
Expand Down Expand Up @@ -147,6 +141,11 @@ public Class<? extends JavaTypeQuickfixes> bindJavaTypeQuickfixes() {
return JavaTypeQuickfixesNoImportSection.class;
}

// contributed by org.eclipse.xtext.xtext.generator.xbase.XbaseGeneratorFragment2
public Class<? extends XbaseEditor> bindXbaseEditor() {
return XbaseEditor.class;
}

// contributed by org.eclipse.xtext.xtext.generator.builder.BuilderIntegrationFragment2
public void configureIResourceDescriptionsBuilderScope(Binder binder) {
binder.bind(IResourceDescriptions.class).annotatedWith(Names.named(ResourceDescriptionsProvider.NAMED_BUILDER_SCOPE)).to(CurrentDescriptions.ResourceSetAware.class);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,5 @@ Import-Package: org.apache.log4j
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Export-Package: org.eclipse.xtext.example.arithmetics.ui.internal,
org.eclipse.xtext.example.arithmetics.ui.quickfix,
org.eclipse.xtext.example.arithmetics.ui.contentassist,
org.eclipse.xtext.example.arithmetics.ui.editor
org.eclipse.xtext.example.arithmetics.ui.contentassist
Bundle-Activator: org.eclipse.xtext.example.arithmetics.ui.internal.ArithmeticsActivator
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
import org.eclipse.xtext.example.arithmetics.ide.contentassist.antlr.PartialArithmeticsContentAssistParser;
import org.eclipse.xtext.example.arithmetics.ide.contentassist.antlr.internal.InternalArithmeticsLexer;
import org.eclipse.xtext.example.arithmetics.ui.contentassist.ArithmeticsProposalProvider;
import org.eclipse.xtext.example.arithmetics.ui.editor.ArithmeticsEditor;
import org.eclipse.xtext.example.arithmetics.ui.labeling.ArithmeticsDescriptionLabelProvider;
import org.eclipse.xtext.example.arithmetics.ui.labeling.ArithmeticsLabelProvider;
import org.eclipse.xtext.example.arithmetics.ui.outline.ArithmeticsOutlineTreeProvider;
Expand Down Expand Up @@ -56,7 +55,6 @@
import org.eclipse.xtext.ui.compare.DefaultViewerCreator;
import org.eclipse.xtext.ui.editor.DocumentBasedDirtyResource;
import org.eclipse.xtext.ui.editor.IXtextEditorCallback;
import org.eclipse.xtext.ui.editor.XtextEditor;
import org.eclipse.xtext.ui.editor.contentassist.ContentAssistContext;
import org.eclipse.xtext.ui.editor.contentassist.FQNPrefixMatcher;
import org.eclipse.xtext.ui.editor.contentassist.IContentProposalProvider;
Expand Down Expand Up @@ -98,11 +96,6 @@ public Provider<? extends IAllContainersState> provideIAllContainersState() {
return Access.getJavaProjectsState();
}

// contributed by org.eclipse.xtext.xtext.generator.ImplicitFragment
public Class<? extends XtextEditor> bindXtextEditor() {
return ArithmeticsEditor.class;
}

// contributed by org.eclipse.xtext.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment2
public Class<? extends IProposalConflictHelper> bindIProposalConflictHelper() {
return AntlrProposalConflictHelper.class;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@
import org.eclipse.xtext.ui.editor.GlobalURIEditorOpener;
import org.eclipse.xtext.ui.editor.IURIEditorOpener;
import org.eclipse.xtext.ui.editor.IXtextEditorCallback;
import org.eclipse.xtext.ui.editor.XtextEditor;
import org.eclipse.xtext.ui.editor.contentassist.ContentAssistContext;
import org.eclipse.xtext.ui.editor.contentassist.FQNPrefixMatcher;
import org.eclipse.xtext.ui.editor.contentassist.IContentProposalProvider;
Expand Down Expand Up @@ -97,6 +96,7 @@
import org.eclipse.xtext.xbase.ui.DefaultXbaseUiModule;
import org.eclipse.xtext.xbase.ui.contentassist.ImportingTypesProposalProvider;
import org.eclipse.xtext.xbase.ui.editor.XbaseDocumentProvider;
import org.eclipse.xtext.xbase.ui.editor.XbaseEditor;
import org.eclipse.xtext.xbase.ui.generator.trace.XbaseOpenGeneratedFileHandler;
import org.eclipse.xtext.xbase.ui.imports.InteractiveUnresolvedTypeResolver;
import org.eclipse.xtext.xbase.ui.jvmmodel.findrefs.JvmModelFindReferenceHandler;
Expand Down Expand Up @@ -126,11 +126,6 @@ public Provider<? extends IAllContainersState> provideIAllContainersState() {
return Access.getJavaProjectsState();
}

// contributed by org.eclipse.xtext.xtext.generator.ImplicitFragment
public Class<? extends XtextEditor> bindXtextEditor() {
return DomainmodelEditor.class;
}

// contributed by org.eclipse.xtext.xtext.generator.ImplicitFragment
public Class<? extends XtextDocumentProvider> bindXtextDocumentProvider() {
return XbaseDocumentProvider.class;
Expand Down Expand Up @@ -364,6 +359,11 @@ public Class<? extends XtextTemplateContextType> bindXtextTemplateContextType()
return XbaseTemplateContextType.class;
}

// contributed by org.eclipse.xtext.xtext.generator.xbase.XbaseGeneratorFragment2
public Class<? extends XbaseEditor> bindXbaseEditor() {
return DomainmodelEditor.class;
}

// contributed by org.eclipse.xtext.xtext.generator.ui.templates.CodetemplatesGeneratorFragment2
public Provider<? extends TemplatesLanguageConfiguration> provideTemplatesLanguageConfiguration() {
return AccessibleCodetemplatesActivator.getTemplatesLanguageConfigurationProvider();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,5 @@ Import-Package: org.apache.log4j
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Export-Package: org.eclipse.xtext.example.fowlerdsl.ui.quickfix,
org.eclipse.xtext.example.fowlerdsl.ui.contentassist,
org.eclipse.xtext.example.fowlerdsl.ui.internal,
org.eclipse.xtext.example.fowlerdsl.ui.editor
org.eclipse.xtext.example.fowlerdsl.ui.internal
Bundle-Activator: org.eclipse.xtext.example.fowlerdsl.ui.internal.FowlerdslActivator
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
import org.eclipse.xtext.example.fowlerdsl.ide.contentassist.antlr.StatemachineParser;
import org.eclipse.xtext.example.fowlerdsl.ide.contentassist.antlr.internal.InternalStatemachineLexer;
import org.eclipse.xtext.example.fowlerdsl.ui.contentassist.StatemachineProposalProvider;
import org.eclipse.xtext.example.fowlerdsl.ui.editor.StatemachineEditor;
import org.eclipse.xtext.example.fowlerdsl.ui.labeling.StatemachineDescriptionLabelProvider;
import org.eclipse.xtext.example.fowlerdsl.ui.labeling.StatemachineLabelProvider;
import org.eclipse.xtext.example.fowlerdsl.ui.outline.StatemachineOutlineTreeProvider;
Expand Down Expand Up @@ -52,7 +51,6 @@
import org.eclipse.xtext.ui.compare.DefaultViewerCreator;
import org.eclipse.xtext.ui.editor.DocumentBasedDirtyResource;
import org.eclipse.xtext.ui.editor.IXtextEditorCallback;
import org.eclipse.xtext.ui.editor.XtextEditor;
import org.eclipse.xtext.ui.editor.contentassist.ContentAssistContext;
import org.eclipse.xtext.ui.editor.contentassist.FQNPrefixMatcher;
import org.eclipse.xtext.ui.editor.contentassist.IContentProposalProvider;
Expand Down Expand Up @@ -94,11 +92,6 @@ public Provider<? extends IAllContainersState> provideIAllContainersState() {
return Access.getJavaProjectsState();
}

// contributed by org.eclipse.xtext.xtext.generator.ImplicitFragment
public Class<? extends XtextEditor> bindXtextEditor() {
return StatemachineEditor.class;
}

// contributed by org.eclipse.xtext.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment2
public Class<? extends IProposalConflictHelper> bindIProposalConflictHelper() {
return AntlrProposalConflictHelper.class;
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@
import org.eclipse.xtext.ui.editor.GlobalURIEditorOpener;
import org.eclipse.xtext.ui.editor.IURIEditorOpener;
import org.eclipse.xtext.ui.editor.IXtextEditorCallback;
import org.eclipse.xtext.ui.editor.XtextEditor;
import org.eclipse.xtext.ui.editor.contentassist.ContentAssistContext;
import org.eclipse.xtext.ui.editor.contentassist.FQNPrefixMatcher;
import org.eclipse.xtext.ui.editor.contentassist.IContentProposalProvider;
Expand Down Expand Up @@ -94,6 +93,7 @@
import org.eclipse.xtext.ui.shared.Access;
import org.eclipse.xtext.xbase.ui.DefaultXbaseUiModule;
import org.eclipse.xtext.xbase.ui.editor.XbaseDocumentProvider;
import org.eclipse.xtext.xbase.ui.editor.XbaseEditor;
import org.eclipse.xtext.xbase.ui.generator.trace.XbaseOpenGeneratedFileHandler;
import org.eclipse.xtext.xbase.ui.jvmmodel.findrefs.JvmModelFindReferenceHandler;
import org.eclipse.xtext.xbase.ui.jvmmodel.findrefs.JvmModelReferenceQueryExecutor;
Expand Down Expand Up @@ -123,11 +123,6 @@ public Provider<? extends IAllContainersState> provideIAllContainersState() {
return Access.getJavaProjectsState();
}

// contributed by org.eclipse.xtext.xtext.generator.ImplicitFragment
public Class<? extends XtextEditor> bindXtextEditor() {
return RuleEngineEditor.class;
}

// contributed by org.eclipse.xtext.xtext.generator.ImplicitFragment
public Class<? extends XtextDocumentProvider> bindXtextDocumentProvider() {
return XbaseDocumentProvider.class;
Expand Down Expand Up @@ -356,6 +351,11 @@ public Class<? extends JavaTypeQuickfixes> bindJavaTypeQuickfixes() {
return JavaTypeQuickfixesNoImportSection.class;
}

// contributed by org.eclipse.xtext.xtext.generator.xbase.XbaseGeneratorFragment2
public Class<? extends XbaseEditor> bindXbaseEditor() {
return RuleEngineEditor.class;
}

// contributed by org.eclipse.xtext.xtext.generator.ui.templates.CodetemplatesGeneratorFragment2
public Provider<? extends TemplatesLanguageConfiguration> provideTemplatesLanguageConfiguration() {
return AccessibleCodetemplatesActivator.getTemplatesLanguageConfigurationProvider();
Expand Down

0 comments on commit 5986579

Please sign in to comment.