logcat: fix npe & clear log in filtered view

1. Fix NPE when selecting all items: Issue is that in case of a
table with SWT.VIRTUAL, tableItem.getData() could return NULL if
the item hasn't been shown. So we have to rely on the original
model to retrieve the items.

2. When viewing items after applying a filter, clear log will
clear the full log but not the filtered view. To clear the filtered
view, the SWT ViewerFilters have to be reapplied.

Change-Id: I6c66be4e0e8abb6db114588f382bcd3b9fe8ee0f

1 files changed, 17 insertions, 2 deletions

diff --git a/ddms/libs/ddmuilib/src/com/android/ddmuilib/logcat/LogCatPanel.java b/ddms/libs/ddmuilib/src/com/android/ddmuilib/logcat/LogCatPanel.java
index 9084623..22052f9 100644
--- a/ddms/libs/ddmuilib/src/com/android/ddmuilib/logcat/LogCatPanel.java
+++ b/ddms/libs/ddmuilib/src/com/android/ddmuilib/logcat/LogCatPanel.java
@@ -75,6 +75,7 @@ import java.io.FileWriter;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 
 /**
@@ -547,6 +548,9 @@ public final class LogCatPanel extends SelectionDependentPanel
                 if (mReceiver != null) {
                     mReceiver.clearMessages();
                     refreshLogCatTable();
+
+                    // the filters view is not cleared unless the filters are re-applied.
+                    updateAppliedFilters();
                 }
             }
         });
@@ -663,10 +667,21 @@ public final class LogCatPanel extends SelectionDependentPanel
         int[] indices = table.getSelectionIndices();
         Arrays.sort(indices); /* Table.getSelectionIndices() does not specify an order */
 
+        // Get items from the table's input as opposed to getting each table item's data.
+        // Retrieving table item's data can return NULL in case of a virtual table if the item
+        // has not been displayed yet.
+        Object input = mViewer.getInput();
+        if (!(input instanceof LogCatMessageList)) {
+            return Collections.emptyList();
+        }
+        Object []items = ((LogCatMessageList) input).toArray();
+
         List<LogCatMessage> selectedMessages = new ArrayList<LogCatMessage>(indices.length);
         for (int i : indices) {
-            LogCatMessage m = (LogCatMessage) table.getItem(i).getData();
-            selectedMessages.add(m);
+            if (i < items.length) {
+                LogCatMessage m = (LogCatMessage) items[i];
+                selectedMessages.add(m);
+            }
         }
 
         return selectedMessages;