diff options
4 files changed, 20 insertions, 4 deletions
diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/IEncodedStreamContentAccessor.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/IEncodedStreamContentAccessor.java index 31df8839f..424710ebb 100644 --- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/IEncodedStreamContentAccessor.java +++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/IEncodedStreamContentAccessor.java @@ -21,7 +21,7 @@ import org.eclipse.core.runtime.CoreException; * </p> * @since 3.0 */ -public interface IEncodedStreamContentAccessor extends IStreamContentAccessor { +public interface IEncodedStreamContentAccessor extends IStreamContentAccessorExtension2 { /** * @return The character encoding of the stream returned by <code>getContents()</code>. diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/IStreamContentAccessorExtension2.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/IStreamContentAccessorExtension2.java index 4fa9131bc..5ab789187 100644 --- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/IStreamContentAccessorExtension2.java +++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/IStreamContentAccessorExtension2.java @@ -10,11 +10,19 @@ *******************************************************************************/ package org.eclipse.compare; +import org.eclipse.core.runtime.CoreException; + /** * Extension interface for <code>IStreamContentAccessor</code>. Extends the original * concept of a <code>IStreamContentAccessor</code> to answer the Charset (encoding) used for the stream. * * @deprecated Use <code>IEncodedStreamContentAccessor</code> instead */ -public interface IStreamContentAccessorExtension2 extends IEncodedStreamContentAccessor { +public interface IStreamContentAccessorExtension2 extends IStreamContentAccessor { + /** + * @return The character encoding of the stream returned by <code>getContents()</code>. + * @exception CoreException if the contents of this object could not be accessed + * @since 3.0 + */ + String getCharset() throws CoreException; } diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/IEncodedStreamContentAccessor.java b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/IEncodedStreamContentAccessor.java index 31df8839f..424710ebb 100644 --- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/IEncodedStreamContentAccessor.java +++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/IEncodedStreamContentAccessor.java @@ -21,7 +21,7 @@ import org.eclipse.core.runtime.CoreException; * </p> * @since 3.0 */ -public interface IEncodedStreamContentAccessor extends IStreamContentAccessor { +public interface IEncodedStreamContentAccessor extends IStreamContentAccessorExtension2 { /** * @return The character encoding of the stream returned by <code>getContents()</code>. diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/IStreamContentAccessorExtension2.java b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/IStreamContentAccessorExtension2.java index 4fa9131bc..5ab789187 100644 --- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/IStreamContentAccessorExtension2.java +++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/IStreamContentAccessorExtension2.java @@ -10,11 +10,19 @@ *******************************************************************************/ package org.eclipse.compare; +import org.eclipse.core.runtime.CoreException; + /** * Extension interface for <code>IStreamContentAccessor</code>. Extends the original * concept of a <code>IStreamContentAccessor</code> to answer the Charset (encoding) used for the stream. * * @deprecated Use <code>IEncodedStreamContentAccessor</code> instead */ -public interface IStreamContentAccessorExtension2 extends IEncodedStreamContentAccessor { +public interface IStreamContentAccessorExtension2 extends IStreamContentAccessor { + /** + * @return The character encoding of the stream returned by <code>getContents()</code>. + * @exception CoreException if the contents of this object could not be accessed + * @since 3.0 + */ + String getCharset() throws CoreException; } |