fixed filetable rendering issue

trol73 · Dec 25, 2016 · 956a767 · 956a767
1 parent 1b78f62
commit 956a767
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/src/main/com/mucommander/ui/main/table/views/compact/CompactFileTableModel.java b/src/main/com/mucommander/ui/main/table/views/compact/CompactFileTableModel.java
@@ -29,14 +29,14 @@ public class CompactFileTableModel extends BaseFileTableModel {
 
     final int columns;
 
-    protected int visibleRows;
+    private int visibleRows;
 
 //    private int rowCount;
 
     private int offset;
 
     /** Cell values cache */
-    protected String cellValuesCache[];
+    private String cellValuesCache[];
 
     public CompactFileTableModel(int columns, int visibleRows) {
         super();

diff --git a/src/main/com/mucommander/ui/main/table/views/full/FileTableModel.java b/src/main/com/mucommander/ui/main/table/views/full/FileTableModel.java
@@ -161,7 +161,7 @@ public synchronized int getRowCount() {
 
     @Override
     public synchronized Object getValueAt(int rowIndex, int columnIndex) {
-        if (cellValuesCache.length <= columnIndex) {
+        if (rowIndex >= cellValuesCache.length || columnIndex >= cellValuesCache[rowIndex].length) {
             return null;
         }
         // Need to check that row index is not larger than actual number of rows
@@ -199,7 +199,6 @@ public synchronized Object getValueAt(int rowIndex, int columnIndex) {
             result = fillOneCellCache(index, parent != null ? fileIndex + 1 : fileIndex)[columnIndex];
         }
         // TODO preload icons for all visible files
-
         return result;
     }