Fix compile error in RuleTableViewerSorter

Author: adangel

net.sourceforge.pmd.eclipse.plugin/src/main/java/net/sourceforge/pmd/eclipse/ui/preferences/PMDPreferencePage.java

@@ -357,7 +357,7 @@ private Table buildRuleTableViewer(Composite parent) {
 
         ruleTableViewer.setContentProvider(new RuleSetContentProvider());
         ruleTableViewer.setLabelProvider(new RuleLabelProvider());
-        ruleTableViewer.setSorter(ruleTableViewerSorter);
+        ruleTableViewer.setComparator(ruleTableViewerSorter);
         ruleTableViewer.addSelectionChangedListener(new ISelectionChangedListener() {
             /**
              * @see org.eclipse.jface.viewers.ISelectionChangedListener#selectionChanged(SelectionChangedEvent)

net.sourceforge.pmd.eclipse.plugin/src/main/java/net/sourceforge/pmd/eclipse/ui/preferences/RuleTableViewerSorter.java

@@ -37,7 +37,7 @@
 import java.util.Comparator;
 
 import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerSorter;
+import org.eclipse.jface.viewers.ViewerComparator;
 
 import net.sourceforge.pmd.Rule;
 
@@ -48,7 +48,7 @@
  *
  */
 
-public class RuleTableViewerSorter extends ViewerSorter {
+public class RuleTableViewerSorter extends ViewerComparator {
 
     /**
      * Default Rule comparator for tabular display of Rules.
@@ -145,13 +145,6 @@ public void setSortDescending(boolean sortDescending) {
         this.sortDescending = sortDescending;
     }
 
-    /**
-     * @return Returns the comparator.
-     */
-    public Comparator<Rule> getComparator() {
-        return comparator;
-    }
-
     /**
      * Set a comparator. If the same comparator is already set, then change the
      * sorting order.
@@ -167,10 +160,14 @@ public void setComparator(Comparator<Rule> comparator) {
         }
     }
 
-    /**
-     * @see org.eclipse.jface.viewers.ViewerSorter#compare(org.eclipse.jface.viewers.Viewer,
-     *      java.lang.Object, java.lang.Object)
-     */
+    @Override
+    protected Comparator<? super String> getComparator() {
+        // safe-guard
+        throw new UnsupportedOperationException("Getting the underlaying comparator is not allowed"
+                + " - since a different one is actually used");
+    }
+
+    @Override
     public int compare(Viewer viewer, Object e1, Object e2) {
         int result = comparator.compare((Rule) e1, (Rule) e2);
         return sortDescending ? 0 - result : result;

net.sourceforge.pmd.eclipse.plugin/src/main/java/net/sourceforge/pmd/eclipse/ui/properties/PMDProjectPropertyPage.java

@@ -450,7 +450,7 @@ private Table buildAvailableRulesTableViewer(final Composite parent) {
 
         availableRulesTableViewer.setContentProvider(new RuleSetContentProvider());
         availableRulesTableViewer.setLabelProvider(new RuleLabelProvider());
-        availableRulesTableViewer.setSorter(availableRuleTableViewerSorter);
+        availableRulesTableViewer.setComparator(availableRuleTableViewerSorter);
         availableRulesTableViewer.setColumnProperties(new String[] { PMDPreferencePage.PROPERTY_LANGUAGE,
             PMDPreferencePage.PROPERTY_RULESET_NAME, PMDPreferencePage.PROPERTY_RULE_NAME,
             // PMDPreferencePage.PROPERTY_SINCE,

net.sourceforge.pmd.eclipse.plugin/src/main/java/net/sourceforge/pmd/eclipse/ui/properties/PMDPropertyPage.java

@@ -389,7 +389,7 @@ private Table buildAvailableRulesTableViewer(final Composite parent) {
 
         availableRulesTableViewer.setContentProvider(new RuleSetContentProvider());
         availableRulesTableViewer.setLabelProvider(new RuleLabelProvider());
-        availableRulesTableViewer.setSorter(availableRuleTableViewerSorter);
+        availableRulesTableViewer.setComparator(availableRuleTableViewerSorter);
         availableRulesTableViewer.setColumnProperties(
                 new String[] { PMDPreferencePage.PROPERTY_LANGUAGE, PMDPreferencePage.PROPERTY_RULESET_NAME,
                     PMDPreferencePage.PROPERTY_RULE_NAME, PMDPreferencePage.PROPERTY_SINCE,