Cast can be removed by narrowing var type is applied; other minor fixes

This commit is contained in:
Tagir Valeev
2018-04-24 15:12:59 +07:00
parent a8e630f68d
commit e49f9e7d4c
70 changed files with 208 additions and 249 deletions

View File

@@ -295,11 +295,11 @@ public class IpnbFilePanel extends JPanel implements Scrollable, DataProvider, D
}
final IpnbEditablePanel cellToMergePanel = getSelectedCellPanel();
final IpnbCell cellToMerge = cellToMergePanel.getCell();
final IpnbEditableCell cellToMerge = cellToMergePanel.getCell();
final List<String> currentCellSource = getCellSource(currentCellPanel);
final List<String> cellToMergeSource = ((IpnbEditableCell)cellToMerge).getSource();
final List<String> cellToMergeSource = cellToMerge.getSource();
final ArrayList<String> source = mergeCellsSource(currentCellSource, cellToMergeSource, below);
((IpnbEditableCell)cellToMerge).setSource(source);
cellToMerge.setSource(source);
cellToMergePanel.updateCellView();
actualizeCellData(cellToMerge);
@@ -387,8 +387,8 @@ public class IpnbFilePanel extends JPanel implements Scrollable, DataProvider, D
@NotNull
private static List<String> getCellSource(@NotNull IpnbEditablePanel cellPanel) {
final IpnbCell cell = cellPanel.getCell();
return ((IpnbEditableCell)cell).getSource();
final IpnbEditableCell cell = cellPanel.getCell();
return cell.getSource();
}
public void deleteSelectedCell() {