diff options
3 files changed, 5 insertions, 11 deletions
diff --git a/org.eclipse.core.filebuffers/src/org/eclipse/core/internal/filebuffers/JavaTextFileBuffer.java b/org.eclipse.core.filebuffers/src/org/eclipse/core/internal/filebuffers/JavaTextFileBuffer.java index 857db9c4a7c..83034b0b1ee 100644 --- a/org.eclipse.core.filebuffers/src/org/eclipse/core/internal/filebuffers/JavaTextFileBuffer.java +++ b/org.eclipse.core.filebuffers/src/org/eclipse/core/internal/filebuffers/JavaTextFileBuffer.java @@ -25,7 +25,6 @@ import org.eclipse.core.resources.IResourceStatus; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.QualifiedName; import org.eclipse.core.runtime.Status; import org.eclipse.core.filebuffers.ITextFileBuffer; @@ -67,10 +66,6 @@ public class JavaTextFileBuffer extends JavaFileBuffer implements ITextFileBuffe */ static final private int BUFFER_SIZE= 8 * READER_CHUNK_SIZE; /** - * Qualified name for the encoding key. - */ - static final private QualifiedName ENCODING_KEY= new QualifiedName(FileBuffersPlugin.PLUGIN_ID, "encoding"); //$NON-NLS-1$ - /** * Constant for representing the ok status. This is considered a value object. */ static final private IStatus STATUS_OK= new Status(IStatus.OK, FileBuffersPlugin.PLUGIN_ID, IStatus.OK, "OK", null); diff --git a/org.eclipse.core.filebuffers/src/org/eclipse/core/internal/filebuffers/TextFileBufferManager.java b/org.eclipse.core.filebuffers/src/org/eclipse/core/internal/filebuffers/TextFileBufferManager.java index a902a81a301..528f0c4d4dc 100644 --- a/org.eclipse.core.filebuffers/src/org/eclipse/core/internal/filebuffers/TextFileBufferManager.java +++ b/org.eclipse.core.filebuffers/src/org/eclipse/core/internal/filebuffers/TextFileBufferManager.java @@ -92,9 +92,9 @@ public class TextFileBufferManager implements ITextFileBufferManager { private AbstractFileBuffer createFileBuffer(IPath location) { if (!isTextFile(location)) return null; -// -// if (isWorkspaceResource(location)) -// return new ResourceTextFileBuffer(this); + + if (isWorkspaceResource(location)) + return new ResourceTextFileBuffer(this); return new JavaTextFileBuffer(this); } diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/editors/text/TextFileDocumentProvider.java b/org.eclipse.ui.editors/src/org/eclipse/ui/editors/text/TextFileDocumentProvider.java index 8c1a0dcb094..e5a0bed5b54 100644 --- a/org.eclipse.ui.editors/src/org/eclipse/ui/editors/text/TextFileDocumentProvider.java +++ b/org.eclipse.ui.editors/src/org/eclipse/ui/editors/text/TextFileDocumentProvider.java @@ -302,9 +302,8 @@ public class TextFileDocumentProvider implements IDocumentProvider, IDocumentPr * @return the workspace file at the location or <code>null</code> */ protected IFile getWorkspaceFileAtLocation(IPath location) { -// IWorkspace workspace= ResourcesPlugin.getWorkspace(); -// return workspace.getRoot().getFileForLocation(location); - return null; + IWorkspace workspace= ResourcesPlugin.getWorkspace(); + return workspace.getRoot().getFileForLocation(location); } protected FileInfo createFileInfo(Object element) throws CoreException { |