Bug 510312 - Replace usage of new Integer(int) with Integer.valueOf() in

eclipse.platform.text plug-ins - Part 1

Change-Id: I8cd43f97a0e3d4ea32e11a2b3cf8898b6be3bc5c
Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>

5 files changed, 12 insertions, 12 deletions

diff --git a/org.eclipse.search/search/org/eclipse/search/internal/core/text/FileCharSequenceProvider.java b/org.eclipse.search/search/org/eclipse/search/internal/core/text/FileCharSequenceProvider.java
index 284d0fa4075..120fa839908 100644
--- a/org.eclipse.search/search/org/eclipse/search/internal/core/text/FileCharSequenceProvider.java
+++ b/org.eclipse.search/search/org/eclipse/search/internal/core/text/FileCharSequenceProvider.java
@@ -375,7 +375,7 @@ public class FileCharSequenceProvider {
 				boolean endReached= buffer.fill(fReader, fReaderPos);
 				fReaderPos= buffer.getEndOffset();
 				if (endReached) {
-					fLength= new Integer(fReaderPos); // at least we know the size of the file now
+					fLength= Integer.valueOf(fReaderPos); // at least we know the size of the file now
 					fReaderPos= Integer.MAX_VALUE; // will have to reset next time
 					return true;
 				}
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 f907e685d61..551840b5bf1 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
@@ -128,8 +128,8 @@ public class EditorOpener {
 		try {
 			marker= file.createMarker(NewSearchUI.SEARCH_MARKER);
 			HashMap<String, Integer> attributes= new HashMap<>(4);
-			attributes.put(IMarker.CHAR_START, new Integer(offset));
-			attributes.put(IMarker.CHAR_END, new Integer(offset + length));
+			attributes.put(IMarker.CHAR_START, Integer.valueOf(offset));
+			attributes.put(IMarker.CHAR_END, Integer.valueOf(offset + length));
 			marker.setAttributes(attributes);
 			IDE.gotoMarker(editor, marker);
 		} catch (CoreException e) {
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 797e7f7a278..07940450834 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
@@ -112,7 +112,7 @@ public class FileLabelProvider extends LabelProvider implements IStyledLabelProv
 
 	private StyledString getLineElementLabel(LineElement lineElement) {
 		int lineNumber= lineElement.getLine();
-		String lineNumberString= Messages.format(SearchMessages.FileLabelProvider_line_number, new Integer(lineNumber));
+		String lineNumberString= Messages.format(SearchMessages.FileLabelProvider_line_number, Integer.valueOf(lineNumber));
 
 		StyledString str= new StyledString(lineNumberString, StyledString.QUALIFIER_STYLER);
 
@@ -220,7 +220,7 @@ public class FileLabelProvider extends LabelProvider implements IStyledLabelProv
 		if (matchCount <= 1)
 			return coloredName;
 
-		String countInfo= Messages.format(SearchMessages.FileLabelProvider_count_format, new Integer(matchCount));
+		String countInfo= Messages.format(SearchMessages.FileLabelProvider_count_format, Integer.valueOf(matchCount));
 		coloredName.append(' ').append(countInfo, StyledString.COUNTER_STYLER);
 		return coloredName;
 	}
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 8084345a09f..4673b3eaaf1 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
@@ -137,7 +137,7 @@ public class FileSearchPage extends AbstractTextSearchViewPage implements IAdapt
 		fSortByNameAction= new SortAction(SearchMessages.FileSearchPage_sort_name_label, this, FileLabelProvider.SHOW_LABEL_PATH);
 		fSortByPathAction= new SortAction(SearchMessages.FileSearchPage_sort_path_label, this, FileLabelProvider.SHOW_PATH_LABEL);
 
-		setElementLimit(new Integer(DEFAULT_ELEMENT_LIMIT));
+		setElementLimit(Integer.valueOf(DEFAULT_ELEMENT_LIMIT));
 	}
 
 	@Override
@@ -360,7 +360,7 @@ public class FileSearchPage extends AbstractTextSearchViewPage implements IAdapt
 			if (value != null)
 				elementLimit= value.intValue();
 		}
-		setElementLimit(new Integer(elementLimit));
+		setElementLimit(Integer.valueOf(elementLimit));
 	}
 	@Override
 	public void saveState(IMemento memento) {
@@ -419,12 +419,12 @@ public class FileSearchPage extends AbstractTextSearchViewPage implements IAdapt
 				if (showLineMatches()) {
 					int matchCount= getInput().getMatchCount();
 					if (itemCount < matchCount) {
-						return Messages.format(SearchMessages.FileSearchPage_limited_format_matches, new Object[]{label, new Integer(itemCount), new Integer(matchCount)});
+						return Messages.format(SearchMessages.FileSearchPage_limited_format_matches, new Object[]{label, Integer.valueOf(itemCount), Integer.valueOf(matchCount)});
 					}
 				} else {
 					int fileCount= getInput().getElements().length;
 					if (itemCount < fileCount) {
-						return Messages.format(SearchMessages.FileSearchPage_limited_format_files, new Object[]{label, new Integer(itemCount), new Integer(fileCount)});
+						return Messages.format(SearchMessages.FileSearchPage_limited_format_files, new Object[]{label, Integer.valueOf(itemCount), Integer.valueOf(fileCount)});
 					}
 				}
 			}
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 1b47a288596..84d3e7d20e2 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
@@ -287,7 +287,7 @@ public class FileSearchQuery implements ISearchQuery {
 					Object[] args= { searchString, fScope.getDescription() };
 					return Messages.format(SearchMessages.FileSearchQuery_singularLabel, args);
 				}
-				Object[] args= { searchString, new Integer(nMatches), fScope.getDescription() };
+				Object[] args= { searchString, Integer.valueOf(nMatches), fScope.getDescription() };
 				return Messages.format(SearchMessages.FileSearchQuery_pluralPattern, args);
 			}
 			// search selected file extensions
@@ -295,7 +295,7 @@ public class FileSearchQuery implements ISearchQuery {
 				Object[] args= { searchString, fScope.getDescription(), fScope.getFilterDescription() };
 				return Messages.format(SearchMessages.FileSearchQuery_singularPatternWithFileExt, args);
 			}
-			Object[] args= { searchString, new Integer(nMatches), fScope.getDescription(), fScope.getFilterDescription() };
+			Object[] args= { searchString, Integer.valueOf(nMatches), fScope.getDescription(), fScope.getFilterDescription() };
 			return Messages.format(SearchMessages.FileSearchQuery_pluralPatternWithFileExt, args);
 		}
 		// file search
@@ -303,7 +303,7 @@ public class FileSearchQuery implements ISearchQuery {
 			Object[] args= { fScope.getFilterDescription(), fScope.getDescription() };
 			return Messages.format(SearchMessages.FileSearchQuery_singularLabel_fileNameSearch, args);
 		}
-		Object[] args= { fScope.getFilterDescription(), new Integer(nMatches), fScope.getDescription() };
+		Object[] args= { fScope.getFilterDescription(), Integer.valueOf(nMatches), fScope.getDescription() };
 		return Messages.format(SearchMessages.FileSearchQuery_pluralPattern_fileNameSearch, args);
 	}