summaryrefslogtreecommitdiff
path: root/altosui
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2012-10-18 16:49:28 -0700
committerKeith Packard <keithp@keithp.com>2012-10-18 16:49:28 -0700
commit7f664da148ae15d46d179d8ecede6fc0bc710ffb (patch)
treebd679edad131beb3fb00640ad7805b54c74ef289 /altosui
parent3aba5eb5a75dff3e7c8778561c533903eacb110a (diff)
parent23b0c2fe95dbfaa4a8ce603b56b75d12d2c17d8c (diff)
Merge branch 'master' into pwmin-new1.1.9.1pwmin-new
Diffstat (limited to 'altosui')
-rw-r--r--altosui/AltosFlashUI.java2
-rw-r--r--altosui/AltosSiteMap.java2
-rw-r--r--altosui/AltosUIPreferences.java2
3 files changed, 3 insertions, 3 deletions
diff --git a/altosui/AltosFlashUI.java b/altosui/AltosFlashUI.java
index f8c24b16..3ccfa76c 100644
--- a/altosui/AltosFlashUI.java
+++ b/altosui/AltosFlashUI.java
@@ -286,7 +286,7 @@ public class AltosFlashUI
if (!select_source_file())
return;
build_dialog();
- //flash_task f = new flash_task(this);
+ flash_task f = new flash_task(this);
}
static void show(JFrame frame) {
diff --git a/altosui/AltosSiteMap.java b/altosui/AltosSiteMap.java
index 3ea4d0fd..4e939b88 100644
--- a/altosui/AltosSiteMap.java
+++ b/altosui/AltosSiteMap.java
@@ -421,7 +421,7 @@ public class AltosSiteMap extends JScrollPane implements AltosFlightDisplay {
public AltosSiteMap(int in_radius) {
radius = in_radius;
- //GrabNDrag scroller = new GrabNDrag(comp);
+ GrabNDrag scroller = new GrabNDrag(comp);
comp.setLayout(layout);
diff --git a/altosui/AltosUIPreferences.java b/altosui/AltosUIPreferences.java
index a28c07b0..f6ee7e06 100644
--- a/altosui/AltosUIPreferences.java
+++ b/altosui/AltosUIPreferences.java
@@ -163,7 +163,7 @@ public class AltosUIPreferences extends AltosPreferences {
}
}
public static void set_serial_debug(boolean new_serial_debug) {
- AltosLink.set_debug(serial_debug);
+ AltosLink.set_debug(new_serial_debug);
synchronized (backend) {
serial_debug = new_serial_debug;
backend.putBoolean(serialDebugPreference, serial_debug);