From 3fee94d7ae4dd93debdd836e856a43d2f9ee7ea6 Mon Sep 17 00:00:00 2001
From: Vladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Date: Fri, 4 Nov 2016 15:50:17 +0100
Subject: [PATCH] cleanup

---
 .../options/pathMacros/PathMacroTable.java         | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/platform/platform-impl/src/com/intellij/application/options/pathMacros/PathMacroTable.java b/platform/platform-impl/src/com/intellij/application/options/pathMacros/PathMacroTable.java
index e0638c94c7c3..3bce5f1476b7 100644
--- a/platform/platform-impl/src/com/intellij/application/options/pathMacros/PathMacroTable.java
+++ b/platform/platform-impl/src/com/intellij/application/options/pathMacros/PathMacroTable.java
@@ -45,7 +45,7 @@ public class PathMacroTable extends Table {
   private static final int VALUE_COLUMN = 1;
 
   private final List<Couple<String>> myMacros = new ArrayList<>();
-  private static final Comparator<Couple<String>> MACRO_COMPARATOR = (pair, pair1) -> pair.getFirst().compareTo(pair1.getFirst());
+  private static final Comparator<Couple<String>> MACRO_COMPARATOR = Comparator.comparing(pair -> pair.getFirst());
 
   private final Collection<String> myUndefinedMacroNames;
 
@@ -58,6 +58,7 @@ public class PathMacroTable extends Table {
     setModel(myTableModel);
     TableColumn column = getColumnModel().getColumn(NAME_COLUMN);
     column.setCellRenderer(new DefaultTableCellRenderer() {
+      @Override
       public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) {
         final Component component = super.getTableCellRendererComponent(table, value, isSelected, hasFocus, row, column);
         final String macroValue = getMacroValueAt(row);
@@ -198,18 +199,22 @@ public class PathMacroTable extends Table {
   }
 
   private class MyTableModel extends AbstractTableModel{
+    @Override
     public int getColumnCount() {
       return 2;
     }
 
+    @Override
     public int getRowCount() {
       return myMacros.size();
     }
 
+    @Override
     public Class getColumnClass(int columnIndex) {
       return String.class;
     }
 
+    @Override
     public Object getValueAt(int rowIndex, int columnIndex) {
       final Couple<String> pair = myMacros.get(rowIndex);
       switch (columnIndex) {
@@ -220,9 +225,11 @@ public class PathMacroTable extends Table {
       return null;
     }
 
+    @Override
     public void setValueAt(Object aValue, int rowIndex, int columnIndex) {
     }
 
+    @Override
     public String getColumnName(int columnIndex) {
       switch (columnIndex) {
         case NAME_COLUMN: return ApplicationBundle.message("column.name");
@@ -231,6 +238,7 @@ public class PathMacroTable extends Table {
       return null;
     }
 
+    @Override
     public boolean isCellEditable(int rowIndex, int columnIndex) {
       return false;
     }
@@ -243,11 +251,13 @@ public class PathMacroTable extends Table {
       myTitle = title;
     }
 
+    @Override
     public boolean checkName(String name) {
       if (name.length() == 0) return false;
       return PathMacrosCollector.MACRO_PATTERN.matcher("$" + name + "$").matches();
     }
 
+    @Override
     public boolean isOK(String name, String value) {
       if(name.length() == 0) return false;
       if (hasMacroWithName(name)) {
@@ -260,6 +270,7 @@ public class PathMacroTable extends Table {
   }
 
   private static class EditValidator implements PathMacroEditor.Validator {
+    @Override
     public boolean checkName(String name) {
       if (name.isEmpty() || PathMacros.getInstance().getSystemMacroNames().contains(name)) {
         return false;
@@ -268,6 +279,7 @@ public class PathMacroTable extends Table {
       return PathMacrosCollector.MACRO_PATTERN.matcher("$" + name + "$").matches();
     }
 
+    @Override
     public boolean isOK(String name, String value) {
       return checkName(name);
     }