Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndre Weinand2004-02-16 15:30:55 +0000
committerAndre Weinand2004-02-16 15:30:55 +0000
commit7e532caa0f1731ef21c22d8a83a6cb8a7123d914 (patch)
treee43081c2c6604ae6badc2d070f562fcf6f1e58ad /bundles/org.eclipse.compare/compare
parentf2574803e6ed4bc0f12fa63122aeac41dde2a7e8 (diff)
downloadeclipse.platform.team-7e532caa0f1731ef21c22d8a83a6cb8a7123d914.tar.gz
eclipse.platform.team-7e532caa0f1731ef21c22d8a83a6cb8a7123d914.tar.xz
eclipse.platform.team-7e532caa0f1731ef21c22d8a83a6cb8a7123d914.zip
Encoding support work
Diffstat (limited to 'bundles/org.eclipse.compare/compare')
-rw-r--r--bundles/org.eclipse.compare/compare/org/eclipse/compare/IEncodedStreamContentAccessor.java10
-rw-r--r--bundles/org.eclipse.compare/compare/org/eclipse/compare/IStreamContentAccessorExtension2.java20
2 files changed, 28 insertions, 2 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..1d0f3e261 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/IEncodedStreamContentAccessor.java
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/IEncodedStreamContentAccessor.java
@@ -24,8 +24,14 @@ import org.eclipse.core.runtime.CoreException;
public interface IEncodedStreamContentAccessor 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
+ * Returns the name of a charset encoding to be used when decoding this
+ * stream accessor's contents into characters. Returns <code>null</code> if a proper
+ * encoding cannot be determined.
+ *
+ * @return the name of a charset, or <code>null</code>
+ * @exception CoreException if an error happens while determining
+ * the charset. See any refinements for more information.
+ * @see IStreamContentAccessor#getContents
* @since 3.0
*/
String getCharset() throws CoreException;
diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/IStreamContentAccessorExtension2.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/IStreamContentAccessorExtension2.java
new file mode 100644
index 000000000..4fa9131bc
--- /dev/null
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/IStreamContentAccessorExtension2.java
@@ -0,0 +1,20 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2004 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Common Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/cpl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.compare;
+
+/**
+ * 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 {
+}

Back to the top