From a74ac9db417392da46efdda5a0f1c3ac91a01797 Mon Sep 17 00:00:00 2001 From: Dennis Huebner Date: Wed, 1 Jun 2016 14:16:05 +0200 Subject: [PATCH] [misc] Fixed project setup where possible --- plugins/org.eclipse.xtext.ide/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- plugins/org.eclipse.xtext.ide/pom.xml | 13 ++++++++++++- .../IEditorHighlightingConfigurationProvider.xtend | 1 + .../.settings/org.eclipse.jdt.core.prefs | 7 ++++--- .../org/eclipse/xtext/util/IFileSystemScanner.xtend | 1 + .../ResourceServiceProviderServiceLoader.xtend | 1 + 7 files changed, 23 insertions(+), 8 deletions(-) diff --git a/plugins/org.eclipse.xtext.ide/.classpath b/plugins/org.eclipse.xtext.ide/.classpath index 2f5ffb21d..5c242fd9e 100644 --- a/plugins/org.eclipse.xtext.ide/.classpath +++ b/plugins/org.eclipse.xtext.ide/.classpath @@ -1,6 +1,6 @@ - + diff --git a/plugins/org.eclipse.xtext.ide/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.xtext.ide/.settings/org.eclipse.jdt.core.prefs index 336080a72..169aa9137 100644 --- a/plugins/org.eclipse.xtext.ide/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/org.eclipse.xtext.ide/.settings/org.eclipse.jdt.core.prefs @@ -24,9 +24,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nul org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.compliance=1.6 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -125,7 +125,7 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disa org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=1.8 +org.eclipse.jdt.core.compiler.source=1.6 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 diff --git a/plugins/org.eclipse.xtext.ide/pom.xml b/plugins/org.eclipse.xtext.ide/pom.xml index 5d885c814..8d28fb33d 100644 --- a/plugins/org.eclipse.xtext.ide/pom.xml +++ b/plugins/org.eclipse.xtext.ide/pom.xml @@ -11,7 +11,18 @@ Xtext IDE Library org.eclipse.xtext.ide - + + + + org.eclipse.tycho + target-platform-configuration + ${tycho-version} + + consider + + + + org.eclipse.xtext diff --git a/plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/syntaxcoloring/IEditorHighlightingConfigurationProvider.xtend b/plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/syntaxcoloring/IEditorHighlightingConfigurationProvider.xtend index d8541e170..e344b9421 100644 --- a/plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/syntaxcoloring/IEditorHighlightingConfigurationProvider.xtend +++ b/plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/syntaxcoloring/IEditorHighlightingConfigurationProvider.xtend @@ -9,6 +9,7 @@ package org.eclipse.xtext.ide.editor.syntaxcoloring /** * @author Sven Efftinge - Initial contribution and API + * @since 2.11 */ interface IEditorHighlightingConfigurationProvider { diff --git a/plugins/org.eclipse.xtext.util/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.xtext.util/.settings/org.eclipse.jdt.core.prefs index 6b231c14a..451ca9d2e 100644 --- a/plugins/org.eclipse.xtext.util/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/org.eclipse.xtext.util/.settings/org.eclipse.jdt.core.prefs @@ -18,9 +18,10 @@ org.eclipse.jdt.core.codeComplete.staticFieldSuffixes= org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes= org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes= org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.compliance=1.6 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -103,7 +104,7 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disa org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=1.8 +org.eclipse.jdt.core.compiler.source=1.6 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 diff --git a/plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/IFileSystemScanner.xtend b/plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/IFileSystemScanner.xtend index 070a4b0b8..8eacdd73f 100644 --- a/plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/IFileSystemScanner.xtend +++ b/plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/IFileSystemScanner.xtend @@ -14,6 +14,7 @@ import java.io.File /** * @author Sven Efftinge - Initial contribution and API + * @since 2.11 */ @ImplementedBy(JavaIoFileSystemScanner) interface IFileSystemScanner { diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/ResourceServiceProviderServiceLoader.xtend b/plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/ResourceServiceProviderServiceLoader.xtend index 488c293d2..1542e3e62 100644 --- a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/ResourceServiceProviderServiceLoader.xtend +++ b/plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/ResourceServiceProviderServiceLoader.xtend @@ -17,6 +17,7 @@ import com.google.inject.Singleton /** * @author Sven Efftinge - Initial contribution and API + * @since 2.11 */ @Singleton class ResourceServiceProviderServiceLoader implements Provider {