From 78769c3537836e4407dbae4d65e47bee0d97e776 Mon Sep 17 00:00:00 2001
From: Alain Magloire <alain@qnx.com>
Date: Tue, 10 Feb 2004 15:44:52 +0000
Subject: [PATCH] Fix Pr 50794 . Rename CViewSorter to CElementSorter and
 refactor in org.eclipse.cdt.ui.CElementSorter

---
 core/org.eclipse.cdt.ui/ChangeLog                        | 9 +++++++++
 .../src/org/eclipse/cdt/internal/ui/cview/CView.java     | 3 ++-
 .../ui/cview/CViewSorter.java => ui/CElementSorter.java} | 4 ++--
 3 files changed, 13 insertions(+), 3 deletions(-)
 rename core/org.eclipse.cdt.ui/src/org/eclipse/cdt/{internal/ui/cview/CViewSorter.java => ui/CElementSorter.java} (98%)

diff --git a/core/org.eclipse.cdt.ui/ChangeLog b/core/org.eclipse.cdt.ui/ChangeLog
index 732c5ecbd5b..3a21d9270da 100644
--- a/core/org.eclipse.cdt.ui/ChangeLog
+++ b/core/org.eclipse.cdt.ui/ChangeLog
@@ -1,3 +1,12 @@
+2004-02-10 Alain Magloire
+
+	Fix to PR 50794
+	Rename The CViewSorter to CElementSorter, it is more consistent
+	with eclipse i.e. JavaElementSorter, ResourceSorter ....
+	Also make it accessible.
+
+	* src/prg/eclipse/cdt/ui/CElementSorter.java
+
 2004-02-06 Hoda Amer
 	- Patch for Keith Campbell: Default template file change ( for statement )
 	- Patch for Chris Wiebe: Better header file icon
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CView.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CView.java
index 77cefef89a8..406b24cb9ec 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CView.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CView.java
@@ -36,6 +36,7 @@ import org.eclipse.cdt.internal.ui.editor.SearchDialogAction;
 import org.eclipse.cdt.internal.ui.preferences.CPluginPreferencePage;
 import org.eclipse.cdt.internal.ui.util.EditorUtility;
 import org.eclipse.cdt.internal.ui.util.ProblemTreeViewer;
+import org.eclipse.cdt.ui.*;
 import org.eclipse.cdt.ui.CElementContentProvider;
 import org.eclipse.cdt.ui.CLocalSelectionTransfer;
 import org.eclipse.cdt.ui.CUIPlugin;
@@ -465,7 +466,7 @@ public class CView extends ViewPart implements IMenuListener, ISetSelectionTarge
 		viewer.addFilter(patternFilter);
 		viewer.addFilter(workingSetFilter);
 		//viewer.addFilter(clibFilter);
-		viewer.setSorter(new CViewSorter ());
+		viewer.setSorter(new CElementSorter ());
 		// FIXME: Add different Sorting.
 		if(memento != null)
 			restoreFilters();
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CViewSorter.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CElementSorter.java
similarity index 98%
rename from core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CViewSorter.java
rename to core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CElementSorter.java
index a2cd0d0ca63..e124b8a2b5f 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CViewSorter.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CElementSorter.java
@@ -1,4 +1,4 @@
-package org.eclipse.cdt.internal.ui.cview;
+package org.eclipse.cdt.ui;
 
 /*
  * (c) Copyright IBM Corp. 2000, 2001.
@@ -44,7 +44,7 @@ import org.eclipse.ui.model.IWorkbenchAdapter;
  *  5  C File
  *  6 the reset
  */
-public class CViewSorter extends ViewerSorter { 
+public class CElementSorter extends ViewerSorter { 
 
 	private static final int CMODEL = 0;
 	private static final int PROJECT = 10;