projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'branch-1.6' into debian
[fw/altos]
/
altosui
/
AltosGraphUI.java
diff --git
a/altosui/AltosGraphUI.java
b/altosui/AltosGraphUI.java
index ddd281a6d41813453cedb2a932211eb99d7d88c9..f5e339a59a2d26b3968b54d39174a1291c57510f 100644
(file)
--- a/
altosui/AltosGraphUI.java
+++ b/
altosui/AltosGraphUI.java
@@
-23,8
+23,8
@@
import java.util.ArrayList;
import java.awt.*;
import java.awt.event.*;
import javax.swing.*;
import java.awt.*;
import java.awt.event.*;
import javax.swing.*;
-import org.altusmetrum.altoslib_
5
.*;
-import org.altusmetrum.altosuilib_
3
.*;
+import org.altusmetrum.altoslib_
6
.*;
+import org.altusmetrum.altosuilib_
6
.*;
import org.jfree.chart.ChartPanel;
import org.jfree.chart.JFreeChart;
import org.jfree.chart.ChartPanel;
import org.jfree.chart.JFreeChart;
@@
-55,12
+55,17
@@
public class AltosGraphUI extends AltosUIFrame implements AltosFontListener, Alt
}
public void font_size_changed(int font_size) {
}
public void font_size_changed(int font_size) {
- map.font_size_changed(font_size);
- statsTable.font_size_changed(font_size);
+ if (map != null)
+ map.font_size_changed(font_size);
+ if (statsTable != null)
+ statsTable.font_size_changed(font_size);
}
public void units_changed(boolean imperial_units) {
}
public void units_changed(boolean imperial_units) {
- map.units_changed(imperial_units);
+ if (map != null)
+ map.units_changed(imperial_units);
+ if (enable != null)
+ enable.units_changed(imperial_units);
}
AltosGraphUI(AltosStateIterable states, File file) throws InterruptedException, IOException {
}
AltosGraphUI(AltosStateIterable states, File file) throws InterruptedException, IOException {