projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'prefs_interface' into altosdroid
[fw/altos]
/
altosui
/
AltosFlashUI.java
diff --git
a/altosui/AltosFlashUI.java
b/altosui/AltosFlashUI.java
index 4ab73a6dbeb1d23a082c74e9e2ef7ffe1ff67a37..f8c24b16c662a2498cb6b4570f087461f9c198f5 100644
(file)
--- a/
altosui/AltosFlashUI.java
+++ b/
altosui/AltosFlashUI.java
@@
-21,13
+21,8
@@
import java.awt.*;
import java.awt.event.*;
import javax.swing.*;
import javax.swing.filechooser.FileNameExtensionFilter;
import java.awt.event.*;
import javax.swing.*;
import javax.swing.filechooser.FileNameExtensionFilter;
-import javax.swing.table.*;
import java.io.*;
import java.io.*;
-import java.util.*;
-import java.text.*;
-import java.util.prefs.*;
import java.util.concurrent.*;
import java.util.concurrent.*;
-import org.altusmetrum.AltosLib.*;
public class AltosFlashUI
extends AltosDialog
public class AltosFlashUI
extends AltosDialog
@@
-235,22
+230,17
@@
public class AltosFlashUI
public void run() {
ui.flash = flash;
ui.update_rom_config_info(current_config);
public void run() {
ui.flash = flash;
ui.update_rom_config_info(current_config);
- System.out.printf("Done updating rom config info\n");
await_rom_config.release();
}
});
await_rom_config.release();
}
});
- System.out.printf("Waiting for rom configuration updates\n");
await_rom_config.acquire();
await_rom_config.acquire();
- System.out.printf("Got rom config update\n");
if (ui.rom_config != null) {
if (ui.rom_config != null) {
- System.out.printf("rom_config not null\n");
flash.set_romconfig(ui.rom_config);
flash.flash();
}
} catch (InterruptedException ee) {
final Exception e = ee;
flash.set_romconfig(ui.rom_config);
flash.flash();
}
} catch (InterruptedException ee) {
final Exception e = ee;
- System.out.printf("exception %s\n", e.toString());
SwingUtilities.invokeLater(new Runnable() {
public void run() {
ui.exception(e);
SwingUtilities.invokeLater(new Runnable() {
public void run() {
ui.exception(e);
@@
-258,7
+248,6
@@
public class AltosFlashUI
});
} catch (IOException ee) {
final Exception e = ee;
});
} catch (IOException ee) {
final Exception e = ee;
- System.out.printf("exception %s\n", e.toString());
SwingUtilities.invokeLater(new Runnable() {
public void run() {
ui.exception(e);
SwingUtilities.invokeLater(new Runnable() {
public void run() {
ui.exception(e);
@@
-266,7
+255,6
@@
public class AltosFlashUI
});
} catch (AltosSerialInUseException ee) {
final Exception e = ee;
});
} catch (AltosSerialInUseException ee) {
final Exception e = ee;
- System.out.printf("exception %s\n", e.toString());
SwingUtilities.invokeLater(new Runnable() {
public void run() {
ui.exception(e);
SwingUtilities.invokeLater(new Runnable() {
public void run() {
ui.exception(e);
@@
-298,7
+286,7
@@
public class AltosFlashUI
if (!select_source_file())
return;
build_dialog();
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) {
}
static void show(JFrame frame) {