altoslib: More frobbing with new map bits

Signed-off-by: Keith Packard <keithp@keithp.com>

4 files changed, 2 insertions, 67 deletions

diff --git a/altosuilib/AltosFlightDisplay.java b/altosuilib/AltosFlightDisplay.java
deleted file mode 100644
index ac65c49e..00000000
--- a/altosuilib/AltosFlightDisplay.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright © 2010 Keith Packard <keithp@keithp.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
- */
-
-package org.altusmetrum.altosuilib_6;
-
-import org.altusmetrum.altoslib_6.*;
-
-public interface AltosFlightDisplay extends AltosUnitsListener, AltosFontListener {
-	void reset();
-
-	void show(AltosState state, AltosListenerState listener_state);
-
-	String getName();
-}
diff --git a/altosuilib/AltosFontListener.java b/altosuilib/AltosFontListener.java
deleted file mode 100644
index 93625278..00000000
--- a/altosuilib/AltosFontListener.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright © 2011 Keith Packard <keithp@keithp.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
- */
-
-package org.altusmetrum.altosuilib_6;
-
-public interface AltosFontListener {
-	void font_size_changed(int font_size);
-}
diff --git a/altosuilib/AltosUIMapView.java b/altosuilib/AltosUIMapView.java
index c8632b99..d110f803 100644
--- a/altosuilib/AltosUIMapView.java
+++ b/altosuilib/AltosUIMapView.java
@@ -426,21 +426,6 @@ public class AltosUIMapView extends Component implements MouseMotionListener, Mo
 	}
 
 	public void paint(Graphics g) {
-		VolatileImage	back_buffer = create_back_buffer();
-		do {
-			GraphicsConfiguration gc = getGraphicsConfiguration();
-			int code = back_buffer.validate(gc);
-			if (code == VolatileImage.IMAGE_INCOMPATIBLE)
-				back_buffer = create_back_buffer();
-
-			Graphics g_back = back_buffer.getGraphics();
-			g_back.setClip(g.getClip());
-			do_paint(g_back);
-			g_back.dispose();
-
-			g.drawImage(back_buffer, 0, 0, this);
-		} while (back_buffer.contentsLost());
-		back_buffer.flush();
 	}
 
 	public void update(Graphics g) {
diff --git a/altosuilib/Makefile.am b/altosuilib/Makefile.am
index d51da91d..30d003e9 100644
--- a/altosuilib/Makefile.am
+++ b/altosuilib/Makefile.am
@@ -12,8 +12,6 @@ altosuilib_JAVA = \
 	GrabNDrag.java \
 	AltosDevice.java \
 	AltosDeviceDialog.java \
-	AltosFlightDisplay.java \
-	AltosFontListener.java \
 	AltosPositionListener.java \
 	AltosUIConfigure.java \
 	AltosUIAxis.java \
@@ -61,6 +59,7 @@ altosuilib_JAVA = \
 	AltosBTManage.java \
 	AltosBTKnown.java \
 	AltosUIMap.java \
+	AltosUIMapNew.java \
 	AltosUIMapView.java \
 	AltosUIMapLine.java \
 	AltosUIMapMark.java \
@@ -84,6 +83,7 @@ altosuilib_JAVA = \
 	AltosUIFreqList.java \
 	AltosUITelemetryList.java \
 	AltosUIRateList.java \
+	AltosUIImage.java \
 	OSXAdapter.java
 
 JAR=altosuilib_$(ALTOSUILIB_VERSION).jar