mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-23 22:52:11 +02:00
Code Issues Wiki Activity

Patch from Anton Leherbauer, NPE, bug 131267.

Browse source
This commit is contained in:
Markus Schorn 2006-05-09 16:08:18 +00:00
parent 018ce2f78c
commit d2b0d64e51
1 changed files with 14 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CElementContentProvider.java
View file

@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2000, 2005 QNX Software Systems and others.
* Copyright (c) 2000, 2006 QNX Software Systems and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@ -7,6 +7,7 @@
*
* Contributors:
* QNX Software Systems - Initial API and implementation
* Anton Leherbauer (Wind River Systems) - Fixed bug 131267
*******************************************************************************/
package org.eclipse.cdt.ui;
@ -376,7 +377,7 @@ public class CElementContentProvider extends BaseCElementContentProvider impleme
}
}
/**
/*
* @see org.eclipse.jface.text.information.IInformationProvider#getSubject(org.eclipse.jface.text.ITextViewer, int)
*/
public IRegion getSubject(ITextViewer textViewer, int offset) {
@ -391,16 +392,20 @@ public class CElementContentProvider extends BaseCElementContentProvider impleme
return null;
}
/**
/*
* @see org.eclipse.jface.text.information.IInformationProvider#getInformation(org.eclipse.jface.text.ITextViewer,
* org.eclipse.jface.text.IRegion)
*/
public String getInformation(ITextViewer textViewer, IRegion subject)
{
return getInformation2(textViewer, subject).toString();
public String getInformation(ITextViewer textViewer, IRegion subject) {
// deprecated API - not used anymore
Object info = getInformation2(textViewer, subject);
if (info != null) {
return info.toString();
}
return null;
}
/**
/*
* @see org.eclipse.jface.text.information.IInformationProviderExtension#getInformation2(org.eclipse.jface.text.ITextViewer, org.eclipse.jface.text.IRegion)
*/
public Object getInformation2(ITextViewer textViewer, IRegion subject) {
@ -409,9 +414,9 @@ public class CElementContentProvider extends BaseCElementContentProvider impleme
try {
ICElement element = SelectionConverter.getElementAtOffset(fEditor);
if (element != null) {
return element.toString();
return element;
}
return SelectionConverter.getInput(fEditor).toString();
return SelectionConverter.getInput(fEditor);
} catch (CModelException e) {
return null;
}