Merge tag '1.4' into fox

tagging 1.4 release

Conflicts:
	src/Makefile

1 files changed, 9 insertions, 6 deletions

diff --git a/altosuilib/AltosUIFrame.java b/altosuilib/AltosUIFrame.java
index 3fc99910..6e62c762 100644
--- a/altosuilib/AltosUIFrame.java
+++ b/altosuilib/AltosUIFrame.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altosuilib_1;
+package org.altusmetrum.altosuilib_2;
 
 import java.awt.*;
 import java.awt.event.*;
@@ -45,7 +45,7 @@ public class AltosUIFrame extends JFrame implements AltosUIListener, AltosPositi
 	};
 
 	static public String[] icon_names;
-	
+
 	static public void set_icon_names(String[] new_icon_names) { icon_names = new_icon_names; }
 
 	public String[] icon_names() {
@@ -57,7 +57,7 @@ public class AltosUIFrame extends JFrame implements AltosUIListener, AltosPositi
 	public void set_icon() {
 		ArrayList<Image> icons = new ArrayList<Image>();
 		String[] icon_names = icon_names();
-		
+
 		for (int i = 0; i < icon_names.length; i++) {
 			java.net.URL imgURL = AltosUIFrame.class.getResource(icon_names[i]);
 			if (imgURL != null)
@@ -65,14 +65,17 @@ public class AltosUIFrame extends JFrame implements AltosUIListener, AltosPositi
 		}
 		setIconImages(icons);
 	}
-			
+
 	private boolean location_by_platform = true;
 
 	public void setLocationByPlatform(boolean lbp) {
 		location_by_platform = lbp;
 		super.setLocationByPlatform(lbp);
 	}
-		
+
+	public void scan_device_selected(AltosDevice device) {
+	}
+
 	public void setSize() {
 		/* Smash sizes around so that the window comes up in the right shape */
 		Insets i = getInsets();
@@ -153,7 +156,7 @@ public class AltosUIFrame extends JFrame implements AltosUIListener, AltosPositi
 				setPosition(position);
 		}
 	}
-		
+
 	void init() {
 		AltosUIPreferences.register_ui_listener(this);
 		AltosUIPreferences.register_position_listener(this);