Implementation of 1344: Improve sorting of requirements

refs 1344

org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/extension/IModelElementHandler.java

@@ -96,7 +96,7 @@ public interface IModelElementHandler<T extends EObject> extends IEObjectAware<T
 	 * Returns the weight of the model element used for sorting of model elements in the navigator
 	 * view. Ordering is performed in ascending order.
 	 */
-	int getNavigatorViewWeight();
+	int getNavigatorViewWeight(T element);
 
 	/**
 	 * Handles the open model element request by returning the object that

org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/extension/base/ModelElementHandlerBase.java

@@ -103,7 +103,7 @@ public abstract class ModelElementHandlerBase<T extends EObject> implements IMod
 	 * The default returns 1000000.
 	 */
 	@Override
-	public int getNavigatorViewWeight() {
+	public int getNavigatorViewWeight(T element) {
 		return 1000000;
 	}
 

org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/views/NavigatorTreeContentSorter.java

@@ -43,11 +43,11 @@ public class NavigatorTreeContentSorter extends ViewerSorter {
 					IModelElementHandlerService.INSTANCE.getModelElementHandler((EObject)e2);
 			int w1 = 100000000;
 			if(handler1 != null) {
-				w1 = handler1.getNavigatorViewWeight();
+				w1 = handler1.getNavigatorViewWeight((EObject)e1);
 			}
 			int w2 = 100000000;
 			if(handler2 != null) {
-				w2 = handler2.getNavigatorViewWeight();
+				w2 = handler2.getNavigatorViewWeight((EObject)e2);
 			}
 			int result = w1 - w2;
 			if(result == 0) {