[Releng] Fix new deprecation warnings with Neon Platform

19 files changed, 42 insertions, 38 deletions

diff --git a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.editor/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.editor/META-INF/MANIFEST.MF
index 4fdbae4b76..b808763e8f 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.editor/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.editor/META-INF/MANIFEST.MF
@@ -2,13 +2,13 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.editor;singleton:=true
-Bundle-Version: 2.0.300.qualifier
+Bundle-Version: 2.0.400.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.presentation.DawnCodeGenEditorPlugin$Implementation
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Export-Package: org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.editor.registry;version="2.0.300",
+Export-Package: org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.editor.registry;version="2.0.400",
  org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.presentation;version="2.0.0";
   uses:="org.eclipse.jface.wizard,
    org.eclipse.core.runtime,
diff --git a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.editor/src/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/presentation/DawngenmodelEditor.java b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.editor/src/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/presentation/DawngenmodelEditor.java
index b94228590f..4f8e8ab2a8 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.editor/src/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/presentation/DawngenmodelEditor.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.editor/src/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/presentation/DawngenmodelEditor.java
@@ -131,7 +131,7 @@ import java.util.Map;
  * @generated
  */
 public class DawngenmodelEditor extends MultiPageEditorPart implements IEditingDomainProvider, ISelectionProvider,
