mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-29 19:45:01 +02:00
Code Issues Wiki Activity

Fix for 215459: Content of binary files cannot be displayed anymore

Browse source
This commit is contained in:
Anton Leherbauer 2008-01-18 15:54:23 +00:00
parent b6f504aa96
commit 06ad4b31a5
1 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/DefaultBinaryFileEditor.java
View file

@ -1,5 +1,5 @@
/******************************************************************************* /*******************************************************************************
* Copyright (c) 2007 Wind River Systems, Inc. and others. * Copyright (c) 2007, 2008 Wind River Systems, Inc. and others.
* All rights reserved. This program and the accompanying materials * All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0 * are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at * which accompanies this distribution, and is available at
@ -41,8 +41,10 @@ import org.eclipse.cdt.ui.CUIPlugin;
import org.eclipse.cdt.utils.IGnuToolFactory; import org.eclipse.cdt.utils.IGnuToolFactory;
import org.eclipse.cdt.utils.Objdump; import org.eclipse.cdt.utils.Objdump;
import org.eclipse.cdt.internal.ui.util.EditorUtility;
/** /**
* An (readonly) editor to view binary files. This default implementation displays * A readonly editor to view binary files. This default implementation displays
* the GNU objdump output of the binary as plain text. If no objdump output can be * the GNU objdump output of the binary as plain text. If no objdump output can be
* obtained, the binary content is displayed. * obtained, the binary content is displayed.
*/ */
@ -122,8 +124,12 @@ public class DefaultBinaryFileEditor extends AbstractTextEditor {
} }
} }
if (fStorage == null) { if (fStorage == null) {
// fall back to binary content // backwards compatibility
fStorage= (IFile)fBinary.getResource(); fStorage= EditorUtility.getStorage(fBinary);
if (fStorage == null) {
// fall back to binary content
fStorage= (IFile)fBinary.getResource();
}
} }
} }
return fStorage; return fStorage;
@ -132,7 +138,7 @@ public class DefaultBinaryFileEditor extends AbstractTextEditor {
} }
/** /**
* A storage docment provider for binary files. * A storage document provider for binary files.
*/ */
public static class BinaryFileDocumentProvider extends StorageDocumentProvider { public static class BinaryFileDocumentProvider extends StorageDocumentProvider {