summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Andreas Gampe <agampe@google.com> 2016-11-28 15:04:25 -0800
committer Andreas Gampe <agampe@google.com> 2016-11-28 15:04:25 -0800
commit1c809a3d3240978ab393b48ec5501090ec5a0e57 (patch)
treeb13e751a2cf77d3c95a7a86c00efaa1538617d4e
parent5cb8998363a16e667faee4eaa7e5040bce7e702b (diff)
Preload2: Fix action inheritance
Use AbstractThreadedAction as a base. Bug: 31961946 Test: manual Change-Id: I5a05b65d753be775c8b8382bb1a81e869c388f8d
-rw-r--r--tools/preload2/src/com/android/preload/actions/ComputeThresholdAction.java4
-rw-r--r--tools/preload2/src/com/android/preload/actions/ExportAction.java7
-rw-r--r--tools/preload2/src/com/android/preload/actions/ImportAction.java4
3 files changed, 6 insertions, 9 deletions
diff --git a/tools/preload2/src/com/android/preload/actions/ComputeThresholdAction.java b/tools/preload2/src/com/android/preload/actions/ComputeThresholdAction.java
index 5d052ccc7072..3a7f7f74d755 100644
--- a/tools/preload2/src/com/android/preload/actions/ComputeThresholdAction.java
+++ b/tools/preload2/src/com/android/preload/actions/ComputeThresholdAction.java
@@ -38,7 +38,7 @@ import javax.swing.AbstractAction;
* appears in at least the number of threshold given packages. An optional blacklist can be
* used to filter classes from the intersection.
*/
-public class ComputeThresholdAction extends AbstractAction implements Runnable {
+public class ComputeThresholdAction extends AbstractThreadedAction {
protected int threshold;
private Pattern blacklist;
private DumpTableModel dataTableModel;
@@ -71,7 +71,7 @@ public class ComputeThresholdAction extends AbstractAction implements Runnable {
return;
}
- new Thread(this).start();
+ super.actionPerformed(e);
}
@Override
diff --git a/tools/preload2/src/com/android/preload/actions/ExportAction.java b/tools/preload2/src/com/android/preload/actions/ExportAction.java
index cb8b3df75b18..848a56826788 100644
--- a/tools/preload2/src/com/android/preload/actions/ExportAction.java
+++ b/tools/preload2/src/com/android/preload/actions/ExportAction.java
@@ -19,14 +19,11 @@ package com.android.preload.actions;
import com.android.preload.DumpDataIO;
import com.android.preload.DumpTableModel;
import com.android.preload.Main;
-
import java.awt.event.ActionEvent;
import java.io.File;
import java.io.PrintWriter;
-import javax.swing.AbstractAction;
-
-public class ExportAction extends AbstractAction implements Runnable {
+public class ExportAction extends AbstractThreadedAction {
private File lastSaveFile;
private DumpTableModel dataTableModel;
@@ -39,7 +36,7 @@ public class ExportAction extends AbstractAction implements Runnable {
public void actionPerformed(ActionEvent e) {
lastSaveFile = Main.getUI().showSaveDialog();
if (lastSaveFile != null) {
- new Thread(this).start();
+ super.actionPerformed(e);
}
}
diff --git a/tools/preload2/src/com/android/preload/actions/ImportAction.java b/tools/preload2/src/com/android/preload/actions/ImportAction.java
index 5c1976580f94..bfeeb836fd45 100644
--- a/tools/preload2/src/com/android/preload/actions/ImportAction.java
+++ b/tools/preload2/src/com/android/preload/actions/ImportAction.java
@@ -27,7 +27,7 @@ import java.util.Collection;
import javax.swing.AbstractAction;
-public class ImportAction extends AbstractAction implements Runnable {
+public class ImportAction extends AbstractThreadedAction {
private File[] lastOpenFiles;
private DumpTableModel dataTableModel;
@@ -40,7 +40,7 @@ public class ImportAction extends AbstractAction implements Runnable {
public void actionPerformed(ActionEvent e) {
lastOpenFiles = Main.getUI().showOpenDialog(true);
if (lastOpenFiles != null) {
- new Thread(this).start();
+ super.actionPerformed(e);
}
}