mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-09-10 12:03:16 +02:00
Code Issues Wiki Activity

Again the problem:

Browse source 
Eclipse filename association with editors is done strictly via
	the plugin.xml(and Preference Page).
	The CDT is ship with a sensible default i.e. *.c, *.h, *.cpp etc ..
	We use an hack in EditorUtility.getEditorID(...)
	To change this behaviour for the CView and the
	COutliner.

	Added support for DoubleClick to open a header
	in the outliner.

	Related PRs: 64834, 44363
This commit is contained in:
Alain Magloire 2004-06-04 02:05:39 +00:00
parent 0503091564
commit df3c06eb4b
3 changed files with 81 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,3 +1,17 @@
2004-06-03 Alain Magloire
Again the problem:
Eclipse filename association with editors is done strictly via
the plugin.xml(and Preference Page).
The CDT is ship with a sensible default i.e. *.c, *.h, *.cpp etc ..
We use an hack in EditorUtility.getEditorID(...)
To change this behaviour for the CView and the
COutliner.
Added support for DoubleClick to open a header
in the outliner.
Related PRs: 64834, 44363
2004-06-03 Alain Magloire
Patch from Sam Rob, fix for 64783

15
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CContentOutlinePage.java
View file

@ -7,6 +7,7 @@ package org.eclipse.cdt.internal.ui.editor;
import java.util.ArrayList;
import java.util.Iterator;
import org.eclipse.cdt.core.model.ICElement;
import org.eclipse.cdt.core.model.ITranslationUnit;
import org.eclipse.cdt.internal.ui.IContextMenuConstants;
@ -25,6 +26,8 @@ import org.eclipse.jface.action.MenuManager;
import org.eclipse.jface.action.Separator;
import org.eclipse.jface.util.ListenerList;
import org.eclipse.jface.viewers.AbstractTreeViewer;
import org.eclipse.jface.viewers.DoubleClickEvent;
import org.eclipse.jface.viewers.IDoubleClickListener;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.ISelectionChangedListener;
import org.eclipse.jface.viewers.IStructuredSelection;
@ -162,7 +165,17 @@ public class CContentOutlinePage extends Page implements IContentOutlinePage, IS
Control control= treeViewer.getControl();
Menu menu= manager.createContextMenu(control);
control.setMenu(menu);
treeViewer.addDoubleClickListener(new IDoubleClickListener() {
/* (non-Javadoc)
* @see org.eclipse.jface.viewers.IDoubleClickListener#doubleClick(org.eclipse.jface.viewers.DoubleClickEvent)
*/
public void doubleClick(DoubleClickEvent event) {
if (fOpenIncludeAction != null) {
fOpenIncludeAction.run();
}
}
});
// register global actions
IPageSite site= getSite();
site.registerContextMenu(fContextMenuId, manager, treeViewer);

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

