Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion com.avaloq.tools.ddk.check.core/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -48,5 +48,6 @@ Export-Package: com.avaloq.tools.ddk.check,
com.avaloq.tools.ddk.check.util,
com.avaloq.tools.ddk.check.validation
Import-Package: org.eclipse.jdt.internal.ui.text,
org.apache.logging.log4j
org.apache.logging.log4j,
org.apache.log4j
Automatic-Module-Name: com.avaloq.tools.ddk.check.core
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@

import com.avaloq.tools.ddk.check.CheckRuntimeModule;
import com.avaloq.tools.ddk.check.ui.CheckUiModule;
import com.google.common.collect.Maps;
import com.google.inject.Guice;
import com.google.inject.Injector;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
import org.apache.log4j.Logger;
import org.eclipse.ui.plugin.AbstractUIPlugin;
Expand All @@ -29,7 +29,7 @@ public class CheckActivator extends AbstractUIPlugin {

private static CheckActivator INSTANCE;

private Map<String, Injector> injectors = Collections.synchronizedMap(Maps.<String, Injector> newHashMapWithExpectedSize(1));
private Map<String, Injector> injectors = Collections.synchronizedMap(new HashMap<>(2));

@Override
public void start(BundleContext context) throws Exception {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@

import com.avaloq.tools.ddk.checkcfg.CheckCfgRuntimeModule;
import com.avaloq.tools.ddk.checkcfg.ui.CheckCfgUiModule;
import com.google.common.collect.Maps;
import com.google.inject.Guice;
import com.google.inject.Injector;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
import org.apache.log4j.Logger;
import org.eclipse.ui.plugin.AbstractUIPlugin;
Expand All @@ -29,7 +29,7 @@ public class CheckcfgActivator extends AbstractUIPlugin {

private static CheckcfgActivator INSTANCE;

private Map<String, Injector> injectors = Collections.synchronizedMap(Maps.<String, Injector> newHashMapWithExpectedSize(1));
private Map<String, Injector> injectors = Collections.synchronizedMap(new HashMap<>(2));

@Override
public void start(BundleContext context) throws Exception {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ Workflow {
}
code = {
encoding = "UTF-8"
lineDelimiter = "\r\n"
lineDelimiter = "\n"
fileHeader = "/*\n * generated by Xtext\n */"
preferXtendStubs = false
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ Workflow {
}
code = {
encoding = "UTF-8"
lineDelimiter = "\r\n"
lineDelimiter = "\n"
fileHeader = "/*\n * generated by Xtext\n */"
preferXtendStubs = false
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ Workflow {
}
code = {
encoding = "UTF-8"
lineDelimiter = "\r\n"
lineDelimiter = "\n"
fileHeader = "/*\n * generated by Xtext\n */"
preferXtendStubs = false
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ Workflow {
}
code = {
encoding = "UTF-8"
lineDelimiter = "\r\n"
lineDelimiter = "\n"
fileHeader = "/*\n * generated by Xtext\n */"
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ Workflow {
}
code = {
encoding = "UTF-8"
lineDelimiter = "\r\n"
lineDelimiter = "\n"
fileHeader = "/*\n * generated by Xtext\n */"
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ Workflow {
}
code = {
encoding = "UTF-8"
lineDelimiter = "\r\n"
lineDelimiter = "\n"
fileHeader = "/*\n * generated by Xtext\n */"
preferXtendStubs = false
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ Workflow {
}
code = {
encoding = "UTF-8"
lineDelimiter = "\r\n"
lineDelimiter = "\n"
fileHeader = "/*\n * generated by Xtext\n */"
preferXtendStubs = false
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@

import com.avaloq.tools.ddk.xtext.export.ExportRuntimeModule;
import com.avaloq.tools.ddk.xtext.export.ui.ExportUiModule;
import com.google.common.collect.Maps;
import com.google.inject.Guice;
import com.google.inject.Injector;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
import org.apache.log4j.Logger;
import org.eclipse.ui.plugin.AbstractUIPlugin;
Expand All @@ -29,7 +29,7 @@ public class ExportActivator extends AbstractUIPlugin {

private static ExportActivator INSTANCE;

private Map<String, Injector> injectors = Collections.synchronizedMap(Maps.<String, Injector> newHashMapWithExpectedSize(1));
private Map<String, Injector> injectors = Collections.synchronizedMap(new HashMap<>(2));

@Override
public void start(BundleContext context) throws Exception {
Expand Down
2 changes: 1 addition & 1 deletion com.avaloq.tools.ddk.xtext.export/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -38,4 +38,4 @@ Export-Package: com.avaloq.tools.ddk.xtext.export,
com.avaloq.tools.ddk.xtext.export.serializer,
com.avaloq.tools.ddk.xtext.export.generator
Automatic-Module-Name: com.avaloq.tools.ddk.xtext.export

Import-Package: org.apache.log4j
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@

import com.avaloq.tools.ddk.xtext.expression.ExpressionRuntimeModule;
import com.avaloq.tools.ddk.xtext.expression.ui.ExpressionUiModule;
import com.google.common.collect.Maps;
import com.google.inject.Guice;
import com.google.inject.Injector;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
import org.apache.log4j.Logger;
import org.eclipse.ui.plugin.AbstractUIPlugin;
Expand All @@ -29,7 +29,7 @@ public class ExpressionActivator extends AbstractUIPlugin {

private static ExpressionActivator INSTANCE;

private Map<String, Injector> injectors = Collections.synchronizedMap(Maps.<String, Injector> newHashMapWithExpectedSize(1));
private Map<String, Injector> injectors = Collections.synchronizedMap(new HashMap<>(2));

@Override
public void start(BundleContext context) throws Exception {
Expand Down
3 changes: 2 additions & 1 deletion com.avaloq.tools.ddk.xtext.expression/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@ Require-Bundle: org.eclipse.xtext,
org.eclipse.core.resources,
org.eclipse.core.runtime,
org.eclipse.xtext.xbase.lib;bundle-version="2.14.0"
Import-Package: org.apache.logging.log4j
Import-Package: org.apache.logging.log4j,
org.apache.log4j
Export-Package: com.avaloq.tools.ddk.xtext.expression,
com.avaloq.tools.ddk.xtext.expression.conversion,
com.avaloq.tools.ddk.xtext.expression.expression,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@

import com.avaloq.tools.ddk.xtext.format.FormatRuntimeModule;
import com.avaloq.tools.ddk.xtext.format.ui.FormatUiModule;
import com.google.common.collect.Maps;
import com.google.inject.Guice;
import com.google.inject.Injector;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
import org.apache.log4j.Logger;
import org.eclipse.ui.plugin.AbstractUIPlugin;
Expand All @@ -29,7 +29,7 @@ public class FormatActivator extends AbstractUIPlugin {

private static FormatActivator INSTANCE;

private Map<String, Injector> injectors = Collections.synchronizedMap(Maps.<String, Injector> newHashMapWithExpectedSize(1));
private Map<String, Injector> injectors = Collections.synchronizedMap(new HashMap<>(2));

@Override
public void start(BundleContext context) throws Exception {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="generated by Xtext" modelDirectory="/com.avaloq.tools.ddk.xtext.format/src-gen"
modelPluginID="com.avaloq.tools.ddk.xtext.format" forceOverwrite="true" modelName="Format"
updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
complianceLevel="11.0" copyrightFields="false" runtimeVersion="2.29" usedGenPackages="platform:/plugin/org.eclipse.xtext/org/eclipse/xtext/Xtext.genmodel#//xtext platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore platform:/resource/org.eclipse.xtext.common.types/model/JavaVMTypes.genmodel#//types platform:/resource/org.eclipse.xtext.xbase/model/Xbase.genmodel#//xbase">
complianceLevel="17.0" copyrightFields="false" runtimeVersion="2.36" usedGenPackages="platform:/plugin/org.eclipse.xtext/org/eclipse/xtext/Xtext.genmodel#//xtext platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore platform:/resource/org.eclipse.xtext.common.types/model/JavaVMTypes.genmodel#//types platform:/resource/org.eclipse.xtext.xbase/model/Xbase.genmodel#//xbase">
<genPackages prefix="Format" basePackage="com.avaloq.tools.ddk.xtext.format" disposableProviderFactory="true"
fileExtensions="format" ecorePackage="Format.ecore#/">
<genEnums typeSafeEnumCompatible="false" ecoreEnum="Format.ecore#//MatcherType">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@

import com.avaloq.tools.ddk.xtext.scope.ScopeRuntimeModule;
import com.avaloq.tools.ddk.xtext.scope.ui.ScopeUiModule;
import com.google.common.collect.Maps;
import com.google.inject.Guice;
import com.google.inject.Injector;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
import org.apache.log4j.Logger;
import org.eclipse.ui.plugin.AbstractUIPlugin;
Expand All @@ -29,7 +29,7 @@ public class ScopeActivator extends AbstractUIPlugin {

private static ScopeActivator INSTANCE;

private Map<String, Injector> injectors = Collections.synchronizedMap(Maps.<String, Injector> newHashMapWithExpectedSize(1));
private Map<String, Injector> injectors = Collections.synchronizedMap(new HashMap<>(2));

@Override
public void start(BundleContext context) throws Exception {
Expand Down
3 changes: 2 additions & 1 deletion com.avaloq.tools.ddk.xtext.scope/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@ Require-Bundle: org.eclipse.xtext,
org.eclipse.core.resources,
org.eclipse.core.runtime,
org.eclipse.xtext.xbase.lib
Import-Package: org.apache.logging.log4j
Import-Package: org.apache.logging.log4j,
org.apache.log4j
Export-Package: com.avaloq.tools.ddk.xtext.scope,
com.avaloq.tools.ddk.xtext.scope.parser.antlr,
com.avaloq.tools.ddk.xtext.scope.parser.antlr.internal,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="generated by Xtext" modelDirectory="/com.avaloq.tools.ddk.xtext.test/src-gen"
modelPluginID="com.avaloq.tools.ddk.xtext.test" forceOverwrite="true" modelName="FormatterTestLanguage"
updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
complianceLevel="11.0" copyrightFields="false" runtimeVersion="2.29" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
complianceLevel="17.0" copyrightFields="false" runtimeVersion="2.36" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
<genPackages prefix="FormatterTestLanguage" basePackage="com.avaloq.tools.ddk.xtext.formatter"
disposableProviderFactory="true" fileExtensions="mydsl" ecorePackage="FormatterTestLanguage.ecore#/">
<genEnums typeSafeEnumCompatible="false" ecoreEnum="FormatterTestLanguage.ecore#//Enum1">
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
/*
* generated by Xtext
*/
package com.avaloq.tools.ddk.xtext.formatter


/**
* Use this class to register components to be used at runtime / without the Equinox extension registry.
*/
class FormatterTestLanguageRuntimeModule extends AbstractFormatterTestLanguageRuntimeModule {
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
/*
* generated by Xtext
*/
package com.avaloq.tools.ddk.xtext.formatter


/**
* Initialization support for running Xtext languages without Equinox extension registry.
*/
class FormatterTestLanguageStandaloneSetup extends FormatterTestLanguageStandaloneSetupGenerated {

def static void doSetup() {
new FormatterTestLanguageStandaloneSetup().createInjectorAndDoEMFRegistration()
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
/*
* generated by Xtext
*/
package com.avaloq.tools.ddk.xtext.formatter.serializer


class FormatterTestLanguageSemanticSequencer extends AbstractFormatterTestLanguageSemanticSequencer {
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
/*
* generated by Xtext
*/
package com.avaloq.tools.ddk.xtext.formatter.serializer


class FormatterTestLanguageSyntacticSequencer extends AbstractFormatterTestLanguageSyntacticSequencer {
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@

import com.avaloq.tools.ddk.xtext.valid.ValidRuntimeModule;
import com.avaloq.tools.ddk.xtext.valid.ui.ValidUiModule;
import com.google.common.collect.Maps;
import com.google.inject.Guice;
import com.google.inject.Injector;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
import org.apache.log4j.Logger;
import org.eclipse.ui.plugin.AbstractUIPlugin;
Expand All @@ -29,7 +29,7 @@ public class ValidActivator extends AbstractUIPlugin {

private static ValidActivator INSTANCE;

private Map<String, Injector> injectors = Collections.synchronizedMap(Maps.<String, Injector> newHashMapWithExpectedSize(1));
private Map<String, Injector> injectors = Collections.synchronizedMap(new HashMap<>(2));

@Override
public void start(BundleContext context) throws Exception {
Expand Down
1 change: 1 addition & 0 deletions com.avaloq.tools.ddk.xtext.valid/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -32,3 +32,4 @@ Export-Package: com.avaloq.tools.ddk.xtext.valid,
com.avaloq.tools.ddk.xtext.valid.formatting,
com.avaloq.tools.ddk.xtext.valid.serializer
Automatic-Module-Name: com.avaloq.tools.ddk.xtext.valid
Import-Package: org.apache.log4j
2 changes: 1 addition & 1 deletion ddk-configuration/.settings/org.eclipse.core.runtime.prefs
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
#Thu Nov 18 13:45:58 CET 2010
eclipse.preferences.version=1
line.separator=\r\n
line.separator=\n