-IMenuListener, IViewerProvider, IGotoMarker, ISelectionChangedListener
+    IMenuListener, IViewerProvider, IGotoMarker, ISelectionChangedListener
 {
   /**
    * This keeps track of the editing domain that is used to track all changes to the model. <!-- begin-user-doc --> <!--
@@ -1205,6 +1205,7 @@ IMenuListener, IViewerProvider, IGotoMarker, ISelectionChangedListener
           }
         }
 
+        @SuppressWarnings("deprecation")
         @Override
         public void makeContributions(IMenuManager menuManager, IToolBarManager toolBarManager,
             IStatusLineManager statusLineManager)
@@ -1213,6 +1214,7 @@ IMenuListener, IViewerProvider, IGotoMarker, ISelectionChangedListener
           contentOutlineStatusLineManager = statusLineManager;
         }
 
+        @SuppressWarnings("deprecation")
         @Override
         public void setActionBars(IActionBars actionBars)
         {
@@ -1470,7 +1472,7 @@ IMenuListener, IViewerProvider, IGotoMarker, ISelectionChangedListener
     setPartName(editorInput.getName());
     IProgressMonitor progressMonitor = getActionBars().getStatusLineManager() != null
         ? getActionBars().getStatusLineManager().getProgressMonitor() : new NullProgressMonitor();
-        doSave(progressMonitor);
+    doSave(progressMonitor);
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.emf.ui/src-gen/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/emf/dawnEmfGenmodel/presentation/DawnEmfGenmodelEditor.java b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.emf.ui/src-gen/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/emf/dawnEmfGenmodel/presentation/DawnEmfGenmodelEditor.java
index 9ba6b4a32d..e1083bd26b 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.emf.ui/src-gen/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/emf/dawnEmfGenmodel/presentation/DawnEmfGenmodelEditor.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.emf.ui/src-gen/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/emf/dawnEmfGenmodel/presentation/DawnEmfGenmodelEditor.java
@@ -1149,6 +1149,7 @@ public class DawnEmfGenmodelEditor extends MultiPageEditorPart
           }
         }
 
+        @SuppressWarnings("deprecation")
         @Override
         public void makeContributions(IMenuManager menuManager, IToolBarManager toolBarManager,
             IStatusLineManager statusLineManager)
@@ -1157,6 +1158,7 @@ public class DawnEmfGenmodelEditor extends MultiPageEditorPart
           contentOutlineStatusLineManager = statusLineManager;
         }
 
+        @SuppressWarnings("deprecation")
         @Override
         public void setActionBars(IActionBars actionBars)
         {
@@ -1399,7 +1401,7 @@ public class DawnEmfGenmodelEditor extends MultiPageEditorPart
     setPartName(editorInput.getName());
     IProgressMonitor progressMonitor = getActionBars().getStatusLineManager() != null
         ? getActionBars().getStatusLineManager().getProgressMonitor() : new NullProgressMonitor();
-        doSave(progressMonitor);
+    doSave(progressMonitor);
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf.ui/src-gen/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/gmf/dawnGmfGenmodel/presentation/DawnGmfGenmodelEditor.java b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf.ui/src-gen/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/gmf/dawnGmfGenmodel/presentation/DawnGmfGenmodelEditor.java
index f8c4ec54c2..d318542921 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf.ui/src-gen/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/gmf/dawnGmfGenmodel/presentation/DawnGmfGenmodelEditor.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf.ui/src-gen/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/gmf/dawnGmfGenmodel/presentation/DawnGmfGenmodelEditor.java
@@ -1151,6 +1151,7 @@ public class DawnGmfGenmodelEditor extends MultiPageEditorPart
           }
         }
 
+        @SuppressWarnings("deprecation")
         @Override
         public void makeContributions(IMenuManager menuManager, IToolBarManager toolBarManager,
             IStatusLineManager statusLineManager)
@@ -1159,6 +1160,7 @@ public class DawnGmfGenmodelEditor extends MultiPageEditorPart
           contentOutlineStatusLineManager = statusLineManager;
         }
 
+        @SuppressWarnings("deprecation")
         @Override
         public void setActionBars(IActionBars actionBars)
         {
@@ -1401,7 +1403,7 @@ public class DawnGmfGenmodelEditor extends MultiPageEditorPart
     setPartName(editorInput.getName());
     IProgressMonitor progressMonitor = getActionBars().getStatusLineManager() != null
         ? getActionBars().getStatusLineManager().getProgressMonitor() : new NullProgressMonitor();
-        doSave(progressMonitor);
+    doSave(progressMonitor);
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/ClientView.java b/plugins/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/ClientView.java
index b5ba4f0934..ba1226c1d2 100644
--- a/plugins/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/ClientView.java
+++ b/plugins/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/ClientView.java
@@ -84,7 +84,7 @@ public class ClientView extends AbstractView<CDOSession>
     treeViewer = new TreeViewer(parent, SWT.BORDER);
     treeViewer.setLabelProvider(itemProvider);
     treeViewer.setContentProvider(itemProvider);
-    treeViewer.setSorter(itemProvider);
+    treeViewer.setComparator(itemProvider);
     treeViewer.setInput(session);
 
     hookDoubleClick();
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/ClientView.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/ClientView.java
index b5ba4f0934..ba1226c1d2 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/ClientView.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/ClientView.java
@@ -84,7 +84,7 @@ public class ClientView extends AbstractView<CDOSession>
     treeViewer = new TreeViewer(parent, SWT.BORDER);
     treeViewer.setLabelProvider(itemProvider);
     treeViewer.setContentProvider(itemProvider);
-    treeViewer.setSorter(itemProvider);
+    treeViewer.setComparator(itemProvider);
     treeViewer.setInput(session);
 
     hookDoubleClick();
diff --git a/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/checkouts/CDOCheckoutViewerSorter.java b/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/checkouts/CDOCheckoutViewerSorter.java
index 2d62cbffdb..001d432cab 100644
--- a/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/checkouts/CDOCheckoutViewerSorter.java
+++ b/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/checkouts/CDOCheckoutViewerSorter.java
@@ -18,12 +18,12 @@ import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EObject;
 
 import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerSorter;
 
 /**
  * @author Eike Stepper
  */
-public class CDOCheckoutViewerSorter extends ViewerSorter
+@SuppressWarnings("deprecation")
+public class CDOCheckoutViewerSorter extends org.eclipse.jface.viewers.ViewerSorter
 {
   @Override
   public int category(Object element)
diff --git a/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/checkouts/wizards/CheckoutRootObjectPage.java b/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/checkouts/wizards/CheckoutRootObjectPage.java
index b93e604319..b730a7065a 100644
--- a/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/checkouts/wizards/CheckoutRootObjectPage.java
+++ b/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/checkouts/wizards/CheckoutRootObjectPage.java
@@ -244,7 +244,7 @@ public class CheckoutRootObjectPage extends CheckoutWizardPage
     treeViewer.getTree().setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 2, 1));
     treeViewer.setContentProvider(itemProvider);
     treeViewer.setLabelProvider(itemProvider);
