From 378ebab2e70917b4182cbd840a3fa66e4e42fd92 Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Wed, 22 Aug 2018 17:42:13 -0700 Subject: [PATCH] altoslib: Use common constants for flash action messages Place messages in AltosFlashListener instead of using the same strings in three different places. Signed-off-by: Keith Packard --- altoslib/AltosFlash.java | 4 ++-- altoslib/AltosFlashListener.java | 4 ++++ altoslib/AltosSelfFlash.java | 4 ++-- altosuilib/AltosFlashUI.java | 4 ++-- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/altoslib/AltosFlash.java b/altoslib/AltosFlash.java index 520663b7..e6b05713 100644 --- a/altoslib/AltosFlash.java +++ b/altoslib/AltosFlash.java @@ -257,7 +257,7 @@ public class AltosFlash extends AltosProgrammer { int flash_addr = (int) image.address; int image_start = 0; - action("start", 0); + action(AltosFlashListener.flash_start, 0); action(0, image.data.length); while (remain > 0 && !aborted) { int this_time = remain; @@ -293,7 +293,7 @@ public class AltosFlash extends AltosProgrammer { action(image.data.length - remain, image.data.length); } if (!aborted) { - action("done", 100); + action(AltosFlashListener.flash_done, 100); if (debug != null) { debug.set_pc((int) image.address); debug.resume(); diff --git a/altoslib/AltosFlashListener.java b/altoslib/AltosFlashListener.java index f9eaf00f..120e7146 100644 --- a/altoslib/AltosFlashListener.java +++ b/altoslib/AltosFlashListener.java @@ -19,5 +19,9 @@ package org.altusmetrum.altoslib_13; public interface AltosFlashListener { + + public final static String flash_start = "start"; + public final static String flash_done = "done"; + public void position(String label, int percent); } diff --git a/altoslib/AltosSelfFlash.java b/altoslib/AltosSelfFlash.java index 75fc7946..20839ce4 100644 --- a/altoslib/AltosSelfFlash.java +++ b/altoslib/AltosSelfFlash.java @@ -101,7 +101,7 @@ public class AltosSelfFlash extends AltosProgrammer { long flash_addr = image.address; int image_start = 0; - action("start", 0); + action(AltosFlashListener.flash_start, 0); action(0, image.data.length); while (remain > 0 && !aborted) { int this_time = remain; @@ -129,7 +129,7 @@ public class AltosSelfFlash extends AltosProgrammer { action(image.data.length - remain, image.data.length); } if (!aborted) { - action("done", 100); + action(AltosFlashListener.flash_done, 100); } close(); } catch (IOException ie) { diff --git a/altosuilib/AltosFlashUI.java b/altosuilib/AltosFlashUI.java index 6dc80272..4d9c662c 100644 --- a/altosuilib/AltosFlashUI.java +++ b/altosuilib/AltosFlashUI.java @@ -116,10 +116,10 @@ public class AltosFlashUI JOptionPane.ERROR_MESSAGE); setVisible(false); dispose(); - } else if (cmd.equals("done")) { + } else if (cmd.equals(AltosFlashListener.flash_done)) { setVisible(false); dispose(); - } else if (cmd.equals("start")) { + } else if (cmd.equals(AltosFlashListener.flash_start)) { setVisible(true); } else { pbar.setValue(e.getID()); -- 2.30.2