@ -8,6 +8,7 @@ package org.eclipse.cdt.internal.ui.util;
import java.io.ByteArrayInputStream;
import org.eclipse.cdt.core.model.CModelException;
import org.eclipse.cdt.core.model.CoreModel;
import org.eclipse.cdt.core.model.IBinary;
import org.eclipse.cdt.core.model.ICElement;
import org.eclipse.cdt.core.model.ISourceReference;
@ -16,6 +17,7 @@ import org.eclipse.cdt.core.model.IWorkingCopy;
import org.eclipse.cdt.core.resources.FileStorage;
import org.eclipse.cdt.internal.ui.editor.CEditor;
import org.eclipse.cdt.internal.ui.editor.CEditorMessages;
import org.eclipse.cdt.internal.ui.editor.ITranslationUnitEditorInput;
import org.eclipse.cdt.ui.CUIPlugin;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IResource;
@ -30,7 +32,6 @@ import org.eclipse.ui.IFileEditorInput;
import org.eclipse.ui.IWorkbenchPage;
import org.eclipse.ui.PartInitException;
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.ide.IDE;
import org.eclipse.ui.part.FileEditorInput;
import org.eclipse.ui.texteditor.ITextEditor;
@ -88,10 +89,10 @@ public class EditorUtility {
}
IEditorInput input = getEditorInput(inputElement);
if (input instanceof IFileEditorInput) {
IFileEditorInput fileInput= (IFileEditorInput) input;
return openInEditor(fileInput.getFile(), activate);
}
//if (input instanceof IFileEditorInput) {
// IFileEditorInput fileInput= (IFileEditorInput) input;
// return openInEditor(fileInput.getFile(), activate);
//}
if (input != null) {
return openInEditor(input, getEditorID(input, inputElement), activate);
@ -109,17 +110,17 @@ public class EditorUtility {
}
}
private static IEditorPart openInEditor(IFile file, boolean activate) throws PartInitException {
if (file != null) {
IWorkbenchPage p= CUIPlugin.getActivePage();
if (p != null) {
IEditorPart editorPart = IDE.openEditor(p, file, activate);
initializeHighlightRange(editorPart);
return editorPart;
}
}
return null;
}
// private static IEditorPart openInEditor(IFile file, boolean activate) throws PartInitException {
// if (file != null) {
// IWorkbenchPage p= CUIPlugin.getActivePage();
// if (p != null) {
// IEditorPart editorPart = IDE.openEditor(p, file, activate);
// initializeHighlightRange(editorPart);
// return editorPart;
// }
// }
// return null;
// }
private static IEditorPart openInEditor(IEditorInput input, String editorID, boolean activate) throws PartInitException {
if (input != null) {
@ -248,41 +249,6 @@ public class EditorUtility {
// return getTranslationUnit(element.getParent());
// }
// public static IEditorPart openInEditor (IFile file) throws PartInitException {
// IWorkbenchWindow window= CUIPlugin.getDefault().getActiveWorkbenchWindow();
// if (window != null) {
// IWorkbenchPage p= window.getActivePage();
// if (p != null) {
// return p.openEditor(file);
// }
// }
// return null;
// }
//
//
// public static IEditorPart openInEditor (IPath path) throws PartInitException {
// IFile f = ResourcesPlugin.getWorkspace().getRoot().getFileForLocation(path);
// if (f == null) {
// IStorage s = new FileStorage(path);
// return openInEditor(s, path.lastSegment());
// }
// return openInEditor(f);
// }
//
// public static IEditorPart openInEditor (IStorage store, String name) throws PartInitException {
// IEditorInput ei = new ExternalEditorInput(store);
// IWorkbenchWindow window= CUIPlugin.getDefault().getActiveWorkbenchWindow();
// if (window != null) {
// IWorkbenchPage p = window.getActivePage();
// if (p != null) {
// return p.openEditor(ei, getEditorID(name));
// }
// }
// return null;
// }
//
public static String getEditorID(String name) {
IEditorRegistry registry = PlatformUI.getWorkbench().getEditorRegistry();
if (registry != null) {
@ -297,7 +263,42 @@ public class EditorUtility {
}
public static String getEditorID(IEditorInput input, Object inputObject) {
return getEditorID(input.getName());
String ID = getEditorID(input.getName());
if (!"org.eclipse.ui.DefaultTextEditor".equals(ID)) { // $NON-NLS-1$
return ID;
}
// TODO:FIXME:HACK etc ...
// Unfortunately unless specifying all of possible headers in the plugin.xml
// and it is not possible(for example filenames: iostream, cstdlib, etc ...
// We try this hack here. This is to be remove when the Eclipse Platform
// implement there contentious IContentType
ITranslationUnit tunit = null;
if (input instanceof IFileEditorInput) {
IFileEditorInput editorInput = (IFileEditorInput)input;
IFile file = editorInput.getFile();
ICElement celement = CoreModel.getDefault().create(file);
if (celement instanceof ITranslationUnit) {
tunit = (ITranslationUnit)celement;
}
} else if (input instanceof ITranslationUnitEditorInput) {
ITranslationUnitEditorInput editorInput = (ITranslationUnitEditorInput)input;
tunit = editorInput.getTranslationUnit();
}
// Choose an a file base on the extension.
if (tunit != null) {
if (tunit.isCLanguage()) {
return getEditorID("No_ExIsTeNt_FiLe.c");//$NON-NLS-1$
} else if (tunit.isCXXLanguage()) {
return getEditorID("No_ExIsTeNt_FiLe.cpp");//$NON-NLS-1$
}
}
return ID;
}
/**