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

Oops - forgot the change log for 66273...

Browse source
This commit is contained in:
Bogdan Gheorghe 2004-06-09 14:54:28 +00:00
parent 7f558ffc16
commit 192beb6f39
3 changed files with 29 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,12 +1,10 @@
2004-06-09 Bogdan Gheorghe
Fix for Bug 66273 - Opening declaration causes stack overflow
* src/org/eclipse/cdt/internal/ui/util/EditorUtility.java
ChangeLog ChangeLog
2004-06-08 Tanya Wolff
Fix for bug 66139
* src/org/eclipse/cdt/internal/ui/editor/CEditorMessages.properties
Fix for bug 66136
* src/org/eclipse/cdt/internal/ui/preferences/PreferencesMessages.properties
* src/org/eclipse/cdt/internal/ui/preferences/CFileTypesPreferencesBlock.java
2004-06-08 Tanya Wolff 2004-06-08 Tanya Wolff
Fix for Bug 63467 - choice format for displaying plural Fix for Bug 63467 - choice format for displaying plural

4
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchResultPage.java
View file

@ -154,7 +154,7 @@ public class CSearchResultPage extends AbstractTextSearchViewPage {
* @see org.eclipse.search.ui.text.AbstractTextSearchViewPage#configureTableViewer(org.eclipse.jface.viewers.TableViewer) * @see org.eclipse.search.ui.text.AbstractTextSearchViewPage#configureTableViewer(org.eclipse.jface.viewers.TableViewer)
*/ */
protected void configureTableViewer(TableViewer viewer) { protected void configureTableViewer(TableViewer viewer) {
viewer.setLabelProvider(new CountLabelProvider(this, new CSearchResultLabelProvider())); viewer.setLabelProvider(new CountLabelProvider(this, new CSearchResultLabelProvider(this)));
_contentProvider=new CSearchTableContentProvider(viewer); _contentProvider=new CSearchTableContentProvider(viewer);
viewer.setContentProvider(_contentProvider); viewer.setContentProvider(_contentProvider);
setSortOrder(_currentSortOrder); setSortOrder(_currentSortOrder);
@ -248,6 +248,8 @@ public class CSearchResultPage extends AbstractTextSearchViewPage {
if (getLayout() != FLAG_LAYOUT_FLAT) if (getLayout() != FLAG_LAYOUT_FLAT)
addGroupActions(tbm); addGroupActions(tbm);
} }
} }

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

@ -25,6 +25,7 @@ import org.eclipse.core.runtime.CoreException;
import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.viewers.LabelProvider; import org.eclipse.jface.viewers.LabelProvider;
import org.eclipse.search.ui.ISearchResultViewEntry; import org.eclipse.search.ui.ISearchResultViewEntry;
import org.eclipse.search.ui.text.Match;
import org.eclipse.swt.graphics.Image; import org.eclipse.swt.graphics.Image;
import org.eclipse.swt.graphics.Point; import org.eclipse.swt.graphics.Point;
@ -43,6 +44,8 @@ public class CSearchResultLabelProvider extends LabelProvider {
public static final String POTENTIAL_MATCH = CSearchMessages.getString("CSearchResultLabelProvider.potentialMatch"); //$NON-NLS-1$ public static final String POTENTIAL_MATCH = CSearchMessages.getString("CSearchResultLabelProvider.potentialMatch"); //$NON-NLS-1$
private CSearchResultPage searchPage = null;
public CSearchResultLabelProvider(){ public CSearchResultLabelProvider(){
_sortOrder = SHOW_PATH; _sortOrder = SHOW_PATH;
} }
@ -51,8 +54,7 @@ public class CSearchResultLabelProvider extends LabelProvider {
* @param page * @param page
*/ */
public CSearchResultLabelProvider(CSearchResultPage page) { public CSearchResultLabelProvider(CSearchResultPage page) {
searchPage = page;
// TODO Auto-generated constructor stub
} }
public Image getImage( Object element ) { public Image getImage( Object element ) {
@ -160,6 +162,18 @@ public class CSearchResultLabelProvider extends LabelProvider {
String result = ""; //$NON-NLS-1$ String result = ""; //$NON-NLS-1$
String path = (resource != null ) ? resource.getFullPath().toString() : ""; //$NON-NLS-1$ String path = (resource != null ) ? resource.getFullPath().toString() : ""; //$NON-NLS-1$
// Object key = computeGroupByKey(match);
if (searchPage != null){
int matchCount = searchPage.getDisplayedMatchCount(new Match(match,match.getStartOffset(),match.getEndOffset() - match.getStartOffset()));
if (matchCount < 2){
System.out.println("Singular");
}else{
System.out.println("Plural"); //$NON-NLS-1$
}
}
switch( getOrder() ){ switch( getOrder() ){
case SHOW_NAME_ONLY: case SHOW_NAME_ONLY:
result = match.getName(); result = match.getName();
@ -202,6 +216,11 @@ public class CSearchResultLabelProvider extends LabelProvider {
_sortOrder = orderFlag; _sortOrder = orderFlag;
} }
public Object computeGroupByKey(IMatch match) {
return match.getParentName() + "::" + match.getName() + " - " + match.getLocation(); //$NON-NLS-1$ //$NON-NLS-2$
}
private int _sortOrder; private int _sortOrder;
private int _textFlags; private int _textFlags;
private int _imageFlags; private int _imageFlags;