-    treeViewer.setSorter(new CDOCheckoutViewerSorter());
+    treeViewer.setComparator(new CDOCheckoutViewerSorter());
     treeViewer.addSelectionChangedListener(new ISelectionChangedListener()
     {
       public void selectionChanged(SelectionChangedEvent event)
diff --git a/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/repositories/CDORepositoriesView.java b/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/repositories/CDORepositoriesView.java
index ab89036631..652973403c 100644
--- a/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/repositories/CDORepositoriesView.java
+++ b/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/repositories/CDORepositoriesView.java
@@ -115,7 +115,7 @@ public class CDORepositoriesView extends ContainerView
 
     TreeViewer viewer = getViewer();
     viewer.addTreeListener(activityDetector);
-    viewer.setSorter(null);
+    viewer.setComparator(null);
     UIUtil.addDragSupport(viewer);
 
     Tree tree = viewer.getTree();
diff --git a/plugins/org.eclipse.emf.cdo.expressions.editor/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.expressions.editor/META-INF/MANIFEST.MF
index 08ffc391d8..0bde9fe8ff 100644
--- a/plugins/org.eclipse.emf.cdo.expressions.editor/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.expressions.editor/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.cdo.expressions.editor;singleton:=true
-Bundle-Version: 4.3.100.qualifier
+Bundle-Version: 4.3.200.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.emf.cdo.expressions.presentation.ExpressionsEditorPlugin$Implementation
 Bundle-Vendor: %providerName
diff --git a/plugins/org.eclipse.emf.cdo.expressions.editor/src/org/eclipse/emf/cdo/expressions/presentation/ExpressionsEditor.java b/plugins/org.eclipse.emf.cdo.expressions.editor/src/org/eclipse/emf/cdo/expressions/presentation/ExpressionsEditor.java
index 7f32ae4917..4946d7194a 100644
--- a/plugins/org.eclipse.emf.cdo.expressions.editor/src/org/eclipse/emf/cdo/expressions/presentation/ExpressionsEditor.java
+++ b/plugins/org.eclipse.emf.cdo.expressions.editor/src/org/eclipse/emf/cdo/expressions/presentation/ExpressionsEditor.java
@@ -1196,6 +1196,7 @@ public class ExpressionsEditor extends MultiPageEditorPart
           }
         }
 
+        @SuppressWarnings("deprecation")
         @Override
         public void makeContributions(IMenuManager menuManager, IToolBarManager toolBarManager,
             IStatusLineManager statusLineManager)
@@ -1204,6 +1205,7 @@ public class ExpressionsEditor extends MultiPageEditorPart
           contentOutlineStatusLineManager = statusLineManager;
         }
 
+        @SuppressWarnings("deprecation")
         @Override
         public void setActionBars(IActionBars actionBars)
         {
@@ -1448,7 +1450,7 @@ public class ExpressionsEditor extends MultiPageEditorPart
     setPartName(editorInput.getName());
     IProgressMonitor progressMonitor = getActionBars().getStatusLineManager() != null
         ? getActionBars().getStatusLineManager().getProgressMonitor() : new NullProgressMonitor();
-        doSave(progressMonitor);
+    doSave(progressMonitor);
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.security.editor/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.security.editor/META-INF/MANIFEST.MF
index 8913e45789..dcd7ccdf16 100644
--- a/plugins/org.eclipse.emf.cdo.security.editor/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.security.editor/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.emf.cdo.security.editor;singleton:=true
-Bundle-Version: 4.2.200.qualifier
+Bundle-Version: 4.2.300.qualifier
 Bundle-Localization: plugin
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
diff --git a/plugins/org.eclipse.emf.cdo.security.editor/src/org/eclipse/emf/cdo/security/presentation/SecurityEditor.java b/plugins/org.eclipse.emf.cdo.security.editor/src/org/eclipse/emf/cdo/security/presentation/SecurityEditor.java
index 8f2e266905..527121039c 100644
--- a/plugins/org.eclipse.emf.cdo.security.editor/src/org/eclipse/emf/cdo/security/presentation/SecurityEditor.java
+++ b/plugins/org.eclipse.emf.cdo.security.editor/src/org/eclipse/emf/cdo/security/presentation/SecurityEditor.java
@@ -1198,6 +1198,7 @@ public class SecurityEditor extends MultiPageEditorPart
           }
         }
 
