From 1dfc3821c45a4343e81ac45f197d48bb3d5a9056 Mon Sep 17 00:00:00 2001 From: Alain Magloire Date: Fri, 9 Jul 2004 13:58:06 +0000 Subject: [PATCH] 2004-07-09 Alain Magloire Pr reported by Alex C. Follow the other views lead and for multiple selection show the number of selections. * src/org/eclipse/cdt/interanal/ui/cview/CView.java * src/org/eclipse/cdt/interanal/ui/cview/CViewMessages.properties --- core/org.eclipse.cdt.ui/ChangeLog | 8 ++++++++ .../org/eclipse/cdt/internal/ui/cview/CView.java | 15 +++++++-------- .../internal/ui/cview/CViewMessages.properties | 2 ++ 3 files changed, 17 insertions(+), 8 deletions(-) diff --git a/core/org.eclipse.cdt.ui/ChangeLog b/core/org.eclipse.cdt.ui/ChangeLog index f8895d37c6a..837c4ee4f5e 100644 --- a/core/org.eclipse.cdt.ui/ChangeLog +++ b/core/org.eclipse.cdt.ui/ChangeLog @@ -1,3 +1,11 @@ +2004-07-09 Alain Magloire + Pr reported by Alex C. + Follow the other views lead and for multiple selection + show the number of selections. + + * src/org/eclipse/cdt/interanal/ui/cview/CView.java + * src/org/eclipse/cdt/interanal/ui/cview/CViewMessages.properties + 2004-07-08 Hoda Amer Partial fix for PR 69439: content assist confusion diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CView.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CView.java index cb3f86bf1ca..b0e36ae16b6 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CView.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CView.java @@ -119,7 +119,7 @@ public class CView extends ViewPart implements ISetSelectionTarget, IPropertyCha ResourceWorkingSetFilter workingSetFilter = new ResourceWorkingSetFilter(); - private boolean dragDetected; + protected boolean dragDetected; private Listener dragDetectListener; // Persistance tags. @@ -673,12 +673,10 @@ public class CView extends ViewPart implements ISetSelectionTarget, IPropertyCha IPath path = ((IResource) element).getFullPath(); if (path.isRoot()) { return "CVIEW"; //$NON-NLS-1$ - } else { - return path.makeRelative().toString(); } - } else { - return ((ILabelProvider) viewer.getLabelProvider()).getText(element); + return path.makeRelative().toString(); } + return ((ILabelProvider) viewer.getLabelProvider()).getText(element); } /** @@ -725,7 +723,8 @@ public class CView extends ViewPart implements ISetSelectionTarget, IPropertyCha } } if (selection.size() > 1) { - return "StatusLine"; //$NON-NLS-1$ + return CViewMessages.getFormattedString("CView.statusLine", //$NON-NLS-1$ + new String[] { Integer.toString(selection.size())}); } return "";//$NON-NLS-1$ } @@ -748,12 +747,12 @@ public class CView extends ViewPart implements ISetSelectionTarget, IPropertyCha Object input = getViewer().getInput(); String viewName = getConfigurationElement().getAttribute("name"); //$NON-NLS-1$ if (input == null || (input instanceof ICModel)) { - setTitle(viewName); + setPartName(viewName); setTitleToolTip(""); //$NON-NLS-1$ } else { ILabelProvider labelProvider = (ILabelProvider) getViewer().getLabelProvider(); String inputText = labelProvider.getText(input); - setTitle(inputText); + setPartName(inputText); setTitleToolTip(getToolTipText(input)); } } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CViewMessages.properties b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CViewMessages.properties index 29d027917f8..bea679631d2 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CViewMessages.properties +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CViewMessages.properties @@ -56,3 +56,5 @@ ShowLibrariesAction.hideReferenced.tooltip=Hide Referenced Libs ShowLibrariesAction.showReferenced.tooltip=Show Referenced Libs LibraryRefContainer.Libraries=Libraries IncludeRefContainer.Includes=Includes + +CView.statusLine = {0} items selected \ No newline at end of file