diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/generator/AbstractFileSystemAccess.java b/plugins/org.eclipse.xtext/src/org/eclipse/xtext/generator/AbstractFileSystemAccess.java index dd7bf143a..a57d94370 100644 --- a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/generator/AbstractFileSystemAccess.java +++ b/plugins/org.eclipse.xtext/src/org/eclipse/xtext/generator/AbstractFileSystemAccess.java @@ -9,7 +9,6 @@ package org.eclipse.xtext.generator; import static com.google.common.collect.Maps.*; -import java.io.InputStream; import java.util.Map; import org.eclipse.emf.common.util.URI; @@ -21,7 +20,7 @@ import com.google.inject.Inject; * @author Sven Efftinge - Initial contribution and API */ public abstract class AbstractFileSystemAccess implements IFileSystemAccess, IFileSystemAccessExtension, - IFileSystemAccessExtension2, IFileSystemAccessExtension3 { + IFileSystemAccessExtension2 { @Inject(optional = true) private IFilePostProcessor postProcessor; @@ -76,27 +75,6 @@ public abstract class AbstractFileSystemAccess implements IFileSystemAccess, IFi generateFile(fileName, DEFAULT_OUTPUT, contents); } - /** - * @since 2.4 - */ - public void generateFile(String fileName, InputStream content) { - generateFile(fileName, DEFAULT_OUTPUT, content); - } - - /** - * @since 2.4 - */ - public InputStream readBinaryFile(String fileName) { - return readBinaryFile(fileName, DEFAULT_OUTPUT); - } - - /** - * @since 2.4 - */ - public CharSequence readTextFile(String fileName) { - return readTextFile(fileName, DEFAULT_OUTPUT); - } - /** * @since 2.1 */ diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/generator/AbstractFileSystemAccess2.java b/plugins/org.eclipse.xtext/src/org/eclipse/xtext/generator/AbstractFileSystemAccess2.java new file mode 100644 index 000000000..b9d2cfc70 --- /dev/null +++ b/plugins/org.eclipse.xtext/src/org/eclipse/xtext/generator/AbstractFileSystemAccess2.java @@ -0,0 +1,43 @@ +/******************************************************************************* + * Copyright (c) 2013 itemis AG (http://www.itemis.eu) 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 + *******************************************************************************/ +package org.eclipse.xtext.generator; + +import java.io.InputStream; + +/** + * + * Abstract base class for file system access supporting {@link IFileSystemAccessExtension3}. + * + * @author Sven Efftinge - Initial contribution and API + * @since 2.4 + */ +public abstract class AbstractFileSystemAccess2 extends AbstractFileSystemAccess implements IFileSystemAccessExtension3{ + + /** + * @since 2.4 + */ + public void generateFile(String fileName, InputStream content) { + generateFile(fileName, DEFAULT_OUTPUT, content); + } + + /** + * @since 2.4 + */ + public InputStream readBinaryFile(String fileName) { + return readBinaryFile(fileName, DEFAULT_OUTPUT); + } + + /** + * @since 2.4 + */ + public CharSequence readTextFile(String fileName) { + return readTextFile(fileName, DEFAULT_OUTPUT); + } + + +} diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/generator/InMemoryFileSystemAccess.java b/plugins/org.eclipse.xtext/src/org/eclipse/xtext/generator/InMemoryFileSystemAccess.java index 021fc7846..6cc720515 100644 --- a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/generator/InMemoryFileSystemAccess.java +++ b/plugins/org.eclipse.xtext/src/org/eclipse/xtext/generator/InMemoryFileSystemAccess.java @@ -25,7 +25,7 @@ import com.google.common.io.ByteStreams; * @author Moritz Eysholdt * @since 2.0 */ -public class InMemoryFileSystemAccess extends AbstractFileSystemAccess { +public class InMemoryFileSystemAccess extends AbstractFileSystemAccess2 { private Map files = newTreeMap(); // the TreeMap sorts all files by name diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/generator/JavaIoFileSystemAccess.java b/plugins/org.eclipse.xtext/src/org/eclipse/xtext/generator/JavaIoFileSystemAccess.java index b20e33e3b..3d9fe7080 100644 --- a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/generator/JavaIoFileSystemAccess.java +++ b/plugins/org.eclipse.xtext/src/org/eclipse/xtext/generator/JavaIoFileSystemAccess.java @@ -36,7 +36,7 @@ import com.google.inject.Inject; * @author Jan Koehnlein * @author Moritz Eysholdt */ -public class JavaIoFileSystemAccess extends AbstractFileSystemAccess { +public class JavaIoFileSystemAccess extends AbstractFileSystemAccess2 { @Inject private IEncodingProvider encodingProvider;