diff options
Diffstat (limited to 'org.eclipse.search/search/org/eclipse/search/internal/ui/text')
9 files changed, 99 insertions, 95 deletions
diff --git a/org.eclipse.search/search/org/eclipse/search/internal/ui/text/EditorOpener.java b/org.eclipse.search/search/org/eclipse/search/internal/ui/text/EditorOpener.java index 8b0744b8259..f907e685d61 100644 --- a/org.eclipse.search/search/org/eclipse/search/internal/ui/text/EditorOpener.java +++ b/org.eclipse.search/search/org/eclipse/search/internal/ui/text/EditorOpener.java @@ -127,7 +127,7 @@ public class EditorOpener { IMarker marker= null; try { marker= file.createMarker(NewSearchUI.SEARCH_MARKER); - HashMap attributes= new HashMap(4); + HashMap<String, Integer> attributes= new HashMap<>(4); attributes.put(IMarker.CHAR_START, new Integer(offset)); attributes.put(IMarker.CHAR_END, new Integer(offset + length)); marker.setAttributes(attributes); diff --git a/org.eclipse.search/search/org/eclipse/search/internal/ui/text/FileLabelProvider.java b/org.eclipse.search/search/org/eclipse/search/internal/ui/text/FileLabelProvider.java index 6d90937d259..797e7f7a278 100644 --- a/org.eclipse.search/search/org/eclipse/search/internal/ui/text/FileLabelProvider.java +++ b/org.eclipse.search/search/org/eclipse/search/internal/ui/text/FileLabelProvider.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2009 IBM Corporation and others. + * Copyright (c) 2000, 2015 IBM Corporation 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 @@ -21,11 +21,11 @@ import org.eclipse.swt.graphics.Image; import org.eclipse.core.resources.IResource; +import org.eclipse.jface.viewers.DelegatingStyledCellLabelProvider.IStyledLabelProvider; import org.eclipse.jface.viewers.ILabelProviderListener; import org.eclipse.jface.viewers.LabelProvider; import org.eclipse.jface.viewers.StyledCellLabelProvider; import org.eclipse.jface.viewers.StyledString; -import org.eclipse.jface.viewers.DelegatingStyledCellLabelProvider.IStyledLabelProvider; import org.eclipse.ui.model.WorkbenchLabelProvider; @@ -48,7 +48,7 @@ public class FileLabelProvider extends LabelProvider implements IStyledLabelProv private final WorkbenchLabelProvider fLabelProvider; private final AbstractTextSearchViewPage fPage; - private final Comparator fMatchComparator; + private final Comparator<FileMatch> fMatchComparator; private final Image fLineMatchImage; @@ -59,10 +59,10 @@ public class FileLabelProvider extends LabelProvider implements IStyledLabelProv fOrder= orderFlag; fPage= page; fLineMatchImage= SearchPluginImages.get(SearchPluginImages.IMG_OBJ_TEXT_SEARCH_LINE); - fMatchComparator= new Comparator() { + fMatchComparator= new Comparator<FileMatch>() { @Override - public int compare(Object o1, Object o2) { - return ((FileMatch) o1).getOriginalOffset() - ((FileMatch) o2).getOriginalOffset(); + public int compare(FileMatch o1, FileMatch o2) { + return o1.getOriginalOffset() - o2.getOriginalOffset(); } }; } @@ -116,7 +116,7 @@ public class FileLabelProvider extends LabelProvider implements IStyledLabelProv StyledString str= new StyledString(lineNumberString, StyledString.QUALIFIER_STYLER); - Match[] matches= lineElement.getMatches(fPage.getInput()); + FileMatch[] matches= lineElement.getMatches(fPage.getInput()); Arrays.sort(matches, fMatchComparator); String content= lineElement.getContents(); @@ -127,7 +127,7 @@ public class FileLabelProvider extends LabelProvider implements IStyledLabelProv int charsToCut= getCharsToCut(length, matches); // number of characters to leave away if the line is too long for (int i= 0; i < matches.length; i++) { - FileMatch match= (FileMatch) matches[i]; + FileMatch match= matches[i]; int start= Math.max(match.getOriginalOffset() - lineElement.getOffset(), 0); // append gap between last match and the new one if (pos < start) { diff --git a/org.eclipse.search/search/org/eclipse/search/internal/ui/text/FileSearchPage.java b/org.eclipse.search/search/org/eclipse/search/internal/ui/text/FileSearchPage.java index a40dcf2e78e..55d54928f5b 100644 --- a/org.eclipse.search/search/org/eclipse/search/internal/ui/text/FileSearchPage.java +++ b/org.eclipse.search/search/org/eclipse/search/internal/ui/text/FileSearchPage.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2011 IBM Corporation and others. + * Copyright (c) 2000, 2015 IBM Corporation 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 @@ -104,7 +104,9 @@ public class FileSearchPage extends AbstractTextSearchViewPage implements IAdapt name1 = "";//$NON-NLS-1$ if (name2 == null) name2 = "";//$NON-NLS-1$ - return getComparator().compare(name1, name2); + @SuppressWarnings("unchecked") + int result= getComparator().compare(name1, name2); + return result; } } @@ -308,10 +310,11 @@ public class FileSearchPage extends AbstractTextSearchViewPage implements IAdapt memento.putInteger(KEY_LIMIT, getElementLimit().intValue()); } + @SuppressWarnings("unchecked") @Override - public Object getAdapter(Class adapter) { + public <T> T getAdapter(Class<T> adapter) { if (IShowInTargetList.class.equals(adapter)) { - return SHOW_IN_TARGET_LIST; + return (T) SHOW_IN_TARGET_LIST; } if (adapter == IShowInSource.class) { @@ -322,8 +325,8 @@ public class FileSearchPage extends AbstractTextSearchViewPage implements IAdapt ISelection selection= selectionProvider.getSelection(); if (selection instanceof IStructuredSelection) { IStructuredSelection structuredSelection= ((StructuredSelection)selection); - final Set newSelection= new HashSet(structuredSelection.size()); - Iterator iter= structuredSelection.iterator(); + final Set<Object> newSelection= new HashSet<>(structuredSelection.size()); + Iterator<?> iter= structuredSelection.iterator(); while (iter.hasNext()) { Object element= iter.next(); if (element instanceof LineElement) @@ -331,10 +334,10 @@ public class FileSearchPage extends AbstractTextSearchViewPage implements IAdapt newSelection.add(element); } - return new IShowInSource() { + return (T) new IShowInSource() { @Override public ShowInContext getShowInContext() { - return new ShowInContext(null, new StructuredSelection(new ArrayList(newSelection))); + return new ShowInContext(null, new StructuredSelection(new ArrayList<>(newSelection))); } }; } @@ -395,7 +398,7 @@ public class FileSearchPage extends AbstractTextSearchViewPage implements IAdapt } @Override - protected void evaluateChangedElements(Match[] matches, Set changedElements) { + protected void evaluateChangedElements(Match[] matches, Set<Object> changedElements) { if (showLineMatches()) { for (int i = 0; i < matches.length; i++) { changedElements.add(((FileMatch) matches[i]).getLineElement()); diff --git a/org.eclipse.search/search/org/eclipse/search/internal/ui/text/FileSearchQuery.java b/org.eclipse.search/search/org/eclipse/search/internal/ui/text/FileSearchQuery.java index 04328300593..1b47a288596 100644 --- a/org.eclipse.search/search/org/eclipse/search/internal/ui/text/FileSearchQuery.java +++ b/org.eclipse.search/search/org/eclipse/search/internal/ui/text/FileSearchQuery.java @@ -52,7 +52,7 @@ public class FileSearchQuery implements ISearchQuery { private final boolean fSearchInBinaries; private final boolean fIsLightweightAutoRefresh; - private Map fCachedMatches; // map of IFile -> ArrayList of FileMatches + private Map<IFile, ArrayList<FileMatch>> fCachedMatches; private Object fLock= new Object(); private TextSearchResultCollector(AbstractTextSearchResult result, boolean isFileSearchOnly, boolean searchInBinaries) { @@ -89,7 +89,7 @@ public class FileSearchQuery implements ISearchQuery { @Override public boolean acceptPatternMatch(TextSearchMatchAccess matchRequestor) throws CoreException { - ArrayList matches; + ArrayList<FileMatch> matches; synchronized(fLock) { // fCachedMatches is set to null when the caller invokes endReporting(), // indicating that no further results are desired/expected, so discard @@ -97,7 +97,7 @@ public class FileSearchQuery implements ISearchQuery { if (fCachedMatches == null) { return false; } - matches= (ArrayList) fCachedMatches.get(matchRequestor.getFile()); + matches= fCachedMatches.get(matchRequestor.getFile()); } int matchOffset= matchRequestor.getMatchOffset(); @@ -120,9 +120,9 @@ public class FileSearchQuery implements ISearchQuery { if (fCachedMatches == null) { return false; } - matches= (ArrayList) fCachedMatches.get(matchRequestor.getFile()); + matches= fCachedMatches.get(matchRequestor.getFile()); if (matches == null) { - matches= new ArrayList(); + matches= new ArrayList<>(); fCachedMatches.put(matchRequestor.getFile(), matches); } matches.add(fileMatch); @@ -131,13 +131,13 @@ public class FileSearchQuery implements ISearchQuery { return true; } - private LineElement getLineElement(int offset, TextSearchMatchAccess matchRequestor, ArrayList matches) { + private LineElement getLineElement(int offset, TextSearchMatchAccess matchRequestor, ArrayList<FileMatch> matches) { int lineNumber= 1; int lineStart= 0; if (matches != null) { // match on same line as last? - FileMatch last= (FileMatch) matches.get(matches.size() - 1); + FileMatch last= matches.get(matches.size() - 1); LineElement lineElement= last.getLineElement(); if (lineElement.contains(offset)) { return lineElement; @@ -188,7 +188,7 @@ public class FileSearchQuery implements ISearchQuery { @Override public void beginReporting() { - fCachedMatches= new HashMap(); + fCachedMatches= new HashMap<>(); } @Override @@ -202,10 +202,10 @@ public class FileSearchQuery implements ISearchQuery { private void flushMatches() { synchronized (fLock) { if (fCachedMatches != null && !fCachedMatches.isEmpty()) { - Iterator it = fCachedMatches.values().iterator(); + Iterator<ArrayList<FileMatch>> it = fCachedMatches.values().iterator(); while(it.hasNext()) { - ArrayList matches= (ArrayList) it.next(); - fResult.addMatches((Match[]) matches.toArray(new Match[matches.size()])); + ArrayList<FileMatch> matches= it.next(); + fResult.addMatches(matches.toArray(new Match[matches.size()])); } fCachedMatches.clear(); } diff --git a/org.eclipse.search/search/org/eclipse/search/internal/ui/text/FileTreeContentProvider.java b/org.eclipse.search/search/org/eclipse/search/internal/ui/text/FileTreeContentProvider.java index d891cd5e2e7..8ee249cb20e 100644 --- a/org.eclipse.search/search/org/eclipse/search/internal/ui/text/FileTreeContentProvider.java +++ b/org.eclipse.search/search/org/eclipse/search/internal/ui/text/FileTreeContentProvider.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2008 IBM Corporation and others. + * Copyright (c) 2000, 2015 IBM Corporation 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 @@ -36,7 +36,7 @@ public class FileTreeContentProvider implements ITreeContentProvider, IFileSearc private AbstractTextSearchResult fResult; private FileSearchPage fPage; private AbstractTreeViewer fTreeViewer; - private Map fChildrenMap; + private Map<Object, Set<Object>> fChildrenMap; FileTreeContentProvider(FileSearchPage page, AbstractTreeViewer viewer) { fPage= page; @@ -73,7 +73,7 @@ public class FileTreeContentProvider implements ITreeContentProvider, IFileSearc private synchronized void initialize(AbstractTextSearchResult result) { fResult= result; - fChildrenMap= new HashMap(); + fChildrenMap= new HashMap<>(); boolean showLineMatches= !((FileSearchQuery) fResult.getQuery()).isFileNameSearch(); if (result != null) { @@ -120,16 +120,16 @@ public class FileTreeContentProvider implements ITreeContentProvider, IFileSearc */ private boolean insertChild(Object parent, Object child) { - Set children= (Set) fChildrenMap.get(parent); + Set<Object> children= fChildrenMap.get(parent); if (children == null) { - children= new HashSet(); + children= new HashSet<>(); fChildrenMap.put(parent, children); } return children.add(child); } private boolean hasChild(Object parent, Object child) { - Set children= (Set) fChildrenMap.get(parent); + Set<Object> children= fChildrenMap.get(parent); return children != null && children.contains(child); } @@ -170,7 +170,7 @@ public class FileTreeContentProvider implements ITreeContentProvider, IFileSearc private void removeFromSiblings(Object element, Object parent) { - Set siblings= (Set) fChildrenMap.get(parent); + Set<Object> siblings= fChildrenMap.get(parent); if (siblings != null) { siblings.remove(element); } @@ -178,7 +178,7 @@ public class FileTreeContentProvider implements ITreeContentProvider, IFileSearc @Override public Object[] getChildren(Object parentElement) { - Set children= (Set) fChildrenMap.get(parentElement); + Set<Object> children= fChildrenMap.get(parentElement); if (children == null) return EMPTY_ARR; return children.toArray(); diff --git a/org.eclipse.search/search/org/eclipse/search/internal/ui/text/LineElement.java b/org.eclipse.search/search/org/eclipse/search/internal/ui/text/LineElement.java index 7d0e0c1019e..cb9c0d2ff16 100644 --- a/org.eclipse.search/search/org/eclipse/search/internal/ui/text/LineElement.java +++ b/org.eclipse.search/search/org/eclipse/search/internal/ui/text/LineElement.java @@ -62,7 +62,7 @@ public class LineElement { } public FileMatch[] getMatches(AbstractTextSearchResult result) { - ArrayList res= new ArrayList(); + ArrayList<FileMatch> res= new ArrayList<>(); Match[] matches= result.getMatches(fParent); for (int i= 0; i < matches.length; i++) { FileMatch curr= (FileMatch) matches[i]; @@ -70,7 +70,7 @@ public class LineElement { res.add(curr); } } - return (FileMatch[]) res.toArray(new FileMatch[res.size()]); + return res.toArray(new FileMatch[res.size()]); } public int getNumberOfMatches(AbstractTextSearchResult result) { diff --git a/org.eclipse.search/search/org/eclipse/search/internal/ui/text/ReplaceConfigurationPage.java b/org.eclipse.search/search/org/eclipse/search/internal/ui/text/ReplaceConfigurationPage.java index 838c4a6828e..ee0710c580a 100644 --- a/org.eclipse.search/search/org/eclipse/search/internal/ui/text/ReplaceConfigurationPage.java +++ b/org.eclipse.search/search/org/eclipse/search/internal/ui/text/ReplaceConfigurationPage.java @@ -196,7 +196,7 @@ public class ReplaceConfigurationPage extends UserInputWizardPage { private void storeSettings() { String[] items= fTextField.getItems(); - ArrayList history= new ArrayList(); + ArrayList<String> history= new ArrayList<>(); history.add(fTextField.getText()); int historySize= Math.min(items.length, 6); for (int i= 0; i < historySize; i++) { @@ -206,7 +206,7 @@ public class ReplaceConfigurationPage extends UserInputWizardPage { } } IDialogSettings settings= SearchPlugin.getDefault().getDialogSettings().addNewSection(SETTINGS_GROUP); - settings.put(SETTINGS_REPLACE_WITH, (String[]) history.toArray(new String[history.size()])); + settings.put(SETTINGS_REPLACE_WITH, history.toArray(new String[history.size()])); } diff --git a/org.eclipse.search/search/org/eclipse/search/internal/ui/text/ReplaceRefactoring.java b/org.eclipse.search/search/org/eclipse/search/internal/ui/text/ReplaceRefactoring.java index 67bde0296be..c8d7bcee13c 100644 --- a/org.eclipse.search/search/org/eclipse/search/internal/ui/text/ReplaceRefactoring.java +++ b/org.eclipse.search/search/org/eclipse/search/internal/ui/text/ReplaceRefactoring.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2011 IBM Corporation and others. + * Copyright (c) 2007, 2015 IBM Corporation 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 @@ -19,6 +19,7 @@ import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; import java.util.Map; +import java.util.Set; import java.util.regex.Matcher; import java.util.regex.Pattern; import java.util.regex.PatternSyntaxException; @@ -87,16 +88,16 @@ public class ReplaceRefactoring extends Refactoring { private MatchGroup[] fMatchGroups; private Match[] fMatches; - private Map/*<URI,ArrayList<Match>*/ fIgnoredMatches; + private Map<URI, ArrayList<FileMatch>> fIgnoredMatches; private final FileSearchResult fResult; private final boolean fIsRemove; - public SearchResultUpdateChange(FileSearchResult result, MatchGroup[] matchGroups, Map ignoredMatches) { + public SearchResultUpdateChange(FileSearchResult result, MatchGroup[] matchGroups, Map<URI, ArrayList<FileMatch>> ignoredMatches) { this(result, null, ignoredMatches, true); fMatchGroups= matchGroups; } - private SearchResultUpdateChange(FileSearchResult result, Match[] matches, Map ignoredMatches, boolean isRemove) { + private SearchResultUpdateChange(FileSearchResult result, Match[] matches, Map<URI, ArrayList<FileMatch>> ignoredMatches, boolean isRemove) { fResult= result; fMatches= matches; fIgnoredMatches= ignoredMatches; @@ -124,7 +125,7 @@ public class ReplaceRefactoring extends Refactoring { private Match[] getMatches() { if (fMatches == null) { - ArrayList matches= new ArrayList(); + ArrayList<FileMatch> matches= new ArrayList<>(); for (int i= 0; i < fMatchGroups.length; i++) { MatchGroup curr= fMatchGroups[i]; if (curr.group.isEnabled()) { @@ -138,13 +139,13 @@ public class ReplaceRefactoring extends Refactoring { IFile file= match.getFile(); URI uri= file.getLocationURI(); if (uri != null) { - ArrayList ignoredMatches= (ArrayList)fIgnoredMatches.get(uri); + ArrayList<FileMatch> ignoredMatches= fIgnoredMatches.get(uri); if (ignoredMatches != null) matches.addAll(ignoredMatches); } } } - fMatches= (Match[]) matches.toArray(new Match[matches.size()]); + fMatches= matches.toArray(new Match[matches.size()]); fMatchGroups= null; } return fMatches; @@ -168,13 +169,13 @@ public class ReplaceRefactoring extends Refactoring { private final FileSearchResult fResult; private final Object[] fSelection; - private final HashMap/*<IFile,Set<Match>*/ fMatches; + private final HashMap<IFile, Set<FileMatch>> fMatches; /** Map that keeps already collected locations. */ - private final Map/*<URI,IFile>*/fAlreadyCollected; + private final Map<URI, IFile> fAlreadyCollected; /** Map that keeps ignored matches (can be null). */ - private Map/*<URI,ArrayList<Match>*/ fIgnoredMatches; + private Map<URI, ArrayList<FileMatch>> fIgnoredMatches; private String fReplaceString; @@ -186,8 +187,8 @@ public class ReplaceRefactoring extends Refactoring { fResult= result; fSelection= selection; - fMatches= new HashMap(); - fAlreadyCollected= new HashMap(selection != null ? selection.length : result.getElements().length); + fMatches= new HashMap<>(); + fAlreadyCollected= new HashMap<>(selection != null ? selection.length : result.getElements().length); fReplaceString= null; } @@ -244,7 +245,7 @@ public class ReplaceRefactoring extends Refactoring { } else if (object instanceof IFile) { Match[] matches= fResult.getMatches(object); if (matches.length > 0) { - Collection bucket= null; + Collection<FileMatch> bucket= null; for (int i= 0; i < matches.length; i++) { FileMatch fileMatch= (FileMatch) matches[i]; if (isMatchToBeIncluded(fileMatch)) { @@ -264,8 +265,8 @@ public class ReplaceRefactoring extends Refactoring { public int getNumberOfMatches() { int count= 0; - for (Iterator iterator= fMatches.values().iterator(); iterator.hasNext();) { - Collection bucket= (Collection) iterator.next(); + for (Iterator<Set<FileMatch>> iterator= fMatches.values().iterator(); iterator.hasNext();) { + Set<FileMatch> bucket= iterator.next(); count += bucket.size(); } return count; @@ -289,17 +290,17 @@ public class ReplaceRefactoring extends Refactoring { if (uri == null) return true; - for (Iterator iter= fAlreadyCollected.keySet().iterator(); iter.hasNext();) { - if (URIUtil.equals((URI)iter.next(), uri)) { + for (Iterator<URI> iter= fAlreadyCollected.keySet().iterator(); iter.hasNext();) { + if (URIUtil.equals(iter.next(), uri)) { if (file.equals(fAlreadyCollected.get(uri))) return true; // another FileMatch for an IFile which already had matches if (fIgnoredMatches == null) - fIgnoredMatches= new HashMap(); + fIgnoredMatches= new HashMap<>(); - ArrayList matches= (ArrayList)fIgnoredMatches.get(uri); + ArrayList<FileMatch> matches= fIgnoredMatches.get(uri); if (matches == null) { - matches= new ArrayList(); + matches= new ArrayList<>(); fIgnoredMatches.put(uri, matches); } matches.add(match); @@ -312,13 +313,13 @@ public class ReplaceRefactoring extends Refactoring { return true; } - private Collection getBucket(IFile file) { - Collection col= (Collection) fMatches.get(file); - if (col == null) { - col= new HashSet(); - fMatches.put(file, col); + private Set<FileMatch> getBucket(IFile file) { + Set<FileMatch> set= fMatches.get(file); + if (set == null) { + set= new HashSet<>(); + fMatches.put(file, set); } - return col; + return set; } @Override @@ -335,14 +336,14 @@ public class ReplaceRefactoring extends Refactoring { RefactoringStatus resultingStatus= new RefactoringStatus(); - Collection allFilesSet= fMatches.keySet(); - IFile[] allFiles= (IFile[]) allFilesSet.toArray(new IFile[allFilesSet.size()]); - Arrays.sort(allFiles, new Comparator() { + Collection<IFile> allFilesSet= fMatches.keySet(); + IFile[] allFiles= allFilesSet.toArray(new IFile[allFilesSet.size()]); + Arrays.sort(allFiles, new Comparator<IFile>() { private Collator fCollator= Collator.getInstance(); @Override - public int compare(Object o1, Object o2) { - String p1= ((IFile) o1).getFullPath().toString(); - String p2= ((IFile) o2).getFullPath().toString(); + public int compare(IFile o1, IFile o2) { + String p1= o1.getFullPath().toString(); + String p2= o2.getFullPath().toString(); return fCollator.compare(p1, p2); } }); @@ -354,12 +355,12 @@ public class ReplaceRefactoring extends Refactoring { CompositeChange compositeChange= new CompositeChange(SearchMessages.ReplaceRefactoring_composite_change_name); compositeChange.markAsSynthetic(); - ArrayList matchGroups= new ArrayList(); + ArrayList<MatchGroup> matchGroups= new ArrayList<>(); boolean hasChanges= false; try { for (int i= 0; i < allFiles.length; i++) { IFile file= allFiles[i]; - Collection bucket= (Collection) fMatches.get(file); + Set<FileMatch> bucket= fMatches.get(file); if (!bucket.isEmpty()) { try { TextChange change= createFileChange(file, pattern, bucket, resultingStatus, matchGroups); @@ -381,20 +382,20 @@ public class ReplaceRefactoring extends Refactoring { return RefactoringStatus.createFatalErrorStatus(SearchMessages.ReplaceRefactoring_error_no_changes); } - compositeChange.add(new SearchResultUpdateChange(fResult, (MatchGroup[])matchGroups.toArray(new MatchGroup[matchGroups.size()]), fIgnoredMatches)); + compositeChange.add(new SearchResultUpdateChange(fResult, matchGroups.toArray(new MatchGroup[matchGroups.size()]), fIgnoredMatches)); fChange= compositeChange; return resultingStatus; } private void checkFilesToBeChanged(IFile[] filesToBeChanged, RefactoringStatus resultingStatus) throws CoreException { - ArrayList readOnly= new ArrayList(); + ArrayList<IFile> readOnly= new ArrayList<>(); for (int i= 0; i < filesToBeChanged.length; i++) { IFile file= filesToBeChanged[i]; if (file.isReadOnly()) readOnly.add(file); } - IFile[] readOnlyFiles= (IFile[]) readOnly.toArray(new IFile[readOnly.size()]); + IFile[] readOnlyFiles= readOnly.toArray(new IFile[readOnly.size()]); IStatus status= ResourcesPlugin.getWorkspace().validateEdit(readOnlyFiles, getValidationContext()); if (status.getSeverity() == IStatus.CANCEL) { @@ -407,7 +408,7 @@ public class ReplaceRefactoring extends Refactoring { resultingStatus.merge(ResourceChangeChecker.checkFilesToBeChanged(filesToBeChanged, null)); } - private TextChange createFileChange(IFile file, Pattern pattern, Collection/*FileMatch*/ matches, RefactoringStatus resultingStatus, Collection matchGroups) throws PatternSyntaxException, CoreException { + private TextChange createFileChange(IFile file, Pattern pattern, Set<FileMatch> matches, RefactoringStatus resultingStatus, Collection<MatchGroup> matchGroups) throws PatternSyntaxException, CoreException { PositionTracker tracker= InternalSearchUI.getInstance().getPositionTracker(); TextFileChange change= new TextFileChange(Messages.format(SearchMessages.ReplaceRefactoring_group_label_change_for_file, file.getName()), file); @@ -424,8 +425,8 @@ public class ReplaceRefactoring extends Refactoring { IDocument document= textFileBuffer.getDocument(); String lineDelimiter= TextUtilities.getDefaultLineDelimiter(document); - for (Iterator iterator= matches.iterator(); iterator.hasNext();) { - FileMatch match= (FileMatch) iterator.next(); + for (Iterator<FileMatch> iterator= matches.iterator(); iterator.hasNext();) { + FileMatch match= iterator.next(); int offset= match.getOffset(); int length= match.getLength(); Position currentPosition= tracker.getCurrentPosition(match); diff --git a/org.eclipse.search/search/org/eclipse/search/internal/ui/text/TextSearchPage.java b/org.eclipse.search/search/org/eclipse/search/internal/ui/text/TextSearchPage.java index 039f1128bfb..5d81904ee4f 100644 --- a/org.eclipse.search/search/org/eclipse/search/internal/ui/text/TextSearchPage.java +++ b/org.eclipse.search/search/org/eclipse/search/internal/ui/text/TextSearchPage.java @@ -112,7 +112,7 @@ public class TextSearchPage extends DialogPage implements ISearchPage, IReplaceP */ private static final String STORE_EXTENSIONS= "EXTENSIONS"; //$NON-NLS-1$ - private List fPreviousSearchPatterns= new ArrayList(HISTORY_SIZE); + private List<SearchPatternData> fPreviousSearchPatterns= new ArrayList<>(HISTORY_SIZE); private boolean fFirstTime= true; private boolean fIsCaseSensitive; @@ -336,10 +336,10 @@ public class TextSearchPage extends DialogPage implements ISearchPage, IReplaceP } private FileTextSearchScope getSelectedResourcesScope() { - HashSet resources= new HashSet(); + HashSet<IResource> resources= new HashSet<>(); ISelection sel= getContainer().getSelection(); if (sel instanceof IStructuredSelection && !sel.isEmpty()) { - Iterator iter= ((IStructuredSelection) sel).iterator(); + Iterator<?> iter= ((IStructuredSelection) sel).iterator(); while (iter.hasNext()) { Object curr= iter.next(); if (curr instanceof IWorkingSet) { @@ -368,7 +368,7 @@ public class TextSearchPage extends DialogPage implements ISearchPage, IReplaceP } else if (getContainer().getActiveEditorInput() != null) { resources.add(getContainer().getActiveEditorInput().getAdapter(IFile.class)); } - IResource[] arr= (IResource[]) resources.toArray(new IResource[resources.size()]); + IResource[] arr= resources.toArray(new IResource[resources.size()]); return FileTextSearchScope.newSearchScope(arr, getExtensions(), fSearchDerived); } @@ -389,8 +389,8 @@ public class TextSearchPage extends DialogPage implements ISearchPage, IReplaceP private SearchPatternData findInPrevious(String pattern) { - for (Iterator iter= fPreviousSearchPatterns.iterator(); iter.hasNext();) { - SearchPatternData element= (SearchPatternData) iter.next(); + for (Iterator<SearchPatternData> iter= fPreviousSearchPatterns.iterator(); iter.hasNext();) { + SearchPatternData element= iter.next(); if (pattern.equals(element.textPattern)) { return element; } @@ -421,22 +421,22 @@ public class TextSearchPage extends DialogPage implements ISearchPage, IReplaceP } private String[] getPreviousExtensionsOldStyle() { - List extensions= new ArrayList(fPreviousSearchPatterns.size()); + List<String> extensions= new ArrayList<>(fPreviousSearchPatterns.size()); int size= fPreviousSearchPatterns.size(); for (int i= 0; i < size; i++) { - SearchPatternData data= (SearchPatternData)fPreviousSearchPatterns.get(i); + SearchPatternData data= fPreviousSearchPatterns.get(i); String text= FileTypeEditor.typesToString(data.fileNamePatterns); if (!extensions.contains(text)) extensions.add(text); } - return (String[])extensions.toArray(new String[extensions.size()]); + return extensions.toArray(new String[extensions.size()]); } private String[] getPreviousSearchPatterns() { int size= fPreviousSearchPatterns.size(); String [] patterns= new String[size]; for (int i= 0; i < size; i++) - patterns[i]= ((SearchPatternData) fPreviousSearchPatterns.get(i)).textPattern; + patterns[i]= fPreviousSearchPatterns.get(i).textPattern; return patterns; } @@ -632,7 +632,7 @@ public class TextSearchPage extends DialogPage implements ISearchPage, IReplaceP if (selectionIndex < 0 || selectionIndex >= fPreviousSearchPatterns.size()) return; - SearchPatternData patternData= (SearchPatternData) fPreviousSearchPatterns.get(selectionIndex); + SearchPatternData patternData= fPreviousSearchPatterns.get(selectionIndex); if (!fPattern.getText().equals(patternData.textPattern)) return; fIsCaseSensitiveCheckbox.setSelection(patternData.isCaseSensitive); @@ -852,7 +852,7 @@ public class TextSearchPage extends DialogPage implements ISearchPage, IReplaceP // ignore } - Set previousExtensions= new LinkedHashSet(HISTORY_SIZE); + Set<String> previousExtensions= new LinkedHashSet<>(HISTORY_SIZE); IDialogSettings extensionsSettings= s.getSection(STORE_EXTENSIONS); if (extensionsSettings != null) { for (int i= 0; i < HISTORY_SIZE; i++) { @@ -883,13 +883,13 @@ public class TextSearchPage extends DialogPage implements ISearchPage, IReplaceP s.put(STORE_HISTORY_SIZE, historySize); for (int i= 0; i < historySize; i++) { IDialogSettings histSettings= s.addNewSection(STORE_HISTORY + i); - SearchPatternData data= ((SearchPatternData) fPreviousSearchPatterns.get(i)); + SearchPatternData data= fPreviousSearchPatterns.get(i); data.store(histSettings); } IDialogSettings extensionsSettings= s.addNewSection(STORE_EXTENSIONS); extensionsSettings.put(Integer.toString(0), fExtensions.getText()); - Set extensions= new HashSet(HISTORY_SIZE); + Set<String> extensions= new HashSet<>(HISTORY_SIZE); extensions.add(fExtensions.getText()); int length= Math.min(fExtensions.getItemCount(), HISTORY_SIZE - 1); int j= 1; |