3939import java .awt .event .ComponentAdapter ;
4040import java .awt .event .ComponentEvent ;
4141import java .util .ArrayList ;
42+ import java .util .Objects ;
4243
4344
4445/**
@@ -154,7 +155,7 @@ public static JTable addNumberColumn(final JTable userTable, int startingNumber)
154155 // Make certain we are the viewPort's view and not, for example, the rowHeaderView of the scrollPane - an implementor of fixed columns might do this.
155156 JViewport viewport = scrollPane .getViewport ();
156157
157- if (viewport == null || viewport .getView () != userTable ) {
158+ if (viewport == null || ! Objects . equals ( viewport .getView (), userTable ) ) {
158159 return null ;
159160 }
160161
@@ -318,7 +319,7 @@ private TableSynchronizer(JTable rowHeadersTableArg, JTable userTableArg) {
318319 }
319320
320321 public void valueChanged (ListSelectionEvent e ) {
321- if (e .getSource () == userTable .getSelectionModel ()) {
322+ if (Objects . equals ( e .getSource (), userTable .getSelectionModel () )) {
322323 rowHeadersTable .getSelectionModel ().removeListSelectionListener (this );
323324 rowHeadersTable .getSelectionModel ().clearSelection ();
324325
@@ -330,7 +331,7 @@ public void valueChanged(ListSelectionEvent e) {
330331 }
331332
332333 rowHeadersTable .getSelectionModel ().addListSelectionListener (this );
333- } else if (e .getSource () == rowHeadersTable .getSelectionModel ()) {
334+ } else if (Objects . equals ( e .getSource (), rowHeadersTable .getSelectionModel () )) {
334335 boolean isColumnSelectionAllowed = userTable .getColumnSelectionAllowed ();
335336 boolean isRowSelectionAllowed = userTable .getRowSelectionAllowed ();
336337 boolean isCellSelectionAllowed = userTable .getCellSelectionEnabled ();
0 commit comments