diff --git a/com.avaloq.tools.ddk.runtime.feature/feature.xml b/com.avaloq.tools.ddk.runtime.feature/feature.xml index 3bae21b8b3..66e38cd53c 100644 --- a/com.avaloq.tools.ddk.runtime.feature/feature.xml +++ b/com.avaloq.tools.ddk.runtime.feature/feature.xml @@ -107,11 +107,4 @@ version="0.0.0" unpack="false"/> - - diff --git a/com.avaloq.tools.ddk.xtext.builder.ui/.classpath b/com.avaloq.tools.ddk.xtext.builder.ui/.classpath deleted file mode 100644 index 25c660d312..0000000000 --- a/com.avaloq.tools.ddk.xtext.builder.ui/.classpath +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/com.avaloq.tools.ddk.xtext.builder.ui/.project b/com.avaloq.tools.ddk.xtext.builder.ui/.project deleted file mode 100644 index dbfe27aefa..0000000000 --- a/com.avaloq.tools.ddk.xtext.builder.ui/.project +++ /dev/null @@ -1,99 +0,0 @@ - - - com.avaloq.tools.ddk.xtext.builder.ui - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.pde.ManifestBuilder - - - - - org.eclipse.pde.SchemaBuilder - - - - - org.eclipse.xtext.ui.shared.xtextBuilder - - - - - net.sf.eclipsecs.core.CheckstyleBuilder - - - - - net.sourceforge.pmd.eclipse.plugin.pmdBuilder - - - - - edu.umd.cs.findbugs.plugin.eclipse.findbugsBuilder - - - - - - org.eclipse.jdt.core.javanature - org.eclipse.pde.PluginNature - org.eclipse.xtext.ui.shared.xtextNature - net.sourceforge.pmd.eclipse.plugin.pmdNature - net.sf.eclipsecs.core.CheckstyleNature - edu.umd.cs.findbugs.plugin.eclipse.findbugsNature - - - - .checkstyle - 1 - PARENT-1-PROJECT_LOC/ddk-configuration/.checkstyle - - - .fbprefs - 1 - PARENT-1-PROJECT_LOC/ddk-configuration/.fbprefs - - - .pmd - 1 - PARENT-1-PROJECT_LOC/ddk-configuration/.pmd - - - .settings/edu.umd.cs.findbugs.plugin.eclipse.prefs - 1 - PARENT-1-PROJECT_LOC/ddk-configuration/.settings/edu.umd.cs.findbugs.plugin.eclipse.prefs - - - .settings/org.eclipse.core.resources.prefs - 1 - PARENT-1-PROJECT_LOC/ddk-configuration/.settings/org.eclipse.core.resources.prefs - - - .settings/org.eclipse.core.runtime.prefs - 1 - PARENT-1-PROJECT_LOC/ddk-configuration/.settings/org.eclipse.core.runtime.prefs - - - .settings/org.eclipse.jdt.core.prefs - 1 - PARENT-1-PROJECT_LOC/ddk-configuration/.settings/org.eclipse.jdt.core.prefs - - - .settings/org.eclipse.jdt.ui.prefs - 1 - PARENT-1-PROJECT_LOC/ddk-configuration/.settings/org.eclipse.jdt.ui.prefs - - - .settings/org.eclipse.pde.core.prefs - 1 - PARENT-1-PROJECT_LOC/ddk-configuration/.settings/org.eclipse.pde.core.prefs - - - diff --git a/com.avaloq.tools.ddk.xtext.builder.ui/.settings/.gitignore b/com.avaloq.tools.ddk.xtext.builder.ui/.settings/.gitignore deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/com.avaloq.tools.ddk.xtext.builder.ui/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.builder.ui/META-INF/MANIFEST.MF deleted file mode 100644 index 32c836eb05..0000000000 --- a/com.avaloq.tools.ddk.xtext.builder.ui/META-INF/MANIFEST.MF +++ /dev/null @@ -1,14 +0,0 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: com.avaloq.tools.ddk.xtext.builder.ui -Bundle-SymbolicName: com.avaloq.tools.ddk.xtext.builder.ui;singleton:=true -Bundle-Version: 17.1.0.qualifier -Bundle-Vendor: Avaloq Group AG -Require-Bundle: org.eclipse.core.runtime, - org.eclipse.xtext, - org.eclipse.xtext.builder, - org.eclipse.xtext.ui -Export-Package: com.avaloq.tools.ddk.xtext.builder.ui.shared -Bundle-RequiredExecutionEnvironment: JavaSE-21 -Import-Package: org.apache.logging.log4j -Automatic-Module-Name: com.avaloq.tools.ddk.xtext.builder.ui diff --git a/com.avaloq.tools.ddk.xtext.builder.ui/build.properties b/com.avaloq.tools.ddk.xtext.builder.ui/build.properties deleted file mode 100644 index 6f20375d6c..0000000000 --- a/com.avaloq.tools.ddk.xtext.builder.ui/build.properties +++ /dev/null @@ -1,5 +0,0 @@ -source.. = src/ -output.. = bin/ -bin.includes = META-INF/,\ - .,\ - plugin.xml diff --git a/com.avaloq.tools.ddk.xtext.builder.ui/plugin.xml b/com.avaloq.tools.ddk.xtext.builder.ui/plugin.xml deleted file mode 100644 index 229fe43229..0000000000 --- a/com.avaloq.tools.ddk.xtext.builder.ui/plugin.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/com.avaloq.tools.ddk.xtext.builder.ui/pom.xml b/com.avaloq.tools.ddk.xtext.builder.ui/pom.xml deleted file mode 100644 index e06d3a8364..0000000000 --- a/com.avaloq.tools.ddk.xtext.builder.ui/pom.xml +++ /dev/null @@ -1,12 +0,0 @@ - - 4.0.0 - - ddk-parent - com.avaloq.tools.ddk - 17.1.0-SNAPSHOT - ../ddk-parent - - com.avaloq.tools.ddk - com.avaloq.tools.ddk.xtext.builder.ui - eclipse-plugin - \ No newline at end of file diff --git a/com.avaloq.tools.ddk.xtext.builder.ui/schema/overridingGuiceModule.exsd b/com.avaloq.tools.ddk.xtext.builder.ui/schema/overridingGuiceModule.exsd deleted file mode 100644 index 41ef744151..0000000000 --- a/com.avaloq.tools.ddk.xtext.builder.ui/schema/overridingGuiceModule.exsd +++ /dev/null @@ -1,109 +0,0 @@ - - - - - - - - - This extension point enables extending org.eclipse.xtext.ui.shared.overridingGuiceModule from multiple plugins in a deterministic way based on a priority. Modules with lower priority are overridden by modules with higher priority. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - The overriding module's priority. Must be an integer. Lower priority modules are overriden by higher priority modules. - - - - - - - - - - - - [Enter the first release in which this extension point appears.] - - - - - - - - - [Enter extension point usage example here.] - - - - - - - - - [Enter API information here.] - - - - - - - - - [Enter information about supplied implementation of this extension point.] - - - - - diff --git a/com.avaloq.tools.ddk.xtext.builder.ui/src/com/avaloq/tools/ddk/xtext/builder/ui/builder/ProjectAwareClusteringBuilderState.java b/com.avaloq.tools.ddk.xtext.builder.ui/src/com/avaloq/tools/ddk/xtext/builder/ui/builder/ProjectAwareClusteringBuilderState.java deleted file mode 100644 index 10ba1a3c83..0000000000 --- a/com.avaloq.tools.ddk.xtext.builder.ui/src/com/avaloq/tools/ddk/xtext/builder/ui/builder/ProjectAwareClusteringBuilderState.java +++ /dev/null @@ -1,58 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2016 Avaloq Group AG 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 - * - * Contributors: - * Avaloq Group AG - initial API and implementation - *******************************************************************************/ - -package com.avaloq.tools.ddk.xtext.builder.ui.builder; - -import java.util.stream.StreamSupport; - -import org.apache.logging.log4j.Logger; -import org.apache.logging.log4j.LogManager; -import org.eclipse.core.resources.IProject; -import org.eclipse.core.resources.IStorage; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.OperationCanceledException; -import org.eclipse.emf.ecore.resource.ResourceSet; -import org.eclipse.xtext.builder.clustering.ClusteringBuilderState; -import org.eclipse.xtext.resource.IResourceDescription.Delta; -import org.eclipse.xtext.ui.resource.IStorage2UriMapper; - -import com.google.inject.Inject; -import com.google.inject.Singleton; - - -/** - * A {@link ClusteringBuilderState} that doesn't touch files outside of the project being build. - * This avoids potential situations in java projects where Xtext resources on the classpath are rebuilt, causing - * build loops and negatively impacting performance. - */ -@Singleton -public class ProjectAwareClusteringBuilderState extends ClusteringBuilderState { - - private static final Logger LOGGER = LogManager.getLogger(ProjectAwareClusteringBuilderState.class); - - @Inject - private IStorage2UriMapper mapper; - - @Override - protected void updateMarkers(final Delta delta, final ResourceSet resourceSet, final IProgressMonitor monitor) throws OperationCanceledException { - if (StreamSupport.stream(mapper.getStorages(delta.getUri()).spliterator(), true).anyMatch(pair -> { - IStorage storage = pair.getFirst(); - IProject project = pair.getSecond(); - return project.getFullPath().isPrefixOf(storage.getFullPath()); - })) { - LOGGER.debug("Processed " + delta.getUri()); //$NON-NLS-1$ - super.updateMarkers(delta, resourceSet, monitor); - } else { - LOGGER.debug("Skipped " + delta.getUri()); //$NON-NLS-1$ - } - } - -} diff --git a/com.avaloq.tools.ddk.xtext.builder.ui/src/com/avaloq/tools/ddk/xtext/builder/ui/eclipse/EclipseBuilderModule.java b/com.avaloq.tools.ddk.xtext.builder.ui/src/com/avaloq/tools/ddk/xtext/builder/ui/eclipse/EclipseBuilderModule.java deleted file mode 100644 index 7387e37a82..0000000000 --- a/com.avaloq.tools.ddk.xtext.builder.ui/src/com/avaloq/tools/ddk/xtext/builder/ui/eclipse/EclipseBuilderModule.java +++ /dev/null @@ -1,34 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2016 Avaloq Group AG 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 - * - * Contributors: - * Avaloq Group AG - initial API and implementation - *******************************************************************************/ - -package com.avaloq.tools.ddk.xtext.builder.ui.eclipse; - -import org.eclipse.xtext.builder.builderState.IBuilderState; -import org.eclipse.xtext.service.AbstractGenericModule; - -import com.avaloq.tools.ddk.xtext.builder.ui.builder.ProjectAwareClusteringBuilderState; - - -/** - * Builder module supporting DSL development in Eclipse. - */ -public class EclipseBuilderModule extends AbstractGenericModule { - - /** - * Binds the ProjectAwareClusteringState to avoid getting stuck rebuilding things and improive performance. - * - * @return {@link ProjectAwareClusteringBuilderState} - */ - public Class bindIBuilderState() { - return ProjectAwareClusteringBuilderState.class; - } - -} diff --git a/com.avaloq.tools.ddk.xtext.builder.ui/src/com/avaloq/tools/ddk/xtext/builder/ui/shared/OverridingGuiceModule.java b/com.avaloq.tools.ddk.xtext.builder.ui/src/com/avaloq/tools/ddk/xtext/builder/ui/shared/OverridingGuiceModule.java deleted file mode 100644 index 5d3b299225..0000000000 --- a/com.avaloq.tools.ddk.xtext.builder.ui/src/com/avaloq/tools/ddk/xtext/builder/ui/shared/OverridingGuiceModule.java +++ /dev/null @@ -1,61 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2016 Avaloq Group AG 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 - * - * Contributors: - * Avaloq Group AG - initial API and implementation - *******************************************************************************/ - -package com.avaloq.tools.ddk.xtext.builder.ui.shared; - -import java.util.Objects; -import java.util.stream.Stream; - -import org.apache.logging.log4j.Level; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.Platform; -import org.eclipse.xtext.service.AbstractGenericModule; - -import com.google.inject.Binder; -import com.google.inject.Module; -import com.google.inject.util.Modules; - - -/** - * This module slots into the org.eclipse.xtext.ui.shared.overridingGuiceModule extension point - * to enable multiple overriding modules via com.avaloq.tools.ddk.xtext.builder.ui.overridingGuiceModule instead. - */ -public class OverridingGuiceModule extends AbstractGenericModule { - - private static final Logger LOGGER = LogManager.getLogger(OverridingGuiceModule.class); - - public static final String OVERRIDING_GUICE_MODULE_EXTENSION_POINT = "com.avaloq.tools.ddk.xtext.builder.ui.overridingGuiceModule"; //$NON-NLS-1$ - public static final String OVERRIDING_GUICE_MODULE_EXTENSION_CLASS = "class"; //$NON-NLS-1$ - public static final String OVERRIDING_GUICE_MODULE_EXTENSION_PRIORITY = "priority"; //$NON-NLS-1$ - - @Override - public void configure(final Binder binder) { - Stream.of(Platform.getExtensionRegistry().getConfigurationElementsFor(OVERRIDING_GUICE_MODULE_EXTENSION_POINT)).sorted((a, b) -> { - int aPriority = Integer.parseInt(a.getAttribute(OVERRIDING_GUICE_MODULE_EXTENSION_PRIORITY)); - int bPriority = Integer.parseInt(b.getAttribute(OVERRIDING_GUICE_MODULE_EXTENSION_PRIORITY)); - return aPriority - bPriority; - }).map(element -> { - try { - return (Module) element.createExecutableExtension(OVERRIDING_GUICE_MODULE_EXTENSION_CLASS); - } catch (CoreException e) { - LOGGER.log(Level.ERROR, "Overriding guice module from " + element.getContributor() + " could not be instatiated and has been skipped.", e); //$NON-NLS-1$ //$NON-NLS-2$ - return null; - } - }).filter(Objects::nonNull).reduce((dummy) -> { - }, (previous, next) -> { - LOGGER.log(Level.DEBUG, "Overriding guice module with " + next.getClass().getName()); //$NON-NLS-1$ - return Modules.override(previous).with(next); - }).configure(binder); - } - -} diff --git a/ddk-configuration/working-set/ddk.wst b/ddk-configuration/working-set/ddk.wst index 1bc028af5f..f030521d24 100644 --- a/ddk-configuration/working-set/ddk.wst +++ b/ddk-configuration/working-set/ddk.wst @@ -25,7 +25,6 @@ - diff --git a/ddk-parent/pom.xml b/ddk-parent/pom.xml index 3139224648..72171c223b 100644 --- a/ddk-parent/pom.xml +++ b/ddk-parent/pom.xml @@ -66,7 +66,6 @@ ../com.avaloq.tools.ddk ../com.avaloq.tools.ddk.xtext ../com.avaloq.tools.ddk.xtext.builder - ../com.avaloq.tools.ddk.xtext.builder.ui ../com.avaloq.tools.ddk.xtext.check.generator ../com.avaloq.tools.ddk.xtext.common.types ../com.avaloq.tools.ddk.xtext.common.types.ui