Attachment #12230 for bug #62245

View | Details | Raw Unified | Return to bug 62245
Collapse All | Expand All

Lines 107-112 Link Here

(-)src/org/eclipse/ui/views/markers/internal/Messages.properties (+1 lines)
107		107
108	filter.matchedMessage = Filter matched {0} of {1} items	108	filter.matchedMessage = Filter matched {0} of {1} items
109	filter.itemsMessage = {0} items	109	filter.itemsMessage = {0} items
		110	problem.filter.matchedMessage = {0} (Filter matched {1} of {2} items)
110	view.title = {0} ({1})	111	view.title = {0} ({1})
111		112
112	errorModifyingBookmark = Error Modifying Bookmark	113	errorModifyingBookmark = Error Modifying Bookmark




	 * @return a message ready for display
	 */
	protected String updateSummaryVisible() {
		// do not show a summary in the status line since we show it
		// as the content description
		return ""; //$NON-NLS-1$
	}
	
	void updateTitle() {
		MarkerList visibleMarkers= getVisibleMarkers();
		String breakdown = formatSummaryBreakDown(visibleMarkers);
		int filteredCount = visibleMarkers.getItemCount();
		int totalCount = getTotalMarkers();
		if (filteredCount != totalCount) 
			breakdown = Messages.format("problem.filter.matchedMessage", new Object[] { breakdown, new Integer(filteredCount), new Integer(totalCount)}); //$NON-NLS-1$
		setContentDescription(breakdown);
	}
	
	private String formatSummaryBreakDown(MarkerList visibleMarkers) {
		return Messages.format(
				"problem.statusSummaryBreakdown", //$NON-NLS-1$
				new Object[] {
						new Integer(visibleMarkers.getErrors()),
						new Integer(visibleMarkers.getWarnings()),
						new Integer(visibleMarkers.getInfos())
				});
	}

	private String getSummary(MarkerList markers, String messageKey) {
		String message = Messages.format(
				messageKey,
				new Object[] {
						   new Integer(markers.getItemCount()),
						   		formatSummaryBreakDown(markers)
						   				"problem.statusSummaryBreakdown", //$NON-NLS-1$
						   					new Object[] {
													   new Integer(markers.getErrors()),
													   new Integer(markers.getWarnings()),
													   new Integer(markers.getInfos())})
				});
		return message;
	}

Return to bug 62245

Lines 190-209 Link Here

(-)src/org/eclipse/ui/views/markers/internal/ProblemView.java (-7 / +24 lines)
190	* @return a message ready for display	190	* @return a message ready for display
191	*/	191	*/
192	protected String updateSummaryVisible() {	192	protected String updateSummaryVisible() {
193	return getSummary(getVisibleMarkers(), "problem.statusSummaryVisible"); //$NON-NLS-1$	193	// do not show a summary in the status line since we show it
		194	// as the content description
		195	return ""; //$NON-NLS-1$
194	}	196	}
195		197
		198	void updateTitle() {
		199	MarkerList visibleMarkers= getVisibleMarkers();
		200	String breakdown = formatSummaryBreakDown(visibleMarkers);
		201	int filteredCount = visibleMarkers.getItemCount();
		202	int totalCount = getTotalMarkers();
		203	if (filteredCount != totalCount)
		204	breakdown = Messages.format("problem.filter.matchedMessage", new Object[] { breakdown, new Integer(filteredCount), new Integer(totalCount)}); //$NON-NLS-1$
		205	setContentDescription(breakdown);
		206	}
		207
		208	private String formatSummaryBreakDown(MarkerList visibleMarkers) {
		209	return Messages.format(
		210	"problem.statusSummaryBreakdown", //$NON-NLS-1$
		211	new Object[] {
		212	new Integer(visibleMarkers.getErrors()),
		213	new Integer(visibleMarkers.getWarnings()),
		214	new Integer(visibleMarkers.getInfos())
		215	});
		216	}
		217
196	private String getSummary(MarkerList markers, String messageKey) {	218	private String getSummary(MarkerList markers, String messageKey) {
197	String message = Messages.format(	219	String message = Messages.format(
198	messageKey,	220	messageKey,
199	new Object[] {	221	new Object[] {
200	new Integer(markers.getItemCount()),	222	new Integer(markers.getItemCount()),
201	Messages.format(	223	formatSummaryBreakDown(markers)
202	"problem.statusSummaryBreakdown", //$NON-NLS-1$
203	new Object[] {
204	new Integer(markers.getErrors()),
205	new Integer(markers.getWarnings()),
206	new Integer(markers.getInfos())})
207	});	224	});
208	return message;	225	return message;
209	}	226	}