altosuilib: Get rid of AltosUIVersion.java

It's been moved to altoslib/AltosVersion.java

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

diff --git a/altoslib/AltosVersion.java.in b/altoslib/AltosVersion.java.in
index 546d4353252e56417dccadc483cef912cb3abfe9..ebba5a00e96bab87f20ff8f76cd67ae60d784930 100644 (file)
--- a/altoslib/AltosVersion.java.in
+++ b/altoslib/AltosVersion.java.in
@@ -22,7 +22,7 @@ public class AltosVersion {
 
        public final static String google_maps_api_key = @GOOGLEKEY@;
 
-       static boolean has_google_maps_api_key() {
+       public static boolean has_google_maps_api_key() {
                return google_maps_api_key != null && google_maps_api_key.length() > 1;
        }
 }

diff --git a/altosuilib/.gitignore b/altosuilib/.gitignore
index 4ad8a77a3a82014347bac0626df16d61a39ef165..943408ec484fad54de65bf819182e6be83eeec31 100644 (file)
--- a/altosuilib/.gitignore
+++ b/altosuilib/.gitignore
@@ -1,4 +1,3 @@
-AltosUIVersion.java
 bin
 classaltosuilib.stamp
 altosuilib*.jar

diff --git a/altosuilib/AltosUIConfigure.java b/altosuilib/AltosUIConfigure.java
index 0bd8fb96793a17e669d8699445a18533fc6276f1..75957b33ba6c51f08731337e2a72f24127f76710 100644 (file)
--- a/altosuilib/AltosUIConfigure.java
+++ b/altosuilib/AltosUIConfigure.java
@@ -22,6 +22,7 @@ import java.awt.event.*;
 import java.beans.*;
 import javax.swing.*;
 import javax.swing.event.*;
+import org.altusmetrum.altoslib_7.*;
 
 class DelegatingRenderer implements ListCellRenderer<Object> {
 
@@ -269,8 +270,8 @@ public class AltosUIConfigure
                row++;
 
                pane.add(new JLabel (String.format("AltOS version %s (%smaps key)",
-                                                  AltosUIVersion.version,
-                                                  AltosUIVersion.has_google_maps_api_key() ? "" : "no ")),
+                                                  AltosVersion.version,
+                                                  AltosVersion.has_google_maps_api_key() ? "" : "no ")),
                         constraints(0, 3));
                row++;
 

diff --git a/altosuilib/AltosUIVersion.java.in b/altosuilib/AltosUIVersion.java.in
deleted file mode 100644 (file)
index f65b41c..0000000
--- a/altosuilib/AltosUIVersion.java.in
+++ /dev/null
@@ -1,28 +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_7;
-
-public class AltosUIVersion {
-       public final static String version = "@VERSION@";
-
-       public final static String google_maps_api_key = @GOOGLEKEY@;
-
-       static boolean has_google_maps_api_key() {
-               return google_maps_api_key != null && google_maps_api_key.length() > 1;
-       }
-}

diff --git a/altosuilib/Makefile.am b/altosuilib/Makefile.am
index 71f1c2def00bfedb91d760a99682c8f4706813d4..a00e4a12f1fdc78a0e9b5dc927a3993e7ad3b627 100644 (file)
--- a/altosuilib/Makefile.am
+++ b/altosuilib/Makefile.am
@@ -29,7 +29,6 @@ altosuilib_JAVA = \
        AltosUIPreferencesBackend.java \
        AltosUIPreferences.java \
        AltosUISeries.java \
-       AltosUIVersion.java \
        AltosUSBDevice.java \
        AltosVoice.java \
        AltosDisplayThread.java \

diff --git a/configure.ac b/configure.ac
index 0564f4f870c62f9dcca3161f9c45bcf5614ae7c6..d7a14aa8a47ff0ba4595d91e591a5ce0f1d9e729 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -517,7 +517,6 @@ altoslib/Makefile
 altoslib/AltosVersion.java
 icon/Makefile
 altosuilib/Makefile
-altosuilib/AltosUIVersion.java
 altosui/Makefile
 altosui/Info.plist
 altosui/altos-windows.nsi