From 9fc84c15c8a56e3aba294d220b8c9df829ca7826 Mon Sep 17 00:00:00 2001 From: Sergey Prigogin Date: Mon, 6 Oct 2014 20:12:33 -0700 Subject: [PATCH] Removed an unused method. --- .../cdt/internal/ui/search/CSearchMessages.java | 1 - .../internal/ui/search/CSearchMessages.properties | 1 - .../cdt/internal/ui/search/OccurrencesFinder.java | 13 ++----------- 3 files changed, 2 insertions(+), 13 deletions(-) diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchMessages.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchMessages.java index 3e659d76b20..9c527969db7 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchMessages.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchMessages.java @@ -75,7 +75,6 @@ public final class CSearchMessages extends NLS { public static String SelectionParseAction_IncludeNotFound_format; public static String OccurrencesFinder_no_element; public static String OccurrencesFinder_no_binding; - public static String OccurrencesFinder_searchfor; public static String OccurrencesFinder_label_singular; public static String OccurrencesFinder_label_plural; public static String OccurrencesFinder_occurrence_description; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchMessages.properties b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchMessages.properties index 946c0cbf1a2..cfb54939a55 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchMessages.properties +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchMessages.properties @@ -107,7 +107,6 @@ SelectionParseAction_IncludeNotFound_format=Could not find include file ''{0}'' # Occurrences OccurrencesFinder_no_element= Cannot search for the current selection. Please select a valid C/C++ element name. OccurrencesFinder_no_binding= Selected C/C++ element is unknown. -OccurrencesFinder_searchfor=Search for Occurrences in File # The first argument will be replaced by the element name and the second one by the file name OccurrencesFinder_label_singular=''{0}'' - 1 occurrence in ''{1}'' # The first argument will be replaced by the element name, the second by the count and the last by the file name diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/OccurrencesFinder.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/OccurrencesFinder.java index dab857d9fe2..b9c51148c94 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/OccurrencesFinder.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/OccurrencesFinder.java @@ -30,7 +30,6 @@ import org.eclipse.cdt.internal.core.dom.parser.cpp.semantics.CPPVisitor; import org.eclipse.cdt.internal.ui.util.Messages; public class OccurrencesFinder implements IOccurrencesFinder { - public static final String ID= "OccurrencesFinder"; //$NON-NLS-1$ /** @@ -79,7 +78,7 @@ public class OccurrencesFinder implements IOccurrencesFinder { private void performSearch() { if (fResult == null) { - fResult= new ArrayList(); + fResult= new ArrayList<>(); IASTName[] names= fRoot.getDeclarationsInAST(fTarget); for (IASTName candidate : names) { if (candidate.isPartOfTranslationUnitFile()) { @@ -137,13 +136,6 @@ public class OccurrencesFinder implements IOccurrencesFinder { return fRoot; } - /* - * @see org.eclipse.cdt.internal.ui.search.IOccurrencesFinder#getJobLabel() - */ - public String getJobLabel() { - return CSearchMessages.OccurrencesFinder_searchfor ; - } - @Override public String getElementName() { if (fSelectedNode != null) { @@ -180,8 +172,7 @@ public class OccurrencesFinder implements IOccurrencesFinder { int flag = isWriteOccurrence ? F_WRITE_OCCURRENCE : F_READ_OCCURRENCE; String description = isWriteOccurrence ? fWriteDescription : fReadDescription; fResult.add(new OccurrenceLocation(offset, length, flag, description)); - } - else { + } else { fResult.add(new OccurrenceLocation(offset, length, F_READ_OCCURRENCE, fWriteDescription)); } }