Rename label / content provider with Search

Author: angelozerr

eclipse/ts.eclipse.ide.ui/src/ts/eclipse/ide/internal/ui/search/DecoratingTypeScriptSearchLabelProvider.java

@@ -35,7 +35,7 @@ public class DecoratingTypeScriptSearchLabelProvider extends DecoratingStyledCel
 
 	public static final Styler HIGHLIGHT_STYLE= StyledString.createColorRegistryStyler(null, HIGHLIGHT_BG_COLOR_NAME);
 
-	public DecoratingTypeScriptSearchLabelProvider(TypeScriptLabelProvider provider) {
+	public DecoratingTypeScriptSearchLabelProvider(TypeScriptSearchLabelProvider provider) {
 		super(provider, PlatformUI.getWorkbench().getDecoratorManager().getLabelDecorator(), null);
 	}
 

eclipse/ts.eclipse.ide.ui/src/ts/eclipse/ide/internal/ui/search/TypeScriptLabelProvider.java renamed to eclipse/ts.eclipse.ide.ui/src/ts/eclipse/ide/internal/ui/search/TypeScriptSearchLabelProvider.java

@@ -37,7 +37,7 @@
 import org.eclipse.search.ui.text.AbstractTextSearchViewPage;
 import org.eclipse.search.ui.text.Match;
 
-public class TypeScriptLabelProvider extends LabelProvider implements IStyledLabelProvider {
+public class TypeScriptSearchLabelProvider extends LabelProvider implements IStyledLabelProvider {
 
 	public static final int SHOW_LABEL= 1;
 	public static final int SHOW_LABEL_PATH= 2;
@@ -55,7 +55,7 @@ public class TypeScriptLabelProvider extends LabelProvider implements IStyledLab
 
 	private int fOrder;
 
-	public TypeScriptLabelProvider(AbstractTextSearchViewPage page, int orderFlag) {
+	public TypeScriptSearchLabelProvider(AbstractTextSearchViewPage page, int orderFlag) {
 		fLabelProvider= new WorkbenchLabelProvider();
 		fOrder= orderFlag;
 		fPage= page;

eclipse/ts.eclipse.ide.ui/src/ts/eclipse/ide/internal/ui/search/TypeScriptSearchResultPage.java

@@ -131,8 +131,8 @@ public String[] getShowInTargetIds() {
 	};
 
 	public TypeScriptSearchResultPage() {
-		fSortByNameAction= new SortAction(SearchMessages.FileSearchPage_sort_name_label, this, TypeScriptLabelProvider.SHOW_LABEL_PATH);
-		fSortByPathAction= new SortAction(SearchMessages.FileSearchPage_sort_path_label, this, TypeScriptLabelProvider.SHOW_PATH_LABEL);
+		fSortByNameAction= new SortAction(SearchMessages.FileSearchPage_sort_name_label, this, TypeScriptSearchLabelProvider.SHOW_LABEL_PATH);
+		fSortByPathAction= new SortAction(SearchMessages.FileSearchPage_sort_path_label, this, TypeScriptSearchLabelProvider.SHOW_PATH_LABEL);
 
 		setElementLimit(new Integer(DEFAULT_ELEMENT_LIMIT));
 	}
@@ -155,19 +155,19 @@ private void addDragAdapters(StructuredViewer viewer) {
 
 	protected void configureTableViewer(TableViewer viewer) {
 		viewer.setUseHashlookup(true);
-		TypeScriptLabelProvider innerLabelProvider= new TypeScriptLabelProvider(this, fCurrentSortOrder);
+		TypeScriptSearchLabelProvider innerLabelProvider= new TypeScriptSearchLabelProvider(this, fCurrentSortOrder);
 		viewer.setLabelProvider(new DecoratingTypeScriptSearchLabelProvider(innerLabelProvider));
-		viewer.setContentProvider(new TypeScriptTableContentProvider(this));
+		viewer.setContentProvider(new TypeScriptSearchTableContentProvider(this));
 		viewer.setComparator(new DecoratorIgnoringViewerSorter(innerLabelProvider));
 		fContentProvider= (ITypeScriptSearchContentProvider) viewer.getContentProvider();
 		addDragAdapters(viewer);
 	}
 
 	protected void configureTreeViewer(TreeViewer viewer) {
 		viewer.setUseHashlookup(true);
-		TypeScriptLabelProvider innerLabelProvider= new TypeScriptLabelProvider(this, TypeScriptLabelProvider.SHOW_LABEL);
+		TypeScriptSearchLabelProvider innerLabelProvider= new TypeScriptSearchLabelProvider(this, TypeScriptSearchLabelProvider.SHOW_LABEL);
 		viewer.setLabelProvider(new DecoratingTypeScriptSearchLabelProvider(innerLabelProvider));
-		viewer.setContentProvider(new TypeScriptTreeContentProvider(this, viewer));
+		viewer.setContentProvider(new TypeScriptSearchTreeContentProvider(this, viewer));
 		viewer.setComparator(new DecoratorIgnoringViewerSorter(innerLabelProvider));
 		fContentProvider= (ITypeScriptSearchContentProvider) viewer.getContentProvider();
 		addDragAdapters(viewer);
@@ -262,7 +262,7 @@ protected void clear() {
 	public void setSortOrder(int sortOrder) {
 		fCurrentSortOrder= sortOrder;
 		DecoratingTypeScriptSearchLabelProvider lpWrapper= (DecoratingTypeScriptSearchLabelProvider)getViewer().getLabelProvider();
-		((TypeScriptLabelProvider)lpWrapper.getStyledStringProvider()).setOrder(sortOrder);
+		((TypeScriptSearchLabelProvider)lpWrapper.getStyledStringProvider()).setOrder(sortOrder);
 		getViewer().refresh();
 		getSettings().put(KEY_SORTING, fCurrentSortOrder);
 	}

eclipse/ts.eclipse.ide.ui/src/ts/eclipse/ide/internal/ui/search/TypeScriptTableContentProvider.java renamed to eclipse/ts.eclipse.ide.ui/src/ts/eclipse/ide/internal/ui/search/TypeScriptSearchTableContentProvider.java

@@ -17,14 +17,14 @@
 
 import ts.eclipse.ide.ui.search.TypeScriptSearchResult;
 
-public class TypeScriptTableContentProvider implements IStructuredContentProvider, ITypeScriptSearchContentProvider {
+public class TypeScriptSearchTableContentProvider implements IStructuredContentProvider, ITypeScriptSearchContentProvider {
 
 	private final Object[] EMPTY_ARR = new Object[0];
 
 	private TypeScriptSearchResultPage fPage;
 	private AbstractTextSearchResult fResult;
 
-	public TypeScriptTableContentProvider(TypeScriptSearchResultPage page) {
+	public TypeScriptSearchTableContentProvider(TypeScriptSearchResultPage page) {
 		fPage = page;
 	}
 

eclipse/ts.eclipse.ide.ui/src/ts/eclipse/ide/internal/ui/search/TypeScriptTreeContentProvider.java renamed to eclipse/ts.eclipse.ide.ui/src/ts/eclipse/ide/internal/ui/search/TypeScriptSearchTreeContentProvider.java

@@ -29,7 +29,7 @@
 import ts.eclipse.ide.ui.search.TypeScriptSearchResult;
 
 
-public class TypeScriptTreeContentProvider implements ITreeContentProvider, ITypeScriptSearchContentProvider {
+public class TypeScriptSearchTreeContentProvider implements ITreeContentProvider, ITypeScriptSearchContentProvider {
 
 	private final Object[] EMPTY_ARR= new Object[0];
 
@@ -38,7 +38,7 @@ public class TypeScriptTreeContentProvider implements ITreeContentProvider, ITyp
 	private AbstractTreeViewer fTreeViewer;
 	private Map fChildrenMap;
 
-	TypeScriptTreeContentProvider(TypeScriptSearchResultPage page, AbstractTreeViewer viewer) {
+	TypeScriptSearchTreeContentProvider(TypeScriptSearchResultPage page, AbstractTreeViewer viewer) {
 		fPage= page;
 		fTreeViewer= viewer;
 	}