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

Remove the hardcode "objdump"

Browse source
This commit is contained in:
Alain Magloire 2004-01-20 21:15:52 +00:00
parent 2c72e31d52
commit 3b42a40c54
2 changed files with 15 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
core/org.eclipse.cdt.ui/ChangeLog
View file

@ -1,3 +1,9 @@
2004-01-20 Alain Magloire
Remove the hardcode "objdump" in the EditorUtility.
* src/org/eclipse/cdt/internal/ui/util/EditorUtility.java
2004-01-19 Hoda Amer 2004-01-19 Hoda Amer
Completed looking up macros with function style. Completed looking up macros with function style.

40
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/EditorUtility.java
View file

@ -5,10 +5,7 @@ package org.eclipse.cdt.internal.ui.util;
* All Rights Reserved. * All Rights Reserved.
*/ */
import java.io.BufferedReader;
import java.io.ByteArrayInputStream; import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStreamReader;
import org.eclipse.cdt.core.model.CModelException; import org.eclipse.cdt.core.model.CModelException;
import org.eclipse.cdt.core.model.IBinary; import org.eclipse.cdt.core.model.IBinary;
@ -19,11 +16,9 @@ import org.eclipse.cdt.core.model.IWorkingCopy;
import org.eclipse.cdt.core.resources.FileStorage; import org.eclipse.cdt.core.resources.FileStorage;
import org.eclipse.cdt.internal.ui.editor.CEditor; import org.eclipse.cdt.internal.ui.editor.CEditor;
import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.cdt.ui.CUIPlugin;
import org.eclipse.cdt.utils.spawner.ProcessFactory;
import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IResource; import org.eclipse.core.resources.IResource;
import org.eclipse.core.resources.IStorage; import org.eclipse.core.resources.IStorage;
import org.eclipse.core.runtime.IPath;
import org.eclipse.ui.IEditorDescriptor; import org.eclipse.ui.IEditorDescriptor;
import org.eclipse.ui.IEditorInput; import org.eclipse.ui.IEditorInput;
import org.eclipse.ui.IEditorPart; import org.eclipse.ui.IEditorPart;
@ -38,6 +33,11 @@ import org.eclipse.ui.texteditor.ITextEditor;
public class EditorUtility { public class EditorUtility {
/**
* The ID of the default text editor
*/
public static final String DEFAULT_TEXT_EDITOR_ID = "org.eclipse.ui.DefaultTextEditor"; //$NON-NLS-1$
private EditorUtility () { private EditorUtility () {
} }
@ -286,7 +286,7 @@ public class EditorUtility {
if (descriptor != null) { if (descriptor != null) {
return descriptor.getId(); return descriptor.getId();
} else { } else {
return registry.getDefaultEditor().getId(); return registry.findEditor(DEFAULT_TEXT_EDITOR_ID).getId();
} }
} }
return null; return null;
@ -298,32 +298,10 @@ public class EditorUtility {
public static IStorage getStorage(IBinary bin) { public static IStorage getStorage(IBinary bin) {
IStorage store = null; IStorage store = null;
Process objdump = null;
IPath path;
IResource file = null;
file = bin.getResource();
if (file == null)
return store;
path = file.getLocation();
try { try {
String[] args = new String[] {"objdump", "-CxS", path.toOSString()}; store = new FileStorage (new ByteArrayInputStream(bin.getBuffer().getContents().getBytes()), bin.getPath());
objdump = ProcessFactory.getFactory().exec(args); } catch (CModelException e) {
StringBuffer buffer = new StringBuffer(); // nothing;
BufferedReader stdout =
new BufferedReader(new InputStreamReader(objdump.getInputStream()));
char[] buf = new char[128];
while (stdout.read(buf, 0, buf.length) != -1) {
buffer.append(buf);
}
store = new FileStorage(new ByteArrayInputStream(buffer.toString().getBytes()), path);
} catch (SecurityException e) {
} catch (IndexOutOfBoundsException e) {
} catch (NullPointerException e) {
} catch (IOException e) {
} finally {
if (objdump != null) {
objdump.destroy();
}
} }
return store; return store;
} }