UI overhaul: actions, menus, labels, icons

2 files changed, 13 insertions, 3 deletions

diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/UIUtil.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/UIUtil.java
index 2797d608f4..cc20503d32 100644
--- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/UIUtil.java
+++ b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/UIUtil.java
@@ -132,8 +132,9 @@ public final class UIUtil
       {
         display = PlatformUI.getWorkbench().getDisplay();
       }
-      catch (RuntimeException ignore)
+      catch (Throwable ignore)
       {
+        //$FALL-THROUGH$
       }
     }
 
diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/views/ContainerView.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/views/ContainerView.java
index 7ee9383bcd..dcb297fc85 100644
--- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/views/ContainerView.java
+++ b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/views/ContainerView.java
@@ -40,6 +40,7 @@ import org.eclipse.jface.viewers.ITreeSelection;
 import org.eclipse.jface.viewers.SelectionChangedEvent;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TreeViewer;
+import org.eclipse.jface.viewers.ViewerSorter;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.graphics.Color;
 import org.eclipse.swt.graphics.Font;
@@ -224,11 +225,19 @@ public abstract class ContainerView extends ViewPart implements ISelectionProvid
     itemProvider = createContainerItemProvider();
     viewer.setContentProvider(createContentProvider());
     viewer.setLabelProvider(createLabelProvider());
-    viewer.setSorter(new ContainerNameSorter());
+    viewer.setSorter(createViewerSorter());
     resetInput();
   }
 
   /**
+   * @since 3.3
+   */
+  protected ViewerSorter createViewerSorter()
+  {
+    return new ContainerNameSorter();
+  }
+
+  /**
    * @since 3.0
    */
   protected IContentProvider createContentProvider()
@@ -412,8 +421,8 @@ public abstract class ContainerView extends ViewPart implements ISelectionProvid
 
   protected void fillContextMenu(IMenuManager manager, ITreeSelection selection)
   {
-    manager.add(new Separator(IWorkbenchActionConstants.MB_ADDITIONS));
     itemProvider.fillContextMenu(manager, selection);
+    manager.add(new Separator(IWorkbenchActionConstants.MB_ADDITIONS));
   }
 
   protected void selectionChanged(IActionBars bars, ITreeSelection selection)