+        @SuppressWarnings("deprecation")
         @Override
         public void makeContributions(IMenuManager menuManager, IToolBarManager toolBarManager,
             IStatusLineManager statusLineManager)
@@ -1206,6 +1207,7 @@ public class SecurityEditor extends MultiPageEditorPart
           contentOutlineStatusLineManager = statusLineManager;
         }
 
+        @SuppressWarnings("deprecation")
         @Override
         public void setActionBars(IActionBars actionBars)
         {
@@ -1449,7 +1451,7 @@ public class SecurityEditor extends MultiPageEditorPart
     setPartName(editorInput.getName());
     IProgressMonitor progressMonitor = getActionBars().getStatusLineManager() != null
         ? getActionBars().getStatusLineManager().getProgressMonitor() : new NullProgressMonitor();
-        doSave(progressMonitor);
+    doSave(progressMonitor);
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/editor/CDOEditor.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/editor/CDOEditor.java
index 0d3b453618..1c8167b7c5 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/editor/CDOEditor.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/editor/CDOEditor.java
@@ -1660,6 +1660,7 @@ public class CDOEditor extends MultiPageEditorPart
           }
         }
 
+        @SuppressWarnings("deprecation")
         @Override
         public void makeContributions(IMenuManager menuManager, IToolBarManager toolBarManager,
             IStatusLineManager statusLineManager)
@@ -1668,6 +1669,7 @@ public class CDOEditor extends MultiPageEditorPart
           contentOutlineStatusLineManager = statusLineManager;
         }
 
+        @SuppressWarnings("deprecation")
         @Override
         public void setActionBars(IActionBars actionBars)
         {
diff --git a/plugins/org.eclipse.net4j.debug/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.debug/META-INF/MANIFEST.MF
index 069fa1deee..2f5ab6cb52 100644
--- a/plugins/org.eclipse.net4j.debug/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.net4j.debug/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.net4j.debug; singleton:=true
-Bundle-Version: 3.0.300.qualifier
+Bundle-Version: 3.0.400.qualifier
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
 Bundle-Activator: org.eclipse.net4j.internal.debug.bundle.OM$Activator
@@ -11,7 +11,7 @@ Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.net4j.util.ui;bundle-version="[3.0.0,4.0.0)";visibility:=reexport
 Bundle-ActivationPolicy: lazy
-Export-Package: org.eclipse.net4j.internal.debug;version="3.0.300";x-internal:=true,
- org.eclipse.net4j.internal.debug.bundle;version="3.0.300";x-internal:=true,
- org.eclipse.net4j.internal.debug.messages;version="3.0.300";x-internal:=true,
- org.eclipse.net4j.internal.debug.views;version="3.0.300";x-internal:=true
+Export-Package: org.eclipse.net4j.internal.debug;version="3.0.400";x-internal:=true,
+ org.eclipse.net4j.internal.debug.bundle;version="3.0.400";x-internal:=true,
+ org.eclipse.net4j.internal.debug.messages;version="3.0.400";x-internal:=true,
+ org.eclipse.net4j.internal.debug.views;version="3.0.400";x-internal:=true
diff --git a/plugins/org.eclipse.net4j.debug/src/org/eclipse/net4j/internal/debug/views/RemoteTraceView.java b/plugins/org.eclipse.net4j.debug/src/org/eclipse/net4j/internal/debug/views/RemoteTraceView.java
index 1fb2bd2413..b72ef42e8a 100644
--- a/plugins/org.eclipse.net4j.debug/src/org/eclipse/net4j/internal/debug/views/RemoteTraceView.java
+++ b/plugins/org.eclipse.net4j.debug/src/org/eclipse/net4j/internal/debug/views/RemoteTraceView.java
@@ -33,7 +33,6 @@ import org.eclipse.jface.viewers.ITableLabelProvider;
 import org.eclipse.jface.viewers.LabelProvider;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerSorter;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.widgets.Composite;
@@ -77,7 +76,6 @@ public class RemoteTraceView extends ViewPart
     createColmuns(viewer);
     viewer.setContentProvider(new ViewContentProvider());
     viewer.setLabelProvider(new ViewLabelProvider());
-    // viewer.setSorter(new NameSorter());
     viewer.setInput(getViewSite());
 
     // final ToolTipHandler tooltip = new ToolTipHandler(getSite().getShell());
@@ -334,13 +332,6 @@ public class RemoteTraceView extends ViewPart
     }
   }
 
