diff options
21 files changed, 61 insertions, 224 deletions
diff --git a/plugins/org.eclipse.etrice.core.config.ui/plugin.xml b/plugins/org.eclipse.etrice.core.config.ui/plugin.xml index b4320fd34..248457e52 100644 --- a/plugins/org.eclipse.etrice.core.config.ui/plugin.xml +++ b/plugins/org.eclipse.etrice.core.config.ui/plugin.xml @@ -51,6 +51,7 @@ <extension
point="org.eclipse.ui.preferencePages">
<page
+ category="org.eclipse.etrice.ui.common.preferences.ETricePreferencePage"
class="org.eclipse.etrice.core.ui.ConfigExecutableExtensionFactory:org.eclipse.xtext.ui.editor.preferences.LanguageRootPreferencePage"
id="org.eclipse.etrice.core.Config"
name="Config">
@@ -71,6 +72,7 @@ <keywordReference id="org.eclipse.etrice.core.ui.keyword_Config"/>
</page>
</extension>
+ <!--
<extension
point="org.eclipse.ui.propertyPages">
<page
@@ -84,6 +86,7 @@ <filter name="projectNature" value="org.eclipse.xtext.ui.shared.xtextNature"/>
</page>
</extension>
+ -->
<extension
point="org.eclipse.ui.keywords">
<keyword
@@ -153,12 +156,7 @@ - <extension
- point="org.eclipse.xtext.builder.participant">
- <participant
- class="org.eclipse.etrice.core.ui.ConfigExecutableExtensionFactory:org.eclipse.xtext.builder.IXtextBuilderParticipant">
- </participant>
- </extension>
+ <!--
<extension
point="org.eclipse.ui.preferencePages">
<page
@@ -183,6 +181,7 @@ <filter name="projectNature" value="org.eclipse.xtext.ui.shared.xtextNature"/>
</page>
</extension>
+ -->
<!-- Quick Outline -->
<extension
diff --git a/plugins/org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/AbstractConfigUiModule.java b/plugins/org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/AbstractConfigUiModule.java index 317451cc7..c411e6c24 100644 --- a/plugins/org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/AbstractConfigUiModule.java +++ b/plugins/org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/AbstractConfigUiModule.java @@ -48,26 +48,6 @@ public abstract class AbstractConfigUiModule extends DefaultUiModule { return org.eclipse.xtext.ui.refactoring.impl.DefaultDependentElementsCalculator.class; } - // contributed by org.eclipse.xtext.generator.builder.BuilderIntegrationFragment - public void configureIResourceDescriptionsBuilderScope(com.google.inject.Binder binder) { - binder.bind(org.eclipse.xtext.resource.IResourceDescriptions.class).annotatedWith(com.google.inject.name.Names.named(org.eclipse.xtext.resource.impl.ResourceDescriptionsProvider.NAMED_BUILDER_SCOPE)).to(org.eclipse.xtext.builder.clustering.CurrentDescriptions.ResourceSetAware.class); - } - - // contributed by org.eclipse.xtext.generator.builder.BuilderIntegrationFragment - public Class<? extends org.eclipse.xtext.ui.editor.IXtextEditorCallback> bindIXtextEditorCallback() { - return org.eclipse.xtext.builder.nature.NatureAddingEditorCallback.class; - } - - // contributed by org.eclipse.xtext.generator.builder.BuilderIntegrationFragment - public void configureIResourceDescriptionsPersisted(com.google.inject.Binder binder) { - binder.bind(org.eclipse.xtext.resource.IResourceDescriptions.class).annotatedWith(com.google.inject.name.Names.named(org.eclipse.xtext.builder.impl.PersistentDataAwareDirtyResource.PERSISTED_DESCRIPTIONS)).to(org.eclipse.xtext.builder.builderState.IBuilderState.class); - } - - // contributed by org.eclipse.xtext.generator.builder.BuilderIntegrationFragment - public Class<? extends org.eclipse.xtext.ui.editor.DocumentBasedDirtyResource> bindDocumentBasedDirtyResource() { - return org.eclipse.xtext.builder.impl.PersistentDataAwareDirtyResource.class; - } - // contributed by org.eclipse.xtext.generator.generator.GeneratorFragment public Class<? extends org.eclipse.xtext.builder.IXtextBuilderParticipant> bindIXtextBuilderParticipant() { return org.eclipse.xtext.builder.BuilderParticipant.class; diff --git a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/AbstractConfigRuntimeModule.java b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/AbstractConfigRuntimeModule.java index 61110b1ad..c307003a5 100644 --- a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/AbstractConfigRuntimeModule.java +++ b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/AbstractConfigRuntimeModule.java @@ -129,26 +129,6 @@ public abstract class AbstractConfigRuntimeModule extends DefaultRuntimeModule { return org.eclipse.xtext.naming.DefaultDeclarativeQualifiedNameProvider.class; } - // contributed by org.eclipse.xtext.generator.builder.BuilderIntegrationFragment - public Class<? extends org.eclipse.xtext.resource.IContainer.Manager> bindIContainer$Manager() { - return org.eclipse.xtext.resource.containers.StateBasedContainerManager.class; - } - - // contributed by org.eclipse.xtext.generator.builder.BuilderIntegrationFragment - public Class<? extends org.eclipse.xtext.resource.containers.IAllContainersState.Provider> bindIAllContainersState$Provider() { - return org.eclipse.xtext.resource.containers.ResourceSetBasedAllContainersStateProvider.class; - } - - // contributed by org.eclipse.xtext.generator.builder.BuilderIntegrationFragment - public void configureIResourceDescriptions(com.google.inject.Binder binder) { - binder.bind(org.eclipse.xtext.resource.IResourceDescriptions.class).to(org.eclipse.xtext.resource.impl.ResourceSetBasedResourceDescriptions.class); - } - - // contributed by org.eclipse.xtext.generator.builder.BuilderIntegrationFragment - public void configureIResourceDescriptionsBuilderScope(com.google.inject.Binder binder) { - binder.bind(org.eclipse.xtext.resource.IResourceDescriptions.class).annotatedWith(com.google.inject.name.Names.named(org.eclipse.xtext.resource.impl.ResourceDescriptionsProvider.NAMED_BUILDER_SCOPE)).to(org.eclipse.xtext.resource.impl.ResourceSetBasedResourceDescriptions.class); - } - // contributed by org.eclipse.xtext.generator.generator.GeneratorFragment public Class<? extends org.eclipse.xtext.generator.IGenerator> bindIGenerator() { return org.eclipse.etrice.core.generator.ConfigGenerator.class; diff --git a/plugins/org.eclipse.etrice.core.config/src/org/eclipse/etrice/core/GenerateConfig.mwe2 b/plugins/org.eclipse.etrice.core.config/src/org/eclipse/etrice/core/GenerateConfig.mwe2 index 3a9538392..330f1320c 100644 --- a/plugins/org.eclipse.etrice.core.config/src/org/eclipse/etrice/core/GenerateConfig.mwe2 +++ b/plugins/org.eclipse.etrice.core.config/src/org/eclipse/etrice/core/GenerateConfig.mwe2 @@ -91,7 +91,7 @@ Workflow { fragment = scoping.ImportURIScopingFragment {}
// fragment = scoping.ImportNamespacesScopingFragment {}
fragment = exporting.QualifiedNamesFragment {}
- fragment = builder.BuilderIntegrationFragment {}
+ //fragment = builder.BuilderIntegrationFragment {}
// generator API
fragment = generator.GeneratorFragment {
diff --git a/plugins/org.eclipse.etrice.core.config/src/org/eclipse/etrice/core/generator/ConfigGenerator.xtend b/plugins/org.eclipse.etrice.core.config/src/org/eclipse/etrice/core/generator/ConfigGenerator.xtend index 78f006b63..db116bd88 100644 --- a/plugins/org.eclipse.etrice.core.config/src/org/eclipse/etrice/core/generator/ConfigGenerator.xtend +++ b/plugins/org.eclipse.etrice.core.config/src/org/eclipse/etrice/core/generator/ConfigGenerator.xtend @@ -1,15 +1,15 @@ -/*
- * generated by Xtext
- */
-package org.eclipse.etrice.core.generator
-
-import org.eclipse.emf.ecore.resource.Resource
-import org.eclipse.xtext.generator.IGenerator
-import org.eclipse.xtext.generator.IFileSystemAccess
-
-class ConfigGenerator implements IGenerator {
-
- override void doGenerate(Resource resource, IFileSystemAccess fsa) {
- //TODO implement me
- }
-}
+/* + * generated by Xtext + */ +package org.eclipse.etrice.core.generator + +import org.eclipse.emf.ecore.resource.Resource +import org.eclipse.xtext.generator.IGenerator +import org.eclipse.xtext.generator.IFileSystemAccess + +class ConfigGenerator implements IGenerator { + + override void doGenerate(Resource resource, IFileSystemAccess fsa) { + //TODO implement me + } +} diff --git a/plugins/org.eclipse.etrice.core.etmap.ui/plugin.xml b/plugins/org.eclipse.etrice.core.etmap.ui/plugin.xml index bfa1a4cc7..d97ce3f59 100644 --- a/plugins/org.eclipse.etrice.core.etmap.ui/plugin.xml +++ b/plugins/org.eclipse.etrice.core.etmap.ui/plugin.xml @@ -51,6 +51,7 @@ <extension
point="org.eclipse.ui.preferencePages">
<page
+ category="org.eclipse.etrice.ui.common.preferences.ETricePreferencePage"
class="org.eclipse.etrice.core.etmap.ui.ETMapExecutableExtensionFactory:org.eclipse.xtext.ui.editor.preferences.LanguageRootPreferencePage"
id="org.eclipse.etrice.core.etmap.ETMap"
name="ETMap">
@@ -71,6 +72,7 @@ <keywordReference id="org.eclipse.etrice.core.etmap.ui.keyword_ETMap"/>
</page>
</extension>
+ <!--
<extension
point="org.eclipse.ui.propertyPages">
<page
@@ -84,6 +86,7 @@ <filter name="projectNature" value="org.eclipse.xtext.ui.shared.xtextNature"/>
</page>
</extension>
+ -->
<extension
point="org.eclipse.ui.keywords">
<keyword
@@ -181,6 +184,7 @@ class="org.eclipse.etrice.core.etmap.ui.ETMapExecutableExtensionFactory:org.eclipse.xtext.builder.IXtextBuilderParticipant">
</participant>
</extension>
+ <!--
<extension
point="org.eclipse.ui.preferencePages">
<page
@@ -205,6 +209,7 @@ <filter name="projectNature" value="org.eclipse.xtext.ui.shared.xtextNature"/>
</page>
</extension>
+ -->
<!-- Quick Outline -->
<extension
diff --git a/plugins/org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/AbstractETMapUiModule.java b/plugins/org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/AbstractETMapUiModule.java index c565fcf55..d7a32ebe9 100644 --- a/plugins/org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/AbstractETMapUiModule.java +++ b/plugins/org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/AbstractETMapUiModule.java @@ -48,26 +48,6 @@ public abstract class AbstractETMapUiModule extends DefaultUiModule { return org.eclipse.xtext.ui.refactoring.impl.DefaultDependentElementsCalculator.class; } - // contributed by org.eclipse.xtext.generator.builder.BuilderIntegrationFragment - public void configureIResourceDescriptionsBuilderScope(com.google.inject.Binder binder) { - binder.bind(org.eclipse.xtext.resource.IResourceDescriptions.class).annotatedWith(com.google.inject.name.Names.named(org.eclipse.xtext.resource.impl.ResourceDescriptionsProvider.NAMED_BUILDER_SCOPE)).to(org.eclipse.xtext.builder.clustering.CurrentDescriptions.ResourceSetAware.class); - } - - // contributed by org.eclipse.xtext.generator.builder.BuilderIntegrationFragment - public Class<? extends org.eclipse.xtext.ui.editor.IXtextEditorCallback> bindIXtextEditorCallback() { - return org.eclipse.xtext.builder.nature.NatureAddingEditorCallback.class; - } - - // contributed by org.eclipse.xtext.generator.builder.BuilderIntegrationFragment - public void configureIResourceDescriptionsPersisted(com.google.inject.Binder binder) { - binder.bind(org.eclipse.xtext.resource.IResourceDescriptions.class).annotatedWith(com.google.inject.name.Names.named(org.eclipse.xtext.builder.impl.PersistentDataAwareDirtyResource.PERSISTED_DESCRIPTIONS)).to(org.eclipse.xtext.builder.builderState.IBuilderState.class); - } - - // contributed by org.eclipse.xtext.generator.builder.BuilderIntegrationFragment - public Class<? extends org.eclipse.xtext.ui.editor.DocumentBasedDirtyResource> bindDocumentBasedDirtyResource() { - return org.eclipse.xtext.builder.impl.PersistentDataAwareDirtyResource.class; - } - // contributed by org.eclipse.xtext.generator.generator.GeneratorFragment public Class<? extends org.eclipse.xtext.builder.IXtextBuilderParticipant> bindIXtextBuilderParticipant() { return org.eclipse.xtext.builder.BuilderParticipant.class; diff --git a/plugins/org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/AbstractETMapRuntimeModule.java b/plugins/org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/AbstractETMapRuntimeModule.java index c4b160179..fb72e30d1 100644 --- a/plugins/org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/AbstractETMapRuntimeModule.java +++ b/plugins/org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/AbstractETMapRuntimeModule.java @@ -124,26 +124,6 @@ public abstract class AbstractETMapRuntimeModule extends DefaultRuntimeModule { return org.eclipse.xtext.naming.DefaultDeclarativeQualifiedNameProvider.class; } - // contributed by org.eclipse.xtext.generator.builder.BuilderIntegrationFragment - public Class<? extends org.eclipse.xtext.resource.IContainer.Manager> bindIContainer$Manager() { - return org.eclipse.xtext.resource.containers.StateBasedContainerManager.class; - } - - // contributed by org.eclipse.xtext.generator.builder.BuilderIntegrationFragment - public Class<? extends org.eclipse.xtext.resource.containers.IAllContainersState.Provider> bindIAllContainersState$Provider() { - return org.eclipse.xtext.resource.containers.ResourceSetBasedAllContainersStateProvider.class; - } - - // contributed by org.eclipse.xtext.generator.builder.BuilderIntegrationFragment - public void configureIResourceDescriptions(com.google.inject.Binder binder) { - binder.bind(org.eclipse.xtext.resource.IResourceDescriptions.class).to(org.eclipse.xtext.resource.impl.ResourceSetBasedResourceDescriptions.class); - } - - // contributed by org.eclipse.xtext.generator.builder.BuilderIntegrationFragment - public void configureIResourceDescriptionsBuilderScope(com.google.inject.Binder binder) { - binder.bind(org.eclipse.xtext.resource.IResourceDescriptions.class).annotatedWith(com.google.inject.name.Names.named(org.eclipse.xtext.resource.impl.ResourceDescriptionsProvider.NAMED_BUILDER_SCOPE)).to(org.eclipse.xtext.resource.impl.ResourceSetBasedResourceDescriptions.class); - } - // contributed by org.eclipse.xtext.generator.generator.GeneratorFragment public Class<? extends org.eclipse.xtext.generator.IGenerator> bindIGenerator() { return org.eclipse.etrice.core.etmap.generator.ETMapGenerator.class; diff --git a/plugins/org.eclipse.etrice.core.etmap/src/org/eclipse/etrice/core/etmap/GenerateETMap.mwe2 b/plugins/org.eclipse.etrice.core.etmap/src/org/eclipse/etrice/core/etmap/GenerateETMap.mwe2 index 69aa564c5..bdbea6f8c 100644 --- a/plugins/org.eclipse.etrice.core.etmap/src/org/eclipse/etrice/core/etmap/GenerateETMap.mwe2 +++ b/plugins/org.eclipse.etrice.core.etmap/src/org/eclipse/etrice/core/etmap/GenerateETMap.mwe2 @@ -93,7 +93,7 @@ Workflow { // scoping and exporting API
fragment = scoping.ImportURIScopingFragment {}
fragment = exporting.QualifiedNamesFragment {}
- fragment = builder.BuilderIntegrationFragment {}
+ //fragment = builder.BuilderIntegrationFragment {}
// generator API
fragment = generator.GeneratorFragment {
diff --git a/plugins/org.eclipse.etrice.core.etmap/src/org/eclipse/etrice/core/etmap/generator/ETMapGenerator.xtend b/plugins/org.eclipse.etrice.core.etmap/src/org/eclipse/etrice/core/etmap/generator/ETMapGenerator.xtend index a90b432c6..99efa2bd0 100644 --- a/plugins/org.eclipse.etrice.core.etmap/src/org/eclipse/etrice/core/etmap/generator/ETMapGenerator.xtend +++ b/plugins/org.eclipse.etrice.core.etmap/src/org/eclipse/etrice/core/etmap/generator/ETMapGenerator.xtend @@ -1,15 +1,6 @@ -/******************************************************************************* - * Copyright (c) 2012 protos software gmbh (http://www.protos.de). - * 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 - * - * CONTRIBUTORS: - * Henrik Rentz-Reichert (initial contribution) - * - *******************************************************************************/ - +/* + * generated by Xtext + */ package org.eclipse.etrice.core.etmap.generator import org.eclipse.emf.ecore.resource.Resource diff --git a/plugins/org.eclipse.etrice.core.etphys.ui/plugin.xml b/plugins/org.eclipse.etrice.core.etphys.ui/plugin.xml index 0073d56bf..aed2b1198 100644 --- a/plugins/org.eclipse.etrice.core.etphys.ui/plugin.xml +++ b/plugins/org.eclipse.etrice.core.etphys.ui/plugin.xml @@ -51,6 +51,7 @@ <extension
point="org.eclipse.ui.preferencePages">
<page
+ category="org.eclipse.etrice.ui.common.preferences.ETricePreferencePage"
class="org.eclipse.etrice.core.etphys.ui.ETPhysExecutableExtensionFactory:org.eclipse.xtext.ui.editor.preferences.LanguageRootPreferencePage"
id="org.eclipse.etrice.core.etphys.ETPhys"
name="ETPhys">
@@ -71,6 +72,7 @@ <keywordReference id="org.eclipse.etrice.core.etphys.ui.keyword_ETPhys"/>
</page>
</extension>
+ <!--
<extension
point="org.eclipse.ui.propertyPages">
<page
@@ -84,6 +86,7 @@ <filter name="projectNature" value="org.eclipse.xtext.ui.shared.xtextNature"/>
</page>
</extension>
+ -->
<extension
point="org.eclipse.ui.keywords">
<keyword
@@ -181,6 +184,7 @@ class="org.eclipse.etrice.core.etphys.ui.ETPhysExecutableExtensionFactory:org.eclipse.xtext.builder.IXtextBuilderParticipant">
</participant>
</extension>
+ <!--
<extension
point="org.eclipse.ui.preferencePages">
<page
@@ -205,6 +209,7 @@ <filter name="projectNature" value="org.eclipse.xtext.ui.shared.xtextNature"/>
</page>
</extension>
+ -->
<!-- Quick Outline -->
<extension
diff --git a/plugins/org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/AbstractETPhysUiModule.java b/plugins/org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/AbstractETPhysUiModule.java index 63671a257..1a0adc25c 100644 --- a/plugins/org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/AbstractETPhysUiModule.java +++ b/plugins/org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/AbstractETPhysUiModule.java @@ -48,26 +48,6 @@ public abstract class AbstractETPhysUiModule extends DefaultUiModule { return org.eclipse.xtext.ui.refactoring.impl.DefaultDependentElementsCalculator.class; } - // contributed by org.eclipse.xtext.generator.builder.BuilderIntegrationFragment - public void configureIResourceDescriptionsBuilderScope(com.google.inject.Binder binder) { - binder.bind(org.eclipse.xtext.resource.IResourceDescriptions.class).annotatedWith(com.google.inject.name.Names.named(org.eclipse.xtext.resource.impl.ResourceDescriptionsProvider.NAMED_BUILDER_SCOPE)).to(org.eclipse.xtext.builder.clustering.CurrentDescriptions.ResourceSetAware.class); - } - - // contributed by org.eclipse.xtext.generator.builder.BuilderIntegrationFragment - public Class<? extends org.eclipse.xtext.ui.editor.IXtextEditorCallback> bindIXtextEditorCallback() { - return org.eclipse.xtext.builder.nature.NatureAddingEditorCallback.class; - } - - // contributed by org.eclipse.xtext.generator.builder.BuilderIntegrationFragment - public void configureIResourceDescriptionsPersisted(com.google.inject.Binder binder) { - binder.bind(org.eclipse.xtext.resource.IResourceDescriptions.class).annotatedWith(com.google.inject.name.Names.named(org.eclipse.xtext.builder.impl.PersistentDataAwareDirtyResource.PERSISTED_DESCRIPTIONS)).to(org.eclipse.xtext.builder.builderState.IBuilderState.class); - } - - // contributed by org.eclipse.xtext.generator.builder.BuilderIntegrationFragment - public Class<? extends org.eclipse.xtext.ui.editor.DocumentBasedDirtyResource> bindDocumentBasedDirtyResource() { - return org.eclipse.xtext.builder.impl.PersistentDataAwareDirtyResource.class; - } - // contributed by org.eclipse.xtext.generator.generator.GeneratorFragment public Class<? extends org.eclipse.xtext.builder.IXtextBuilderParticipant> bindIXtextBuilderParticipant() { return org.eclipse.xtext.builder.BuilderParticipant.class; diff --git a/plugins/org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/AbstractETPhysRuntimeModule.java b/plugins/org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/AbstractETPhysRuntimeModule.java index 0ffa689c2..29dcf2058 100644 --- a/plugins/org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/AbstractETPhysRuntimeModule.java +++ b/plugins/org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/AbstractETPhysRuntimeModule.java @@ -124,26 +124,6 @@ public abstract class AbstractETPhysRuntimeModule extends DefaultRuntimeModule { return org.eclipse.xtext.naming.DefaultDeclarativeQualifiedNameProvider.class; } - // contributed by org.eclipse.xtext.generator.builder.BuilderIntegrationFragment - public Class<? extends org.eclipse.xtext.resource.IContainer.Manager> bindIContainer$Manager() { - return org.eclipse.xtext.resource.containers.StateBasedContainerManager.class; - } - - // contributed by org.eclipse.xtext.generator.builder.BuilderIntegrationFragment - public Class<? extends org.eclipse.xtext.resource.containers.IAllContainersState.Provider> bindIAllContainersState$Provider() { - return org.eclipse.xtext.resource.containers.ResourceSetBasedAllContainersStateProvider.class; - } - - // contributed by org.eclipse.xtext.generator.builder.BuilderIntegrationFragment - public void configureIResourceDescriptions(com.google.inject.Binder binder) { - binder.bind(org.eclipse.xtext.resource.IResourceDescriptions.class).to(org.eclipse.xtext.resource.impl.ResourceSetBasedResourceDescriptions.class); - } - - // contributed by org.eclipse.xtext.generator.builder.BuilderIntegrationFragment - public void configureIResourceDescriptionsBuilderScope(com.google.inject.Binder binder) { - binder.bind(org.eclipse.xtext.resource.IResourceDescriptions.class).annotatedWith(com.google.inject.name.Names.named(org.eclipse.xtext.resource.impl.ResourceDescriptionsProvider.NAMED_BUILDER_SCOPE)).to(org.eclipse.xtext.resource.impl.ResourceSetBasedResourceDescriptions.class); - } - // contributed by org.eclipse.xtext.generator.generator.GeneratorFragment public Class<? extends org.eclipse.xtext.generator.IGenerator> bindIGenerator() { return org.eclipse.etrice.core.etphys.generator.ETPhysGenerator.class; diff --git a/plugins/org.eclipse.etrice.core.etphys/src/org/eclipse/etrice/core/etphys/GenerateETPhys.mwe2 b/plugins/org.eclipse.etrice.core.etphys/src/org/eclipse/etrice/core/etphys/GenerateETPhys.mwe2 index 196d3da01..f8109cfac 100644 --- a/plugins/org.eclipse.etrice.core.etphys/src/org/eclipse/etrice/core/etphys/GenerateETPhys.mwe2 +++ b/plugins/org.eclipse.etrice.core.etphys/src/org/eclipse/etrice/core/etphys/GenerateETPhys.mwe2 @@ -90,7 +90,7 @@ Workflow { fragment = scoping.ImportURIScopingFragment {}
//fragment = scoping.ImportNamespacesScopingFragment {}
fragment = exporting.QualifiedNamesFragment {}
- fragment = builder.BuilderIntegrationFragment {}
+ //fragment = builder.BuilderIntegrationFragment {}
// generator API
fragment = generator.GeneratorFragment {
diff --git a/plugins/org.eclipse.etrice.core.etphys/src/org/eclipse/etrice/core/etphys/generator/ETPhysGenerator.xtend b/plugins/org.eclipse.etrice.core.etphys/src/org/eclipse/etrice/core/etphys/generator/ETPhysGenerator.xtend index 3123a2828..cff196e02 100644 --- a/plugins/org.eclipse.etrice.core.etphys/src/org/eclipse/etrice/core/etphys/generator/ETPhysGenerator.xtend +++ b/plugins/org.eclipse.etrice.core.etphys/src/org/eclipse/etrice/core/etphys/generator/ETPhysGenerator.xtend @@ -1,15 +1,6 @@ -/******************************************************************************* - * Copyright (c) 2012 protos software gmbh (http://www.protos.de). - * 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 - * - * CONTRIBUTORS: - * Henrik Rentz-Reichert (initial contribution) - * - *******************************************************************************/ - +/* + * generated by Xtext + */ package org.eclipse.etrice.core.etphys.generator import org.eclipse.emf.ecore.resource.Resource diff --git a/plugins/org.eclipse.etrice.core.room.ui/plugin.xml b/plugins/org.eclipse.etrice.core.room.ui/plugin.xml index c85abe78d..d3c30686c 100644 --- a/plugins/org.eclipse.etrice.core.room.ui/plugin.xml +++ b/plugins/org.eclipse.etrice.core.room.ui/plugin.xml @@ -52,6 +52,7 @@ <extension
point="org.eclipse.ui.preferencePages">
<page
+ category="org.eclipse.etrice.ui.common.preferences.ETricePreferencePage"
class="org.eclipse.etrice.core.ui.RoomExecutableExtensionFactory:org.eclipse.xtext.ui.editor.preferences.LanguageRootPreferencePage"
id="org.eclipse.etrice.core.Room"
name="Room">
diff --git a/plugins/org.eclipse.etrice.generator.fsmtest.ui/plugin.xml b/plugins/org.eclipse.etrice.generator.fsmtest.ui/plugin.xml index 1d70ce052..23ec4325d 100644 --- a/plugins/org.eclipse.etrice.generator.fsmtest.ui/plugin.xml +++ b/plugins/org.eclipse.etrice.generator.fsmtest.ui/plugin.xml @@ -50,6 +50,7 @@ <extension
point="org.eclipse.ui.preferencePages">
<page
+ category="org.eclipse.etrice.ui.common.preferences.ETricePreferencePage"
class="org.eclipse.etrice.generator.ui.FSMtestExecutableExtensionFactory:org.eclipse.xtext.ui.editor.preferences.LanguageRootPreferencePage"
id="org.eclipse.etrice.generator.FSMtest"
name="FSMtest">
@@ -70,6 +71,7 @@ <keywordReference id="org.eclipse.etrice.generator.ui.keyword_FSMtest"/>
</page>
</extension>
+ <!--
<extension
point="org.eclipse.ui.propertyPages">
<page
@@ -83,6 +85,7 @@ <filter name="projectNature" value="org.eclipse.xtext.ui.shared.xtextNature"/>
</page>
</extension>
+ -->
<extension
point="org.eclipse.ui.keywords">
<keyword
@@ -180,6 +183,7 @@ class="org.eclipse.etrice.generator.ui.FSMtestExecutableExtensionFactory:org.eclipse.xtext.builder.IXtextBuilderParticipant">
</participant>
</extension>
+ <!--
<extension
point="org.eclipse.ui.preferencePages">
<page
@@ -204,6 +208,7 @@ <filter name="projectNature" value="org.eclipse.xtext.ui.shared.xtextNature"/>
</page>
</extension>
+ -->
<!-- Quick Outline -->
<extension
diff --git a/plugins/org.eclipse.etrice.generator.fsmtest.ui/src-gen/org/eclipse/etrice/generator/ui/AbstractFSMtestUiModule.java b/plugins/org.eclipse.etrice.generator.fsmtest.ui/src-gen/org/eclipse/etrice/generator/ui/AbstractFSMtestUiModule.java index 3e3f8ce6c..7b2555685 100644 --- a/plugins/org.eclipse.etrice.generator.fsmtest.ui/src-gen/org/eclipse/etrice/generator/ui/AbstractFSMtestUiModule.java +++ b/plugins/org.eclipse.etrice.generator.fsmtest.ui/src-gen/org/eclipse/etrice/generator/ui/AbstractFSMtestUiModule.java @@ -43,26 +43,6 @@ public abstract class AbstractFSMtestUiModule extends DefaultUiModule { return org.eclipse.xtext.ui.refactoring.impl.DefaultDependentElementsCalculator.class; } - // contributed by org.eclipse.xtext.generator.builder.BuilderIntegrationFragment - public void configureIResourceDescriptionsBuilderScope(com.google.inject.Binder binder) { - binder.bind(org.eclipse.xtext.resource.IResourceDescriptions.class).annotatedWith(com.google.inject.name.Names.named(org.eclipse.xtext.resource.impl.ResourceDescriptionsProvider.NAMED_BUILDER_SCOPE)).to(org.eclipse.xtext.builder.clustering.CurrentDescriptions.ResourceSetAware.class); - } - - // contributed by org.eclipse.xtext.generator.builder.BuilderIntegrationFragment - public Class<? extends org.eclipse.xtext.ui.editor.IXtextEditorCallback> bindIXtextEditorCallback() { - return org.eclipse.xtext.builder.nature.NatureAddingEditorCallback.class; - } - - // contributed by org.eclipse.xtext.generator.builder.BuilderIntegrationFragment - public void configureIResourceDescriptionsPersisted(com.google.inject.Binder binder) { - binder.bind(org.eclipse.xtext.resource.IResourceDescriptions.class).annotatedWith(com.google.inject.name.Names.named(org.eclipse.xtext.builder.impl.PersistentDataAwareDirtyResource.PERSISTED_DESCRIPTIONS)).to(org.eclipse.xtext.builder.builderState.IBuilderState.class); - } - - // contributed by org.eclipse.xtext.generator.builder.BuilderIntegrationFragment - public Class<? extends org.eclipse.xtext.ui.editor.DocumentBasedDirtyResource> bindDocumentBasedDirtyResource() { - return org.eclipse.xtext.builder.impl.PersistentDataAwareDirtyResource.class; - } - // contributed by org.eclipse.xtext.generator.generator.GeneratorFragment public Class<? extends org.eclipse.xtext.builder.IXtextBuilderParticipant> bindIXtextBuilderParticipant() { return org.eclipse.xtext.builder.BuilderParticipant.class; diff --git a/plugins/org.eclipse.etrice.generator.fsmtest/src-gen/org/eclipse/etrice/generator/AbstractFSMtestRuntimeModule.java b/plugins/org.eclipse.etrice.generator.fsmtest/src-gen/org/eclipse/etrice/generator/AbstractFSMtestRuntimeModule.java index 092e3ff53..b632b7599 100644 --- a/plugins/org.eclipse.etrice.generator.fsmtest/src-gen/org/eclipse/etrice/generator/AbstractFSMtestRuntimeModule.java +++ b/plugins/org.eclipse.etrice.generator.fsmtest/src-gen/org/eclipse/etrice/generator/AbstractFSMtestRuntimeModule.java @@ -114,26 +114,6 @@ public abstract class AbstractFSMtestRuntimeModule extends DefaultRuntimeModule return org.eclipse.xtext.naming.DefaultDeclarativeQualifiedNameProvider.class; } - // contributed by org.eclipse.xtext.generator.builder.BuilderIntegrationFragment - public Class<? extends org.eclipse.xtext.resource.IContainer.Manager> bindIContainer$Manager() { - return org.eclipse.xtext.resource.containers.StateBasedContainerManager.class; - } - - // contributed by org.eclipse.xtext.generator.builder.BuilderIntegrationFragment - public Class<? extends org.eclipse.xtext.resource.containers.IAllContainersState.Provider> bindIAllContainersState$Provider() { - return org.eclipse.xtext.resource.containers.ResourceSetBasedAllContainersStateProvider.class; - } - - // contributed by org.eclipse.xtext.generator.builder.BuilderIntegrationFragment - public void configureIResourceDescriptions(com.google.inject.Binder binder) { - binder.bind(org.eclipse.xtext.resource.IResourceDescriptions.class).to(org.eclipse.xtext.resource.impl.ResourceSetBasedResourceDescriptions.class); - } - - // contributed by org.eclipse.xtext.generator.builder.BuilderIntegrationFragment - public void configureIResourceDescriptionsBuilderScope(com.google.inject.Binder binder) { - binder.bind(org.eclipse.xtext.resource.IResourceDescriptions.class).annotatedWith(com.google.inject.name.Names.named(org.eclipse.xtext.resource.impl.ResourceDescriptionsProvider.NAMED_BUILDER_SCOPE)).to(org.eclipse.xtext.resource.impl.ResourceSetBasedResourceDescriptions.class); - } - // contributed by org.eclipse.xtext.generator.generator.GeneratorFragment public Class<? extends org.eclipse.xtext.generator.IGenerator> bindIGenerator() { return org.eclipse.etrice.generator.generator.FSMtestGenerator.class; diff --git a/plugins/org.eclipse.etrice.generator.fsmtest/src/org/eclipse/etrice/generator/GenerateFSMtest.mwe2 b/plugins/org.eclipse.etrice.generator.fsmtest/src/org/eclipse/etrice/generator/GenerateFSMtest.mwe2 index 28466ef45..c678cdc82 100644 --- a/plugins/org.eclipse.etrice.generator.fsmtest/src/org/eclipse/etrice/generator/GenerateFSMtest.mwe2 +++ b/plugins/org.eclipse.etrice.generator.fsmtest/src/org/eclipse/etrice/generator/GenerateFSMtest.mwe2 @@ -92,7 +92,7 @@ Workflow { // scoping and exporting API
fragment = scoping.ImportNamespacesScopingFragment {}
fragment = exporting.QualifiedNamesFragment {}
- fragment = builder.BuilderIntegrationFragment {}
+ //fragment = builder.BuilderIntegrationFragment {}
// generator API
fragment = generator.GeneratorFragment {
diff --git a/plugins/org.eclipse.etrice.generator.fsmtest/src/org/eclipse/etrice/generator/generator/FSMtestGenerator.xtend b/plugins/org.eclipse.etrice.generator.fsmtest/src/org/eclipse/etrice/generator/generator/FSMtestGenerator.xtend index cae86b10a..223f45fde 100644 --- a/plugins/org.eclipse.etrice.generator.fsmtest/src/org/eclipse/etrice/generator/generator/FSMtestGenerator.xtend +++ b/plugins/org.eclipse.etrice.generator.fsmtest/src/org/eclipse/etrice/generator/generator/FSMtestGenerator.xtend @@ -1,15 +1,15 @@ -/*
- * generated by Xtext
- */
-package org.eclipse.etrice.generator.generator
-
-import org.eclipse.emf.ecore.resource.Resource
-import org.eclipse.xtext.generator.IGenerator
-import org.eclipse.xtext.generator.IFileSystemAccess
-
-class FSMtestGenerator implements IGenerator {
-
- override void doGenerate(Resource resource, IFileSystemAccess fsa) {
- //TODO implement me
- }
-}
+/* + * generated by Xtext + */ +package org.eclipse.etrice.generator.generator + +import org.eclipse.emf.ecore.resource.Resource +import org.eclipse.xtext.generator.IGenerator +import org.eclipse.xtext.generator.IFileSystemAccess + +class FSMtestGenerator implements IGenerator { + + override void doGenerate(Resource resource, IFileSystemAccess fsa) { + //TODO implement me + } +} |