From 49cf8e91d7617449924c1bf0f2fdd250dd574cd0 Mon Sep 17 00:00:00 2001 From: Stefan Oehme Date: Wed, 4 Jun 2014 15:35:45 +0200 Subject: [PATCH] merge eclipse settings instead of overwriting them --- .../java/org/xtext/gradle/tasks/XtextEclipsePreferences.xtend | 4 ++++ .../java/org/xtext/gradle/tasks/XtextEclipseSettings.xtend | 1 + 2 files changed, 5 insertions(+) diff --git a/xtext-gradle-plugin/src/main/java/org/xtext/gradle/tasks/XtextEclipsePreferences.xtend b/xtext-gradle-plugin/src/main/java/org/xtext/gradle/tasks/XtextEclipsePreferences.xtend index 0a69975d..fe19af96 100644 --- a/xtext-gradle-plugin/src/main/java/org/xtext/gradle/tasks/XtextEclipsePreferences.xtend +++ b/xtext-gradle-plugin/src/main/java/org/xtext/gradle/tasks/XtextEclipsePreferences.xtend @@ -23,5 +23,9 @@ class XtextEclipsePreferences extends EclipsePreferences { override public save() throws BackingStoreException { super.save } + + override public load() throws BackingStoreException { + super.load + } } diff --git a/xtext-gradle-plugin/src/main/java/org/xtext/gradle/tasks/XtextEclipseSettings.xtend b/xtext-gradle-plugin/src/main/java/org/xtext/gradle/tasks/XtextEclipseSettings.xtend index c59e7b1a..47ac2dcd 100644 --- a/xtext-gradle-plugin/src/main/java/org/xtext/gradle/tasks/XtextEclipseSettings.xtend +++ b/xtext-gradle-plugin/src/main/java/org/xtext/gradle/tasks/XtextEclipseSettings.xtend @@ -15,6 +15,7 @@ class XtextEclipseSettings extends DefaultTask { def writeSettings() { xtext.languages.forEach [ Language language | val prefs = new XtextEclipsePreferences(project, language.name) + prefs.load prefs.putBoolean("is_project_specific", true) language.outputs.forEach [ output | prefs.put(output.getKey("directory"), project.file(output.dir).absolutePath)