-  /**
-   * @author Eike Stepper
-   */
-  class NameSorter extends ViewerSorter
-  {
-  }
-
   // static class ToolTipHandler
   // {
   // private Shell tipShell;
diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/internal/ui/views/Net4jIntrospectorView.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/internal/ui/views/Net4jIntrospectorView.java
index 6499fc0f21..553451d346 100644
--- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/internal/ui/views/Net4jIntrospectorView.java
+++ b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/internal/ui/views/Net4jIntrospectorView.java
@@ -36,7 +36,7 @@ import org.eclipse.jface.viewers.ITableLabelProvider;
 import org.eclipse.jface.viewers.LabelProvider;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerSorter;
+import org.eclipse.jface.viewers.ViewerComparator;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.StackLayout;
 import org.eclipse.swt.graphics.Color;
@@ -170,7 +170,7 @@ public class Net4jIntrospectorView extends ViewPart
     objectViewer.addDoubleClickListener(this);
     objectViewer.setContentProvider(new ObjectContentProvider());
     objectViewer.setLabelProvider(new ObjectLabelProvider());
-    objectViewer.setSorter(new NameSorter());
+    objectViewer.setComparator(new NameComparator());
     objectViewer.setInput(getViewSite());
 
     iterableViewer = createViewer(stacked);
@@ -192,7 +192,7 @@ public class Net4jIntrospectorView extends ViewPart
     mapViewer.addDoubleClickListener(this);
     mapViewer.setContentProvider(new MapContentProvider());
     mapViewer.setLabelProvider(new MapLabelProvider());
-    mapViewer.setSorter(new NameSorter());
+    mapViewer.setComparator(new NameComparator());
     mapViewer.setInput(getViewSite());
 
     IActionBars bars = getViewSite().getActionBars();
@@ -824,7 +824,7 @@ public class Net4jIntrospectorView extends ViewPart
   /**
    * @author Eike Stepper
    */
-  class NameSorter extends ViewerSorter
+  class NameComparator extends ViewerComparator
   {
   }
 }
diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/StructuredContentProvider.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/StructuredContentProvider.java
index 0fe7ed8b5e..3b070f44fa 100644
--- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/StructuredContentProvider.java
+++ b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/StructuredContentProvider.java
@@ -19,14 +19,14 @@ import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.StructuredViewer;
 import org.eclipse.jface.viewers.TreeViewer;
 import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerSorter;
 import org.eclipse.swt.graphics.Font;
 import org.eclipse.swt.widgets.Display;
 
 /**
  * @author Eike Stepper
  */
-public abstract class StructuredContentProvider<INPUT> extends ViewerSorter
+@SuppressWarnings("deprecation")
+public abstract class StructuredContentProvider<INPUT> extends org.eclipse.jface.viewers.ViewerSorter
     implements IStructuredContentProvider, IListener
 {
   private StructuredViewer viewer;
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 43b07f2046..dbae59095e 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
@@ -41,7 +41,6 @@ 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;
@@ -228,6 +227,7 @@ public abstract class ContainerView extends ViewPart implements ISelectionProvid
   /**
    * @since 3.1
    */
+  @SuppressWarnings("deprecation")
   protected void initViewer()
   {
     itemProvider = createContainerItemProvider();
@@ -240,7 +240,8 @@ public abstract class ContainerView extends ViewPart implements ISelectionProvid
   /**
    * @since 3.3
    */
-  protected ViewerSorter createViewerSorter()
+  @SuppressWarnings("deprecation")
+  protected org.eclipse.jface.viewers.ViewerSorter createViewerSorter()
   {
     return itemProvider;
   }