Encoding support workv20040210a

24 files changed, 41 insertions, 59 deletions

diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/HistoryItem.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/HistoryItem.java
index a1ae65a91..c9f580b4d 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/HistoryItem.java
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/HistoryItem.java
@@ -28,7 +28,7 @@ import org.eclipse.core.runtime.CoreException;
  * Clients may instantiate this class; it is not intended to be subclassed.
  * </p>
  */
-public class HistoryItem implements IStreamContentAccessorExtension2, ITypedElement, IModificationDate {
+public class HistoryItem implements IEncodedStreamContentAccessor, ITypedElement, IModificationDate {
 	
 	private ITypedElement fBase;
 	private IFileState fFileState; 
@@ -82,7 +82,7 @@ public class HistoryItem implements IStreamContentAccessorExtension2, ITypedElem
 	}
 
 	/* (non-Javadoc)
-	 * @see org.eclipse.compare.IStreamContentAccessor#getEncoding()
+	 * @see org.eclipse.compare.IEncodedStreamContentAccessor#getCharset()
 	 */
 	public String getCharset() {
 		return Utilities.guessCharset(getName());
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 7bca8f01b..4fa9131bc 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/IStreamContentAccessorExtension2.java
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/IStreamContentAccessorExtension2.java
@@ -10,20 +10,11 @@
  *******************************************************************************/
 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 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;
+public interface IStreamContentAccessorExtension2 extends IEncodedStreamContentAccessor {
 }
diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/ResourceNode.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/ResourceNode.java
index 5255b0998..39a88a93a 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/ResourceNode.java
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/ResourceNode.java
@@ -34,7 +34,7 @@ import org.eclipse.compare.structuremergeviewer.IStructureComparator;
  * @see EditionSelectionDialog
  */
 public class ResourceNode extends BufferedContent
-			implements IStreamContentAccessorExtension2, IStructureComparator, ITypedElement,
+			implements IEncodedStreamContentAccessor, IStructureComparator, ITypedElement,
 							IEditableContent, IModificationDate {
 			
 	private IResource fResource;
@@ -210,7 +210,7 @@ public class ResourceNode extends BufferedContent
 	}
 
 	/* (non-Javadoc)
-	 * @see org.eclipse.compare.IStreamContentAccessor#getEncoding()
+	 * @see org.eclipse.compare.IEncodedStreamContentAccessor#getCharset()
 	 */
 	public String getCharset() {
 		return Utilities.getCharset(fResource);
diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/ZipFileStructureCreator.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/ZipFileStructureCreator.java
index bd2f0fe5f..c07f6a453 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/ZipFileStructureCreator.java
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/ZipFileStructureCreator.java
@@ -124,7 +124,7 @@ public class ZipFileStructureCreator implements IStructureCreator {
 		}
 	}
 
-	static class ZipFile extends ZipResource implements IStreamContentAccessorExtension2 {
+	static class ZipFile extends ZipResource implements IEncodedStreamContentAccessor {
 
 		private byte[] fContents;
 
diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/AddFromHistoryDialog.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/AddFromHistoryDialog.java
index 3fd546aef..4f447d97b 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/AddFromHistoryDialog.java
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/AddFromHistoryDialog.java
@@ -32,7 +32,7 @@ import org.eclipse.compare.*;
 
 public class AddFromHistoryDialog extends ResizableDialog {
 	
-	static class HistoryInput implements ITypedElement, IStreamContentAccessorExtension2, IModificationDate {
+	static class HistoryInput implements ITypedElement, IEncodedStreamContentAccessor, IModificationDate {
 		IFile fFile;
 		IFileState fFileState;
 		
diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareOutlinePage.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareOutlinePage.java
index 92f572895..bc599075d 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareOutlinePage.java
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareOutlinePage.java
@@ -28,7 +28,7 @@ public class CompareOutlinePage implements IContentOutlinePage {
 	private Control fControl;
 	private ListenerList fListeners= new ListenerList();
 	private ISelection fSelection;
-	private IActionBars fActionBars;
+	//private IActionBars fActionBars;
 	private CompareEditorInput fCompareEditorInput;
 	
 	CompareOutlinePage(CompareEditorInput input) {
@@ -63,9 +63,9 @@ public class CompareOutlinePage implements IContentOutlinePage {
 	 * @see org.eclipse.ui.part.IPage#setActionBars(org.eclipse.ui.IActionBars)
 	 */
 	public void setActionBars(IActionBars actionBars) {
-		fActionBars= actionBars;
-		if (fControl != null)
-			fControl.setData("actionBars", actionBars);
+		//fActionBars= actionBars;
+		//if (fControl != null)
+		//	fControl.setData("actionBars", actionBars);
 	}
 
 	/* (non-Javadoc)
diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ComparePreferencePage.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ComparePreferencePage.java
index e49e3bab2..116874914 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ComparePreferencePage.java
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ComparePreferencePage.java
@@ -34,7 +34,7 @@ import org.eclipse.compare.structuremergeviewer.*;
 
 public class ComparePreferencePage extends PreferencePage implements IWorkbenchPreferencePage {
 	
-	class FakeInput implements ITypedElement, IStreamContentAccessorExtension2 {
+	class FakeInput implements ITypedElement, IEncodedStreamContentAccessor {
 		static final String UTF_16= "UTF-16"; //$NON-NLS-1$
 		String fContent;
 		
diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/EditionAction.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/EditionAction.java
index 80bde7777..da39a3484 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/EditionAction.java
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/EditionAction.java
@@ -44,7 +44,7 @@ public class EditionAction extends BaseCompareAction {
 	 * Implements the IStreamContentAccessor and ITypedElement protocols
 	 * for a Document.
 	 */
-	class DocumentBufferNode implements ITypedElement, IStreamContentAccessorExtension2 {
+	class DocumentBufferNode implements ITypedElement, IEncodedStreamContentAccessor {
 		private static final String UTF_16= "UTF-16"; //$NON-NLS-1$
 		private IDocument fDocument;
 		private IFile fFile;
diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/Utilities.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/Utilities.java
index 4f22d265d..bbb7bd6a6 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/Utilities.java
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/Utilities.java
@@ -36,8 +36,8 @@ import org.eclipse.core.runtime.Status;
 import org.eclipse.ui.*;
 
 import org.eclipse.compare.CompareConfiguration;
+import org.eclipse.compare.IEncodedStreamContentAccessor;
 import org.eclipse.compare.IStreamContentAccessor;
-import org.eclipse.compare.IStreamContentAccessorExtension2;
 
 /**
  * Convenience and utility methods.
@@ -584,8 +584,8 @@ public class Utilities {
 	public static String readString(IStreamContentAccessor sa) throws CoreException {
 		InputStream is= sa.getContents();
 		String encoding= null;
-		if (sa instanceof IStreamContentAccessorExtension2)
-			encoding= ((IStreamContentAccessorExtension2)sa).getCharset();
+		if (sa instanceof IEncodedStreamContentAccessor)
+			encoding= ((IEncodedStreamContentAccessor)sa).getCharset();
 		if (encoding == null)
 			encoding= ResourcesPlugin.getEncoding();
 		return Utilities.readString(is, encoding);
diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/PreviewPatchPage.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/PreviewPatchPage.java
index f11ee34c8..b2b0fdd2a 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/PreviewPatchPage.java
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/PreviewPatchPage.java
@@ -54,7 +54,7 @@ import org.eclipse.compare.structuremergeviewer.*;
 	/**
 	 * Used with CompareInput
 	 */
-	static class HunkInput implements ITypedElement, IStreamContentAccessorExtension2 {
+	static class HunkInput implements ITypedElement, IEncodedStreamContentAccessor {
 		static final String UTF_16= "UTF-16"; //$NON-NLS-1$
 		String fContent;
 		String fType;
diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/DocumentRangeNode.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/DocumentRangeNode.java
index 749a19dae..de2c54f44 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/DocumentRangeNode.java
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/DocumentRangeNode.java
@@ -41,7 +41,7 @@ import org.eclipse.compare.contentmergeviewer.IDocumentRange;
  * @see Differencer
  */
 public class DocumentRangeNode
-		implements IDocumentRange, IStructureComparator, IEditableContent, IStreamContentAccessorExtension2 {
+		implements IDocumentRange, IStructureComparator, IEditableContent, IEncodedStreamContentAccessor {
 
 	private static final boolean POS_UPDATE= true;
 	private static final String UTF_16= "UTF-16"; //$NON-NLS-1$
diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/HistoryItem.java b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/HistoryItem.java
index a1ae65a91..c9f580b4d 100644
--- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/HistoryItem.java
+++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/HistoryItem.java
@@ -28,7 +28,7 @@ import org.eclipse.core.runtime.CoreException;
  * Clients may instantiate this class; it is not intended to be subclassed.
  * </p>
  */
-public class HistoryItem implements IStreamContentAccessorExtension2, ITypedElement, IModificationDate {
+public class HistoryItem implements IEncodedStreamContentAccessor, ITypedElement, IModificationDate {
 	
 	private ITypedElement fBase;
 	private IFileState fFileState; 
@@ -82,7 +82,7 @@ public class HistoryItem implements IStreamContentAccessorExtension2, ITypedElem
 	}
 
 	/* (non-Javadoc)
-	 * @see org.eclipse.compare.IStreamContentAccessor#getEncoding()
+	 * @see org.eclipse.compare.IEncodedStreamContentAccessor#getCharset()
 	 */
 	public String getCharset() {
 		return Utilities.guessCharset(getName());
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 7bca8f01b..4fa9131bc 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,20 +10,11 @@
  *******************************************************************************/
 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 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;
+public interface IStreamContentAccessorExtension2 extends IEncodedStreamContentAccessor {
 }
diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/ResourceNode.java b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/ResourceNode.java
index 5255b0998..39a88a93a 100644
--- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/ResourceNode.java
+++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/ResourceNode.java
@@ -34,7 +34,7 @@ import org.eclipse.compare.structuremergeviewer.IStructureComparator;
  * @see EditionSelectionDialog
  */
 public class ResourceNode extends BufferedContent
-			implements IStreamContentAccessorExtension2, IStructureComparator, ITypedElement,
+			implements IEncodedStreamContentAccessor, IStructureComparator, ITypedElement,
 							IEditableContent, IModificationDate {
 			
 	private IResource fResource;
@@ -210,7 +210,7 @@ public class ResourceNode extends BufferedContent
 	}
 
 	/* (non-Javadoc)
-	 * @see org.eclipse.compare.IStreamContentAccessor#getEncoding()
+	 * @see org.eclipse.compare.IEncodedStreamContentAccessor#getCharset()
 	 */
 	public String getCharset() {
 		return Utilities.getCharset(fResource);
diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/ZipFileStructureCreator.java b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/ZipFileStructureCreator.java
index bd2f0fe5f..c07f6a453 100644
--- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/ZipFileStructureCreator.java
+++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/ZipFileStructureCreator.java
@@ -124,7 +124,7 @@ public class ZipFileStructureCreator implements IStructureCreator {
 		}
 	}
 
-	static class ZipFile extends ZipResource implements IStreamContentAccessorExtension2 {
+	static class ZipFile extends ZipResource implements IEncodedStreamContentAccessor {
 
 		private byte[] fContents;
 
diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/AddFromHistoryDialog.java b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/AddFromHistoryDialog.java
index 3fd546aef..4f447d97b 100644
--- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/AddFromHistoryDialog.java
+++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/AddFromHistoryDialog.java
@@ -32,7 +32,7 @@ import org.eclipse.compare.*;
 
 public class AddFromHistoryDialog extends ResizableDialog {
 	
-	static class HistoryInput implements ITypedElement, IStreamContentAccessorExtension2, IModificationDate {
+	static class HistoryInput implements ITypedElement, IEncodedStreamContentAccessor, IModificationDate {
 		IFile fFile;
 		IFileState fFileState;
 		
diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareOutlinePage.java b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareOutlinePage.java
index 92f572895..bc599075d 100644
--- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareOutlinePage.java
+++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareOutlinePage.java
@@ -28,7 +28,7 @@ public class CompareOutlinePage implements IContentOutlinePage {
 	private Control fControl;
 	private ListenerList fListeners= new ListenerList();
 	private ISelection fSelection;
-	private IActionBars fActionBars;
+	//private IActionBars fActionBars;
 	private CompareEditorInput fCompareEditorInput;
 	
 	CompareOutlinePage(CompareEditorInput input) {
@@ -63,9 +63,9 @@ public class CompareOutlinePage implements IContentOutlinePage {
 	 * @see org.eclipse.ui.part.IPage#setActionBars(org.eclipse.ui.IActionBars)
 	 */
 	public void setActionBars(IActionBars actionBars) {
-		fActionBars= actionBars;
-		if (fControl != null)
-			fControl.setData("actionBars", actionBars);
+		//fActionBars= actionBars;
+		//if (fControl != null)
+		//	fControl.setData("actionBars", actionBars);
 	}
 
 	/* (non-Javadoc)
diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/ComparePreferencePage.java b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/ComparePreferencePage.java
index e49e3bab2..116874914 100644
--- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/ComparePreferencePage.java
+++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/ComparePreferencePage.java
@@ -34,7 +34,7 @@ import org.eclipse.compare.structuremergeviewer.*;
 
 public class ComparePreferencePage extends PreferencePage implements IWorkbenchPreferencePage {
 	
-	class FakeInput implements ITypedElement, IStreamContentAccessorExtension2 {
+	class FakeInput implements ITypedElement, IEncodedStreamContentAccessor {
 		static final String UTF_16= "UTF-16"; //$NON-NLS-1$
 		String fContent;
 		
diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/EditionAction.java b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/EditionAction.java
index 80bde7777..da39a3484 100644
--- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/EditionAction.java
+++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/EditionAction.java
@@ -44,7 +44,7 @@ public class EditionAction extends BaseCompareAction {
 	 * Implements the IStreamContentAccessor and ITypedElement protocols
 	 * for a Document.
 	 */
-	class DocumentBufferNode implements ITypedElement, IStreamContentAccessorExtension2 {
+	class DocumentBufferNode implements ITypedElement, IEncodedStreamContentAccessor {
 		private static final String UTF_16= "UTF-16"; //$NON-NLS-1$
 		private IDocument fDocument;
 		private IFile fFile;
diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/Utilities.java b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/Utilities.java
index 4f22d265d..bbb7bd6a6 100644
--- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/Utilities.java
+++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/Utilities.java
@@ -36,8 +36,8 @@ import org.eclipse.core.runtime.Status;
 import org.eclipse.ui.*;
 
 import org.eclipse.compare.CompareConfiguration;
+import org.eclipse.compare.IEncodedStreamContentAccessor;
 import org.eclipse.compare.IStreamContentAccessor;
-import org.eclipse.compare.IStreamContentAccessorExtension2;
 
 /**
  * Convenience and utility methods.
@@ -584,8 +584,8 @@ public class Utilities {
 	public static String readString(IStreamContentAccessor sa) throws CoreException {
 		InputStream is= sa.getContents();
 		String encoding= null;
-		if (sa instanceof IStreamContentAccessorExtension2)
-			encoding= ((IStreamContentAccessorExtension2)sa).getCharset();
+		if (sa instanceof IEncodedStreamContentAccessor)
+			encoding= ((IEncodedStreamContentAccessor)sa).getCharset();
 		if (encoding == null)
 			encoding= ResourcesPlugin.getEncoding();
 		return Utilities.readString(is, encoding);
diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/PreviewPatchPage.java b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/PreviewPatchPage.java
index f11ee34c8..b2b0fdd2a 100644
--- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/PreviewPatchPage.java
+++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/PreviewPatchPage.java
@@ -54,7 +54,7 @@ import org.eclipse.compare.structuremergeviewer.*;
 	/**
 	 * Used with CompareInput
 	 */
-	static class HunkInput implements ITypedElement, IStreamContentAccessorExtension2 {
+	static class HunkInput implements ITypedElement, IEncodedStreamContentAccessor {
 		static final String UTF_16= "UTF-16"; //$NON-NLS-1$
 		String fContent;
 		String fType;
diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/DocumentRangeNode.java b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/DocumentRangeNode.java
index 749a19dae..de2c54f44 100644
--- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/DocumentRangeNode.java
+++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/DocumentRangeNode.java
@@ -41,7 +41,7 @@ import org.eclipse.compare.contentmergeviewer.IDocumentRange;
  * @see Differencer
  */
 public class DocumentRangeNode
-		implements IDocumentRange, IStructureComparator, IEditableContent, IStreamContentAccessorExtension2 {
+		implements IDocumentRange, IStructureComparator, IEditableContent, IEncodedStreamContentAccessor {
 
 	private static final boolean POS_UPDATE= true;
 	private static final String UTF_16= "UTF-16"; //$NON-NLS-1$
diff --git a/examples/org.eclipse.compare.examples.xml/tests/org/eclipse/compare/examples/xml/TestXMLStructureCreator.java b/examples/org.eclipse.compare.examples.xml/tests/org/eclipse/compare/examples/xml/TestXMLStructureCreator.java
index 3baf14cb1..f8fb50b8e 100644
--- a/examples/org.eclipse.compare.examples.xml/tests/org/eclipse/compare/examples/xml/TestXMLStructureCreator.java
+++ b/examples/org.eclipse.compare.examples.xml/tests/org/eclipse/compare/examples/xml/TestXMLStructureCreator.java
@@ -17,7 +17,7 @@ import junit.framework.*;
 
 import org.eclipse.jface.text.Document;
 
-import org.eclipse.compare.IStreamContentAccessorExtension2;
+import org.eclipse.compare.IEncodedStreamContentAccessor;
 import org.eclipse.compare.examples.xml.XMLChildren;
 import org.eclipse.compare.examples.xml.XMLNode;
 import org.eclipse.compare.examples.xml.XMLStructureCreator;
@@ -28,7 +28,7 @@ public class TestXMLStructureCreator extends TestCase {
 	Document fdoc;
 	XMLStructureCreator fsc;
 	
-	public class TestStream implements IStreamContentAccessorExtension2 {
+	public class TestStream implements IEncodedStreamContentAccessor {
 		String fString;
 		
 		public TestStream(String string) {
diff --git a/examples/org.eclipse.compare.examples/src/org/eclipse/compare/examples/structurecreator/Util.java b/examples/org.eclipse.compare.examples/src/org/eclipse/compare/examples/structurecreator/Util.java
index 13694220c..b828af862 100644
--- a/examples/org.eclipse.compare.examples/src/org/eclipse/compare/examples/structurecreator/Util.java
+++ b/examples/org.eclipse.compare.examples/src/org/eclipse/compare/examples/structurecreator/Util.java
@@ -14,7 +14,7 @@ import java.io.*;
 import java.util.*;
 
 import org.eclipse.compare.IStreamContentAccessor;
-import org.eclipse.compare.IStreamContentAccessorExtension2;
+import org.eclipse.compare.IEncodedStreamContentAccessor;
 import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.CoreException;
 
@@ -70,8 +70,8 @@ public class Util {
 	static String readString(IStreamContentAccessor sa) throws CoreException {
 		InputStream is= sa.getContents();
 		String encoding= null;
-		if (sa instanceof IStreamContentAccessorExtension2)
-			encoding= ((IStreamContentAccessorExtension2)sa).getCharset();
+		if (sa instanceof IEncodedStreamContentAccessor)
+			encoding= ((IEncodedStreamContentAccessor)sa).getCharset();
 		if (encoding == null)
 			encoding= ResourcesPlugin.getEncoding();
 		return readString(is, encoding);