now sorting the view by package/class names per default

jmhofer · Jul 10, 2010 · dfa262f · dfa262f
1 parent f858132
commit dfa262f
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 4 deletions.
diff --git a/ecobertura.ui/src/main/scala/ecobertura/ui/views/session/CoverageSessionModel.scala b/ecobertura.ui/src/main/scala/ecobertura/ui/views/session/CoverageSessionModel.scala
@@ -96,16 +96,16 @@ class CoverageSessionModel extends CoverageSessionResetPublisher with ITreeConte
 		sessionPackage
 	}
 
-	override def getElements(element: Any) : Array[Object] = getChildren(element)
+	override def getElements(element: Any) : Array[AnyRef] = getChildren(element)
 	override def inputChanged(viewer: Viewer, arg0: Any, arg1: Any) = { /* no changes allowed yet */ }
 	override def dispose = { /* nothing to dispose of right now */ }
 
-	override def getChildren(parentElement: Any) : Array[Object] = parentElement match {
+	override def getChildren(parentElement: Any) : Array[AnyRef] = parentElement match {
 		case node: CoverageSessionTreeNode => node.children.toArray
 		case _ => Array()
 	}
 
-	override def getParent(element: Any) : Object = element match {
+	override def getParent(element: Any) : AnyRef = element match {
 		case node: CoverageSessionTreeNode => node.parent.getOrElse(null)
 		case _ => null
 	}

diff --git a/ecobertura.ui/src/main/scala/ecobertura/ui/views/session/CoverageSessionView.scala b/ecobertura.ui/src/main/scala/ecobertura/ui/views/session/CoverageSessionView.scala
@@ -51,7 +51,18 @@ class CoverageSessionView extends ViewPart {
   private var viewer: TreeViewer = null
   private var sessionResetListener: Option[Option[CoverageSession] => Unit] = None
 
-  class NameSorter extends ViewerSorter
+  class NameSorter extends ViewerSorter {
+    override def compare(viewer: Viewer, first: Any, second: Any) = {
+      println("compare")
+      (first, second) match {
+        case (firstNode: CoverageSessionTreeNode, secondNode: CoverageSessionTreeNode) => {
+          println("nodes")
+          firstNode.name.compareTo(secondNode.name)
+        }
+        case _ => first.toString.compareTo(second.toString)
+      }
+    }
+  }
 
   /**
    * This is a callback that will allow us to create the viewer and initialize it.